From: magnus.blaudd
Date: October 5 2011 10:02am
Subject: bzr push into mysql-trunk-cluster branch (magnus.blaudd:3388 to 3390)
List-Archive: http://lists.mysql.com/commits/141306
Message-Id: <201110051003.p95A34hC005806@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3390 magnus.blaudd@stripped	2011-10-05 [merge]
      Merge 5.5-cluster -> trunk-cluster

    modified:
      sql/ha_ndbcluster.cc
 3389 magnus.blaudd@stripped	2011-10-05 [merge]
      Merge 5.5-cluster(with 5.5.16) into trunk-cluster

    modified:
      mysql-test/t/disabled.def
      support-files/compiler_warnings.supp
 3388 magnus.blaudd@stripped	2011-10-05 [merge]
      Merge 5.5-cluster -> trunk-cluster

    modified:
      storage/ndb/clusterj/clusterj-test/CMakeLists.txt
      storage/ndb/config/type_JAVA.cmake
      storage/ndb/ndb_configure.cmake
=== modified file 'mysql-test/t/disabled.def'
--- a/mysql-test/t/disabled.def	2011-10-04 10:41:43 +0000
+++ b/mysql-test/t/disabled.def	2011-10-05 09:49:18 +0000
@@ -1,4 +1,4 @@
-##############################################################################
+201##############################################################################
 #
 #  List the test cases that are to be disabled temporarily.
 #
@@ -16,5 +16,8 @@ alter_table-big          : Bug#11748731 
 create-big               : Bug#11748731 2010-11-15 mattiasj was not tested
 archive-big              : Bug#11817185 2011-03-10 Anitha Disabled since this leads to timeout on Solaris Sparc
 log_tables-big           : Bug#11756699 2010-11-15 mattiasj report already exists
-mysql_embedded           : Bug#12561297 seems to be fixed in 5.5.16 (I verified that it fails also in tag:mysql-5.5.15)
-file_contents            : Bug#12585902 file_contents.test fails when building from "bzr export"
+mysql_embedded           : Bug#12561297 2011-05-14 Anitha Dependent on PB2 changes - eventum#41836
+
+### MCP_DISABLE_FAILING_TESTS start ###
+file_contents            : Bug#12585902 2011-09-27 magnus file_contents.test fails when building from "bzr export"
+### MCP_DISABLE_FAILING_TESTS end ###

=== modified file 'sql/ha_ndbcluster.cc'
--- a/sql/ha_ndbcluster.cc	2011-10-05 07:24:39 +0000
+++ b/sql/ha_ndbcluster.cc	2011-10-05 10:01:07 +0000
@@ -18232,7 +18232,8 @@ mysql_declare_plugin(ndbcluster)
   0x0100,                     /* plugin version */
   ndb_status_variables_export,/* status variables                */
   system_variables,           /* system variables */
-  NULL                        /* config options                  */
+  NULL,                       /* config options */
+  0                           /* flags */
 },
 {
   MYSQL_STORAGE_ENGINE_PLUGIN,
@@ -18246,7 +18247,8 @@ mysql_declare_plugin(ndbcluster)
   0x0001,                     /* plugin version */
   NULL,                       /* status variables */
   ndbinfo_system_variables,   /* system variables */
-  NULL                        /* config options */
+  NULL,                       /* config options */
+  0                           /* flags */
 }
 mysql_declare_plugin_end;
 

=== modified file 'support-files/compiler_warnings.supp'
--- a/support-files/compiler_warnings.supp	2011-09-29 17:47:44 +0000
+++ b/support-files/compiler_warnings.supp	2011-10-05 08:56:12 +0000
@@ -99,27 +99,21 @@ mi_packrec.c : .*result of 32-bit shift 
 .* : .*no matching operator delete found; memory will not be freed if initialization throws an exception.*
 ctype-simple.c : .*unary minus operator applied to unsigned type, result still unsigned.*
 
+### MCP_COMPILER_WARN_SUPPRESSIONS start ###
+# warnings ingnored by Cluster team
 #
-# Below is suppressions added by Cluster Team
-#
-
-#
-# 5.5-mainline
-# 
 extra/perror.c : .*strerror.*
 plugin/semisync/semisync_master.cc : .*may be used uninitialized in this function.*
 .*/innobase/.* : .*
 client/mysqldump.c : .*may be used uninitialized in this function.*
 
-# 5.5-mainline windows
+# windows
 mysqlslap/mysqlslap.c : .*
 yassl/.* : C4005: 'WIN32_LEAN_AND_MEAN' : macro redefinition
 mytap/tap.c : C4028: formal parameter .* different from declaration
 .*/readline.cc : C4101: 'input_file_stat' : unreferenced local variable
 
 #
-# 
-#
 .*/sys_vars.h             : .*C4244.* conversion .* possible loss of data
 .*/mi_dynrec.c            : .*C4244.* conversion .* possible loss of data
 .*/mi_check.c             : .*C4244.* conversion .* possible loss of data
@@ -165,3 +159,4 @@ my_print_defaults/my_print_defaults.c : 
 myisamchk/myisamchk.c                 : .*C4090.*
 mysqlimport/mysqlimport.c             : .*C4090.*
 mysqlcheck/mysqlcheck.c               : .*C4090.*
+### MCP_COMPILE_WARN_SUPPRESSIONS end ###

No bundle (reason: useless for push emails).