bk commit into 5.1 tree (tomas:1.2034)

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2034 06/01/11 17:14:16 tomas@stripped +1 -0
  review comments

  sql/ha_ndbcluster_binlog.cc
    1.9 06/01/11 17:14:07 tomas@stripped +18 -17
    review comments

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	tomas
# Host:	poseidon.ndb.mysql.com
# Root:	/home/tomas/v6

--- 1.8/sql/ha_ndbcluster_binlog.cc	2006-01-11 11:31:01 +01:00
+++ 1.9/sql/ha_ndbcluster_binlog.cc	2006-01-11 17:14:07 +01:00
@@ -32,6 +32,8 @@
 
 /*
   Flag showing if the ndb injector thread is running, if so == 1
+  -1 if it was started but later stopped for some reason
+   0 if never started
 */
 int ndb_binlog_thread_running= 0;
 
@@ -1426,13 +1428,13 @@
   cluster_replication.binlog_index table
 */
 struct Binlog_index_row {
-  longlong gci;
+  ulonglong gci;
   const char *master_log_file;
-  longlong master_log_pos;
-  longlong n_inserts;
-  longlong n_updates;
-  longlong n_deletes;
-  longlong n_schemaops;
+  ulonglong master_log_pos;
+  ulonglong n_inserts;
+  ulonglong n_updates;
+  ulonglong n_deletes;
+  ulonglong n_schemaops;
 };
 
 /*
@@ -2329,12 +2331,19 @@
 
   thd->init_for_queries();
   thd->command= COM_DAEMON;
-  injector_thd= thd;
+  thd->system_thread= SYSTEM_THREAD_NDBCLUSTER_BINLOG;
+  thd->version= refresh_version;
+  thd->set_time();
+  thd->main_security_ctx.host_or_ip= "";
+  thd->client_capabilities= 0;
+  my_net_init(&thd->net, 0);
+  thd->main_security_ctx.master_access= ~0;
+  thd->main_security_ctx.priv_user= 0;
 
   /*
     Set up ndb binlog
   */
-  sql_print_information("Starting Cluster Binlog");
+  sql_print_information("Starting MySQL Cluster Binlog Thread");
 
   pthread_detach_this_thread();
   thd->real_id= pthread_self();
@@ -2368,6 +2377,7 @@
     with the storage
     pthread_mutex_lock(&injector_mutex);
   */
+  injector_thd= thd;
   injector_ndb= ndb;
   ndb_binlog_thread_running= 1;
 
@@ -2377,15 +2387,6 @@
   */
   pthread_mutex_unlock(&injector_mutex);
   pthread_cond_signal(&injector_cond);
-
-  thd->system_thread= SYSTEM_THREAD_NDBCLUSTER_BINLOG;
-  thd->version= refresh_version;
-  thd->set_time();
-  thd->main_security_ctx.host_or_ip= "";
-  thd->client_capabilities= 0;
-  my_net_init(&thd->net, 0);
-  thd->main_security_ctx.master_access= ~0;
-  thd->main_security_ctx.priv_user= 0;
 
   thd->proc_info= "Waiting for ndbcluster to start";