Platform specific changes

Jimmy Yang · Jimmy Yang · commit 3365bcc75a87 · 2012-03-01T17:17:31.000+08:00
diff --git a/config.h.cmake b/config.h.cmake
@@ -531,6 +531,7 @@
 #cmakedefine ENABLE_MEMCACHED_SASL 1
 #cmakedefine ENABLE_MEMCACHED_SASL_PWDB 1
 #cmakedefine HAVE_SASL_SASL_H 1
+#cmakedefine HAVE_HTONLL 1
 
 /*
   MySQL features
diff --git a/configure.cmake b/configure.cmake
@@ -503,6 +503,7 @@ CHECK_FUNCTION_EXISTS (valloc HAVE_VALLOC)
 CHECK_FUNCTION_EXISTS (memalign HAVE_MEMALIGN)
 CHECK_FUNCTION_EXISTS (chown HAVE_CHOWN)
 CHECK_FUNCTION_EXISTS (nl_langinfo HAVE_NL_LANGINFO)
+CHECK_FUNCTION_EXISTS (ntohll HAVE_HTONLL)
 
 CHECK_FUNCTION_EXISTS (clock_gettime DNS_USE_CPU_CLOCK_FOR_ID)
 CHECK_FUNCTION_EXISTS (epoll_create HAVE_EPOLL)
diff --git a/libevent/min_heap.h b/libevent/min_heap.h
@@ -29,6 +29,7 @@
 
 #include "event.h"
 #include "evutil.h"
+#include "stdlib.h"
 
 typedef struct min_heap
 {
diff --git a/mysql-test/suite/memcached/r/memcached_mdl_2.result b/mysql-test/suite/memcached/r/memcached_mdl_2.result
@@ -40,6 +40,7 @@ D	Darmstadt	City
 H	Hamburg	Norderstedt
 send ALTER TABLE t1 DROP c21
 ALTER TABLE t1 DROP c21;
+reap
 Here the memcached results with D,B,H,C:
 Here the memcached results after set:
 Here the memcached results after add:
@@ -49,7 +50,6 @@ Here the memcached results after add Frankfurt|:
 Here the memcached results after add |Airport:
 Here the memcached results after replace Frankfurt a.M.:
 Here the memcached results after replace Sachsenhausen:
-reap
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
diff --git a/mysql-test/suite/memcached/t/memcached_mdl_2.test b/mysql-test/suite/memcached/t/memcached_mdl_2.test
@@ -67,6 +67,9 @@ connection mysqltest1;
 echo send ALTER TABLE t1 DROP c21;
 send ALTER TABLE t1 DROP c21;
 
+echo reap;
+reap;
+
 perl;
 use DBI;
 use Cache::Memcached;
@@ -171,8 +174,6 @@ if ($val) { print "$val\n"; }
 $memd->disconnect_all;
 EOF
 
-echo reap;
-reap;
 SHOW CREATE TABLE t1;
 --sorted_result
 -- error 1054
diff --git a/plugin/innodb_memcached/CMakeLists.txt b/plugin/innodb_memcached/CMakeLists.txt
@@ -15,7 +15,6 @@
 IF(WITH_INNODB_MEMCACHED)
   ADD_SUBDIRECTORY(daemon_memcached)
   ADD_SUBDIRECTORY(innodb_memcache)
-
-  INSTALL(FILES ${CMAKE_SOURCE_DIR}/plugin/innodb_memcached/README-innodb_memcached DESTINATION ${INSTALL_DOCREADMEDIR} COMPONENT Readme)
 ENDIF()
+
 INSTALL_SCRIPT("${CMAKE_SOURCE_DIR}/plugin/innodb_memcached/innodb_memcache/scripts/innodb_memcached_config.sql" DESTINATION ${INSTALL_SCRIPTDIR} COMPONENT Server)
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh
@@ -1020,6 +1020,7 @@ echo "====="                                     >> $STATUS_HISTORY
 %attr(755, root, root) %{_sbindir}/mysqld-debug
 %attr(755, root, root) %{_sbindir}/rcmysql
 %attr(755, root, root) %{_libdir}/mysql/plugin/daemon_example.ini
+%attr(755, root, root) %{_bindir}/innodb_memcached_config.sql
 
 %if %{WITH_TCMALLOC}
 %attr(755, root, root) %{_libdir}/mysql/%{malloc_lib_target}

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@`
`29`	`29`
`30`	`30`	`#include "event.h"`
`31`	`31`	`#include "evutil.h"`
	`32`	`+#include "stdlib.h"`
`32`	`33`
`33`	`34`	`typedef struct min_heap`
`34`	`35`	`{`