bzr push into mysql-5.5-cluster branch (magnus.blaudd:3338 to 3339)

[Magnus Blåudd]

 3339 Magnus Blåudd	2011-05-12 [merge]
      Merge 7.0 -> 5.5-cluster

    modified:
      CMakeLists.txt
      mysql-test/suite/ndb/r/ndb_add_partition.result
      mysql-test/suite/ndb/t/ndb_add_partition.test
 3338 Magnus Blåudd	2011-05-12 [merge]
      Merge 7.0 -> 5.5-cluster

    modified:
      mysql-test/suite/ndb/r/ndb_rename.result
      mysql-test/suite/ndb/t/ndb_rename.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_gap_event.test
      storage/ndb/src/common/portlib/NdbTCP.cpp
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp
      storage/ndb/src/mgmsrv/MgmtSrvr.cpp
      storage/ndb/src/ndbapi/DictCache.cpp
      storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp
      storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp
=== modified file 'CMakeLists.txt'
--- a/CMakeLists.txt	2011-05-12 08:43:50 +0000
+++ b/CMakeLists.txt	2011-05-12 14:34:22 +0000
@@ -380,3 +380,20 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
     PATTERN "sp-imp-spec.txt" EXCLUDE
   )
 ENDIF()
+
+# Dump cmake's output and error log to help diagnosing
+# platform checks
+MACRO(DUMP_FILE filename)
+  IF(EXISTS ${filename})
+    FILE(READ ${filename} content)
+    MESSAGE(STATUS "=vvvv= Dumping ${filename} ")
+    MESSAGE(STATUS "${content}")
+    MESSAGE(STATUS "=^^^^=")
+  ELSE()
+    MESSAGE(STATUS "'${filename}' does not exist")
+  ENDIF()
+ENDMACRO()
+ 
+DUMP_FILE("${CMAKE_BINARY_DIR}/CMakeFiles/CMakeError.log")
+DUMP_FILE("${CMAKE_BINARY_DIR}/CMakeFiles/CMakeOutput.log")
+

=== modified file 'mysql-test/suite/ndb/r/ndb_add_partition.result'
--- a/mysql-test/suite/ndb/r/ndb_add_partition.result	2009-05-09 15:49:27 +0000
+++ b/mysql-test/suite/ndb/r/ndb_add_partition.result	2011-05-12 11:31:21 +0000
@@ -144,8 +144,20 @@ a	b	c
 50	50	50
 alter online table t1 reorganize partition;
 alter online table t2 reorganize partition;
+partitions added to t1
+t1_added
+0
+partitions added to t2
+t2_added
+0
 alter online table t1 add partition partitions 1;
 alter online table t2 add partition partitions 4;
+partitions added to t1
+t1_added
+1
+partitions added to t2
+t2_added
+4
 alter online table t1 reorganize partition;
 ERROR HY000: REORGANIZE PARTITION without parameters can only be used on auto-partitioned tables using HASH PARTITIONs
 select count(*) from t1;
@@ -246,6 +258,12 @@ a	b	c
 50	50	50
 alter online table t1 add partition partitions 2;
 alter online table t2 add partition partitions 1;
+partitions added to t1
+t1_added
+3
+partitions added to t2
+t2_added
+5
 select count(*) from t1;
 count(*)
 100

=== modified file 'mysql-test/suite/ndb/t/ndb_add_partition.test'
--- a/mysql-test/suite/ndb/t/ndb_add_partition.test	2011-02-02 10:33:25 +0000
+++ b/mysql-test/suite/ndb/t/ndb_add_partition.test	2011-05-12 14:34:22 +0000
@@ -34,6 +34,10 @@ STORAGE DISK
 TABLESPACE ts1
 partition by key(a);
 
+let $t1_part_count_start = query_get_value(select count(*) as Value from information_schema.partitions where table_schema = 'test' and table_name = 't1', Value, 1);
+
+let $t2_part_count_start = query_get_value(select count(*) as Value from information_schema.partitions where table_schema = 'test' and table_name = 't2', Value, 1);
+
 INSERT INTO t1 VALUES
 (1,1,1),(2,2,2),(3,3,3),(4,4,4),(5,5,5),
 (6,6,6),(7,7,7),(8,8,8),(9,9,9),(10,10,10),
@@ -92,9 +96,31 @@ select * from t2 where b = 50;
 alter online table t1 reorganize partition;
 alter online table t2 reorganize partition;
 
+let $t1_part_count_now = query_get_value(select count(*) as Value from information_schema.partitions where table_schema = 'test' and table_name = 't1', Value, 1);
+
+let $t2_part_count_now = query_get_value(select count(*) as Value from information_schema.partitions where table_schema = 'test' and table_name = 't2', Value, 1);
+
+--disable_query_log
+--echo partitions added to t1
+eval select $t1_part_count_now - $t1_part_count_start as t1_added;
+--echo partitions added to t2
+eval select $t2_part_count_now - $t2_part_count_start as t2_added;
+--enable_query_log
+
 alter online table t1 add partition partitions 1;
 alter online table t2 add partition partitions 4;
 
+let $t1_part_count_now = query_get_value(select count(*) as Value from information_schema.partitions where table_schema = 'test' and table_name = 't1', Value, 1);
+
+let $t2_part_count_now = query_get_value(select count(*) as Value from information_schema.partitions where table_schema = 'test' and table_name = 't2', Value, 1);
+
+--disable_query_log
+--echo partitions added to t1
+eval select $t1_part_count_now - $t1_part_count_start as t1_added;
+--echo partitions added to t2
+eval select $t2_part_count_now - $t2_part_count_start as t2_added;
+--enable_query_log
+
 # reorganize partition not support if not default partitioning
 # and after a add partition it's no longer default
 --error ER_REORG_NO_PARAM_ERROR
@@ -135,6 +161,17 @@ select * from t2 where b = 50;
 alter online table t1 add partition partitions 2;
 alter online table t2 add partition partitions 1;
 
+let $t1_part_count_now = query_get_value(select count(*) as Value from information_schema.partitions where table_schema = 'test' and table_name = 't1', Value, 1);
+
+let $t2_part_count_now = query_get_value(select count(*) as Value from information_schema.partitions where table_schema = 'test' and table_name = 't2', Value, 1);
+
+--disable_query_log
+--echo partitions added to t1
+eval select $t1_part_count_now - $t1_part_count_start as t1_added;
+--echo partitions added to t2
+eval select $t2_part_count_now - $t2_part_count_start as t2_added;
+--enable_query_log
+
 select count(*) from t1;
 select count(*) from t2;
 --sorted_result

No bundle (reason: useless for push emails).