List:Commits« Previous MessageNext Message »
From:tomas Date:January 11 2006 4:29pm
Subject:bk commit into 5.1 tree (tomas:1.2035)
View as plain text  
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.2035 06/01/11 17:28:52 tomas@stripped +3 -0
  more review comments fixes

  sql/sql_repl.cc
    1.149 06/01/11 17:28:45 tomas@stripped +4 -2
    more review comments fixes

  sql/ha_ndbcluster_binlog.cc
    1.10 06/01/11 17:28:45 tomas@stripped +1 -1
    more review comments fixes

  client/mysqltest.c
    1.173 06/01/11 17:28:45 tomas@stripped +10 -1
    more review comments fixes

# 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.172/client/mysqltest.c	2006-01-10 23:33:06 +01:00
+++ 1.173/client/mysqltest.c	2006-01-11 17:28:45 +01:00
@@ -852,6 +852,11 @@
   return v;
 }
 
+/*
+  - if variable starts with a $ it is regarded as a local test varable
+  - if not it is treated as a environment variable, and the corresponding
+  environment variable will be updated
+*/
 int var_set(const char *var_name, const char *var_name_end,
             const char *var_val, const char *var_val_end)
 {
@@ -1498,6 +1503,10 @@
   return do_sync_with_master2(offset);
 }
 
+/*
+  when ndb binlog is on, this call will wait until last updated epoch
+  (locally in the mysqld) has been received into the binlog
+*/
 int do_save_master_pos()
 {
   MYSQL_RES* res;
@@ -1509,7 +1518,7 @@
   rpl_parse = mysql_rpl_parse_enabled(mysql);
   mysql_disable_rpl_parse(mysql);
 
-#ifdef WITH_NDBCLUSTER_STORAGE_ENGINE
+#ifdef HAVE_NDB_BINLOG
   /*
      Wait for ndb binlog to be up-to-date with all changes
      done on the local mysql server

--- 1.148/sql/sql_repl.cc	2006-01-05 12:01:58 +01:00
+++ 1.149/sql/sql_repl.cc	2006-01-11 17:28:45 +01:00
@@ -1319,8 +1319,10 @@
                             Protocol::SEND_NUM_ROWS | Protocol::SEND_EOF))
     DBUG_RETURN(TRUE);
 
-  /* Wait for handlers to insert any pending information
-     into the binlog
+  /*
+    Wait for handlers to insert any pending information
+    into the binlog.  For e.g. ndb which updates the binlog asynchronously
+    this is needed so that the uses sees all its own commands in the binlog
   */
   ha_binlog_wait(thd);
 

--- 1.9/sql/ha_ndbcluster_binlog.cc	2006-01-11 17:14:07 +01:00
+++ 1.10/sql/ha_ndbcluster_binlog.cc	2006-01-11 17:28:45 +01:00
@@ -2660,8 +2660,8 @@
     ndb= 0;
   }
 
+  // Placed here to avoid a memory leak; TODO: check if needed
   net_end(&thd->net);
-  thd->cleanup();
   delete thd;
 
   ndb_binlog_thread_running= -1;
Thread
bk commit into 5.1 tree (tomas:1.2035)tomas11 Jan