bzr push into mysql-5.5-cluster-7.2 branch (magnus.blaudd:4017 to 4018)

[magnus.blaudd]

 4018 magnus.blaudd@stripped	2012-10-04 [merge]
      Merge

    modified:
      sql/ha_ndbcluster.cc
      sql/ha_ndbcluster_binlog.cc
 4017 Ole John Aske	2012-10-04 [merge]
      Merge 7.1 -> 7.2

    modified:
      storage/ndb/test/ndbapi/testSpj.cpp
=== modified file 'sql/ha_ndbcluster.cc'
--- a/sql/ha_ndbcluster.cc	2012-09-19 07:09:57 +0000
+++ b/sql/ha_ndbcluster.cc	2012-09-24 14:57:07 +0000
@@ -14761,7 +14761,6 @@ Ndb_util_thread::do_run()
   if (thd->store_globals())
     goto ndb_util_thread_fail;
   lex_start(thd);
-  thd->init_for_queries();
   thd_set_command(thd, COM_DAEMON);
 #ifndef NDB_THD_HAS_NO_VERSION
   thd->version=refresh_version;
@@ -14801,6 +14800,10 @@ Ndb_util_thread::do_run()
   }
   mysql_mutex_unlock(&LOCK_server_started);
 
+  // Defer call of THD::init_for_query until after mysqld_server_started
+  // to ensure that the parts of MySQL Server it uses has been created
+  thd->init_for_queries();
+
   /*
     Wait for cluster to start
   */

=== modified file 'sql/ha_ndbcluster_binlog.cc'
--- a/sql/ha_ndbcluster_binlog.cc	2012-09-13 12:04:27 +0000
+++ b/sql/ha_ndbcluster_binlog.cc	2012-09-24 14:57:07 +0000
@@ -6654,7 +6654,6 @@ ndb_binlog_thread_func(void *arg)
   }
   lex_start(thd);
 
-  thd->init_for_queries();
   thd_set_command(thd, COM_DAEMON);
   thd->system_thread= SYSTEM_THREAD_NDBCLUSTER_BINLOG;
 #ifndef NDB_THD_HAS_NO_VERSION
@@ -6753,6 +6752,11 @@ restart_cluster_failure:
     }
   }
   mysql_mutex_unlock(&LOCK_server_started);
+
+  // Defer call of THD::init_for_query until after mysqld_server_started
+  // to ensure that the parts of MySQL Server it uses has been created
+  thd->init_for_queries();
+
   /*
     Main NDB Injector loop
   */

No bundle (reason: useless for push emails).