From: Jonas Oreland
Date: October 19 2011 11:59am
Subject: bzr push into mysql-5.5-cluster branch (jonas.oreland:3600)
List-Archive: http://lists.mysql.com/commits/141505
Message-Id: <20111019115907.4E1BFA79D88@perch.localdomain>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3600 Jonas Oreland	2011-10-19 [merge]
      ndb - merge 72-tip

    modified:
      mysql-test/suite/funcs_1/r/is_columns_is.result
      mysql-test/suite/funcs_1/r/is_tables_is.result
      mysql-test/suite/funcs_1/t/is_columns_is.test
      mysql-test/suite/funcs_1/t/is_tables_is.test
=== modified file 'sql/ha_ndbcluster.cc'
--- a/sql/ha_ndbcluster.cc	2011-10-17 18:13:57 +0000
+++ b/sql/ha_ndbcluster.cc	2011-10-19 11:49:07 +0000
@@ -11115,10 +11115,10 @@ do_drop:
 /* static version which does not need a handler */
 
 int
-ha_ndbcluster::drop_table(THD *thd, ha_ndbcluster *h, Ndb *ndb,
-                          const char *path,
-                          const char *db,
-                          const char *table_name)
+ha_ndbcluster::drop_table_impl(THD *thd, ha_ndbcluster *h, Ndb *ndb,
+                               const char *path,
+                               const char *db,
+                               const char *table_name)
 {
   DBUG_ENTER("ha_ndbcluster::ndbcluster_delete_table");
   NDBDICT *dict= ndb->getDictionary();
@@ -11310,8 +11310,8 @@ int ha_ndbcluster::delete_table(const ch
     If it was already gone it might have been dropped
     remotely, give a warning and then drop .ndb file.
    */
-  if (!(error= drop_table(thd, this, ndb, name,
-                          m_dbname, m_tabname)) ||
+  if (!(error= drop_table_impl(thd, this, ndb, name,
+                               m_dbname, m_tabname)) ||
       error == HA_ERR_NO_SUCH_TABLE)
   {
     /* Call ancestor function to delete .ndb file */
@@ -12117,7 +12117,7 @@ int ndbcluster_drop_database_impl(THD *t
   while ((tabname=it++))
   {
     tablename_to_filename(tabname, tmp, FN_REFLEN - (tmp - full_path)-1);
-    if (ha_ndbcluster::drop_table(thd, 0, ndb, full_path, dbname, tabname))
+    if (ha_ndbcluster::drop_table_impl(thd, 0, ndb, full_path, dbname, tabname))
     {
       const NdbError err= dict->getNdbError();
       if (err.code != 709 && err.code != 723)

=== modified file 'sql/ha_ndbcluster.h'
--- a/sql/ha_ndbcluster.h	2011-10-17 18:13:57 +0000
+++ b/sql/ha_ndbcluster.h	2011-10-19 11:49:07 +0000
@@ -564,10 +564,10 @@ private:
                                       NDB_SHARE *share);
 
   void check_read_before_write_removal();
-  static int drop_table(THD *thd, ha_ndbcluster *h, Ndb *ndb,
-                        const char *path,
-                        const char *db,
-                        const char *table_name);
+  static int drop_table_impl(THD *thd, ha_ndbcluster *h, Ndb *ndb,
+                             const char *path,
+                             const char *db,
+                             const char *table_name);
 
   int add_index_impl(THD *thd, TABLE *table_arg,
                      KEY *key_info, uint num_of_keys);

=== modified file 'storage/ndb/include/ndb_global.h'
--- a/storage/ndb/include/ndb_global.h	2011-02-01 23:27:25 +0000
+++ b/storage/ndb/include/ndb_global.h	2011-10-19 11:54:16 +0000
@@ -157,7 +157,7 @@ extern "C" {
  * Zero length array not allowed in C
  * Add use of array to avoid compiler warning
  */
-#define STATIC_ASSERT(expr) { char static_assert[(expr)? 1 : 0] = {'\0'}; if (static_assert[0]) {}; }
+#define STATIC_ASSERT(expr) { char a_static_assert[(expr)? 1 : 0] = {'\0'}; if (a_static_assert[0]) {}; }
 #else
 #define STATIC_ASSERT(expr)
 #endif

=== modified file 'storage/ndb/src/ndbapi/NdbTransaction.cpp'
--- a/storage/ndb/src/ndbapi/NdbTransaction.cpp	2011-09-02 09:16:56 +0000
+++ b/storage/ndb/src/ndbapi/NdbTransaction.cpp	2011-10-19 11:56:10 +0000
@@ -64,10 +64,6 @@ NdbTransaction::NdbTransaction( Ndb* aNd
   theTransactionIsStarted(false),
   theDBnode(0),
   theReleaseOnClose(false),
-  // Composite query operations
-  m_firstQuery(NULL),
-  m_firstExecQuery(NULL),
-  m_firstActiveQuery(NULL),
   // Scan operations
   m_waitForReply(true),
   m_theFirstScanOperation(NULL),
@@ -75,7 +71,6 @@ NdbTransaction::NdbTransaction( Ndb* aNd
   m_firstExecutedScanOp(NULL),
   // Scan operations
   theScanningOp(NULL),
-  m_scanningQuery(NULL),
   theBuddyConPtr(0xFFFFFFFF),
   theBlobFlag(false),
   thePendingBlobOps(0),
@@ -83,8 +78,15 @@ NdbTransaction::NdbTransaction( Ndb* aNd
   maxPendingBlobWriteBytes(~Uint32(0)),
   pendingBlobReadBytes(0),
   pendingBlobWriteBytes(0),
+  // Lock handle
   m_theFirstLockHandle(NULL),
   m_theLastLockHandle(NULL),
+  // Composite query operations
+  m_firstQuery(NULL),
+  m_firstExecQuery(NULL),
+  m_firstActiveQuery(NULL),
+  m_scanningQuery(NULL),
+  //
   m_tcRef(numberToRef(DBTC, 0))
 {
   theListState = NotInList;

=== modified file 'storage/ndb/src/ndbapi/NdbWaitGroup.cpp'
--- a/storage/ndb/src/ndbapi/NdbWaitGroup.cpp	2011-09-09 10:48:14 +0000
+++ b/storage/ndb/src/ndbapi/NdbWaitGroup.cpp	2011-10-19 11:56:10 +0000
@@ -25,10 +25,10 @@
 
 NdbWaitGroup::NdbWaitGroup(Ndb_cluster_connection *_conn, int _ndbs) :
   m_conn(_conn),
+  m_multiWaitHandler(0),
   m_array_size(_ndbs),
   m_count(0),
-  m_nodeId(0),
-  m_multiWaitHandler(0)
+  m_nodeId(0)
 {
   /* Allocate the array of Ndbs */
   m_array = new Ndb *[m_array_size];

=== modified file 'storage/ndb/src/ndbapi/TransporterFacade.cpp'
--- a/storage/ndb/src/ndbapi/TransporterFacade.cpp	2011-10-14 14:47:13 +0000
+++ b/storage/ndb/src/ndbapi/TransporterFacade.cpp	2011-10-19 11:56:10 +0000
@@ -548,11 +548,11 @@ TransporterFacade::TransporterFacade(Glo
   currentSendLimit(1),
   dozer(NULL),
   theStopReceive(0),
+  sendThreadWaitMillisec(10),
   theSendThread(NULL),
   theReceiveThread(NULL),
   m_fragmented_signal_id(0),
-  m_globalDictCache(cache),
-  sendThreadWaitMillisec(10)
+  m_globalDictCache(cache)
 {
   DBUG_ENTER("TransporterFacade::TransporterFacade");
   theMutexPtr = NdbMutex_CreateWithName("TTFM");

No bundle (reason: useless for push emails).