List:Commits« Previous MessageNext Message »
From:John David Duncan Date:December 16 2011 8:56pm
Subject:bzr push into mysql-5.5-cluster-7.2 branch (john.duncan:3732 to 3733)
View as plain text  
 3733 John David Duncan	2011-12-16 [merge]
      mysql-test/CMakeLists.txt fix with MCP comment

    modified:
      mysql-test/CMakeLists.txt
      mysql-test/mysql-test-run.pl
      storage/ndb/memcache/CMakeLists.txt
 3732 jonas oreland	2011-12-16 [merge]
      ndb - merge 71 into 72

    modified:
      storage/ndb/test/run-test/main.cpp
=== modified file 'mysql-test/CMakeLists.txt'
--- a/mysql-test/CMakeLists.txt	2011-09-29 08:42:23 +0000
+++ b/mysql-test/CMakeLists.txt	2011-12-16 20:53:39 +0000
@@ -13,13 +13,15 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
+
+# MCP_BUG13511612 CHANGE PATTERN var/ to PATTERN var/* 
 IF(INSTALL_MYSQLTESTDIR)
 INSTALL(
  DIRECTORY .
  DESTINATION ${INSTALL_MYSQLTESTDIR}
  USE_SOURCE_PERMISSIONS
  COMPONENT Test
- PATTERN "var/" EXCLUDE
+ PATTERN "var/*" EXCLUDE
  PATTERN "lib/My/SafeProcess" EXCLUDE
  PATTERN "lib/t*" EXCLUDE
  PATTERN "CPack" EXCLUDE

=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2011-12-15 07:32:59 +0000
+++ b/mysql-test/mysql-test-run.pl	2011-12-16 20:53:39 +0000
@@ -3130,11 +3130,14 @@ sub memcached_start {
 
 
 sub memcached_load_metadata($) {
-  my $cluster = shift;
+  my $cluster= shift;
     
-  my $sql_script= my_find_file($basedir,
-                             ["share", "storage/ndb/memcache/scripts"],
-                             "ndb_memcache_metadata.sql", NOT_REQUIRED);
+  my $sql_script= my_find_file($bindir,
+                              ["share/mysql/memcache-api", # RPM install
+                               "share/memcache-api",       # Other installs
+                               "scripts"                   # Build tree
+                              ],
+                              "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-12-11 07:31:26 +0000
+++ b/storage/ndb/memcache/CMakeLists.txt	2011-12-16 20:13:17 +0000
@@ -167,6 +167,10 @@ configure_file(${CMAKE_CURRENT_SOURCE_DI
 # Build the perl include file used by mtr
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/memcached_path.pl.in
                ${CMAKE_CURRENT_SOURCE_DIR}/memcached_path.pl)
+
+# Copy the SQL script into /scripts/ in the build directory.
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/scripts/ndb_memcache_metadata.sql
+               ${CMAKE_BINARY_DIR}/scripts/ndb_memcache_metadata.sql COPYONLY)
                
 ######### TARGETS ############
 # Build the convenience library
@@ -201,19 +205,23 @@ set_target_properties(ndb_engine PROPERT
                       LINK_FLAGS "${FINAL_LINK_FLAGS}")
 
 ############ INSTALLER RULES #########
-# Install the ndb_engine.so module
+### 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 memcache-api)
-install(PROGRAMS sandbox.sh DESTINATION memcache-api)
-install(FILES README DESTINATION memcache-api)
+###
+SET(MEMCACHE_API_DIR "${INSTALL_MYSQLSHAREDIR}/memcache-api")
+install(DIRECTORY DESTINATION ${MEMCACHE_API_DIR} )
+install(PROGRAMS sandbox.sh DESTINATION  ${MEMCACHE_API_DIR})
+install(FILES README DESTINATION  ${MEMCACHE_API_DIR})
 install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/scripts/ndb_memcache_metadata.sql 
-        DESTINATION memcache-api)
+        DESTINATION  ${MEMCACHE_API_DIR})
+# Upgrader scripts:
+install(DIRECTORY DESTINATION ${MEMCACHE_API_DIR}/upgrade)
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/scripts/update_to_1.2.sql
+        DESTINATION ${MEMCACHE_API_DIR}/upgrade)
         
 # 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).
Thread
bzr push into mysql-5.5-cluster-7.2 branch (john.duncan:3732 to 3733) John David Duncan16 Dec