bzr push into mysql-5.5-cluster branch (john.duncan:3568 to 3570)

[John David Duncan]

 3570 John David Duncan	2011-10-11
      Install metadata.sql script in mysql/share/memcache_api

    modified:
      storage/ndb/memcache/CMakeLists.txt
 3569 John David Duncan	2011-10-11
      Find metadata.sql script in mysql/share/memcache-api

    modified:
      mysql-test/mysql-test-run.pl
 3568 John David Duncan	2011-10-03 [merge]
      Merge in mysql-5.5-cluster-rel

    modified:
      INSTALL-SOURCE
      INSTALL-WIN-SOURCE
      cmake/make_dist.cmake.in
      cmake/mysql_version.cmake
      cmake/package_name.cmake
      configure.cmake
      extra/innochecksum.c
      libmysqld/CMakeLists.txt
      mysql-test/collections/default.release
      storage/ndb/clusterj/clusterj-test/CMakeLists.txt
      storage/ndb/config/type_JAVA.cmake
      storage/ndb/memcache/CMakeLists.txt
      storage/ndb/memcache/extra/memcached/engines/default_engine/default_engine.c
      storage/ndb/memcache/src/schedulers/S_sched.cc
      storage/ndb/memcache/unit/test_workqueue.c
      storage/ndb/ndb_configure.cmake
      storage/ndb/test/include/HugoQueryBuilder.hpp
      support-files/CMakeLists.txt
      support-files/mysql.spec.sh
=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2011-10-03 16:45:51 +0000
+++ b/mysql-test/mysql-test-run.pl	2011-10-12 03:52:36 +0000
@@ -3097,8 +3097,9 @@ sub memcached_load_metadata($) {
   my $cluster = shift;
     
   my $sql_script= my_find_file($basedir,
-                             ["share", "storage/ndb/memcache/scripts"],
-                             "ndb_memcache_metadata.sql", NOT_REQUIRED);
+                             ["share/memcache_api", 
+                              "storage/ndb/memcache/scripts"],
+                              "ndb_memcache_metadata.sql", NOT_REQUIRED);
 
   foreach my $mysqld (mysqlds()) {
     if(-d $mysqld->value('datadir') . "/" . "ndbmemcache") {

=== modified file 'storage/ndb/memcache/CMakeLists.txt'
--- a/storage/ndb/memcache/CMakeLists.txt	2011-10-04 05:05:04 +0000
+++ b/storage/ndb/memcache/CMakeLists.txt	2011-10-12 03:54:06 +0000
@@ -202,16 +202,12 @@ set_target_properties(ndb_engine PROPERT
 # Install the ndb_engine.so module
 install(TARGETS ndb_engine DESTINATION ${INSTALL_LIBDIR})
 
-# Install the metadata.sql script
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/scripts/ndb_memcache_metadata.sql 
-        DESTINATION ${INSTALL_MYSQLSHAREDIR})
-
 ### Install the memcache-api directory  ################
 install(DIRECTORY DESTINATION "${INSTALL_MYSQLSHAREDIR}/memcache-api")
 install(PROGRAMS sandbox.sh DESTINATION "${INSTALL_MYSQLSHAREDIR}/memcache-api")
 install(FILES README DESTINATION "${INSTALL_MYSQLSHAREDIR}/memcache-api")
 install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/scripts/ndb_memcache_metadata.sql 
-        DESTINATION memcache-api)
+        DESTINATION "${INSTALL_MYSQLSHAREDIR}/memcache-api")
         
 # memcached_path.pl is also installed, for use by installed mtr
 install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/memcached_path.pl

No bundle (reason: useless for push emails).