List:Commits« Previous MessageNext Message »
From:guilhem Date:December 14 2005 9:14pm
Subject:bk commit into 5.1 tree (guilhem:1.1963)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of guilhem. When guilhem 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.1963 05/12/14 22:13:55 guilhem@stripped +5 -0
  WL#1012 "row-based replication": cosmetic changes:
  binlog_no_xid renamed to binlog_show_xid=0|1, and the global variable binlog_no_xid
  becomes a static member of Xid_log_event as only Xid_log_event methods use it (sounds tidier this way).

  sql/mysqld.cc
    1.504 05/12/14 22:13:50 guilhem@stripped +8 -6
    better description for --binlog-no-xid (to emphasize that people should not start
    relying in this option, please) and renaming. It may be removed when we implement
    a --replace-regex command in mysqltest. 

  sql/log_event.h
    1.146 05/12/14 22:13:50 guilhem@stripped +3 -4
    global binlog_no_xid moves to Xid_log_event

  sql/log_event.cc
    1.202 05/12/14 22:13:50 guilhem@stripped +10 -3
    global binlog_no_xid is now a static class member of Xid_log_event, and is not in mysqlbinlog

  mysql-test/mysql-test-run.sh
    1.283 05/12/14 22:13:50 guilhem@stripped +3 -3
    better name for option

  mysql-test/mysql-test-run.pl
    1.45 05/12/14 22:13:50 guilhem@stripped +2 -2
    better name for option

# 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:	guilhem
# Host:	gbichot3.local
# Root:	/home/mysql_src/mysql-5.1-wl1012-v3

--- 1.282/mysql-test/mysql-test-run.sh	2005-12-14 16:45:00 +01:00
+++ 1.283/mysql-test/mysql-test-run.sh	2005-12-14 22:13:50 +01:00
@@ -1290,7 +1290,7 @@
           --innodb_data_file_path=ibdata1:128M:autoextend \
 	  --open-files-limit=1024 \
           --log-bin-trust-function-creators \
-          --loose-binlog-no-xid \
+          --loose-binlog-show-xid=0 \
 	   $MASTER_40_ARGS \
            $SMALL_SERVER \
            $EXTRA_MASTER_MYSQLD_OPT $EXTRA_MASTER_OPT \
@@ -1312,7 +1312,7 @@
           --language=$LANGUAGE \
           --innodb_data_file_path=ibdata1:128M:autoextend \
           --log-bin-trust-function-creators \
-          --loose-binlog-no-xid \
+          --loose-binlog-show-xid=0 \
 	   $MASTER_40_ARGS \
            $SMALL_SERVER \
            $EXTRA_MASTER_MYSQLD_OPT $EXTRA_MASTER_OPT \
@@ -1446,7 +1446,7 @@
           --master-retry-count=10 \
           -O slave_net_timeout=10 \
           --log-bin-trust-function-creators \
-          --loose-binlog-no-xid \
+          --loose-binlog-show-xid=0 \
            $SMALL_SERVER \
            $EXTRA_SLAVE_MYSQLD_OPT $EXTRA_SLAVE_OPT"
   CUR_MYERR=$slave_err

--- 1.201/sql/log_event.cc	2005-12-14 16:45:01 +01:00
+++ 1.202/sql/log_event.cc	2005-12-14 22:13:50 +01:00
@@ -3384,8 +3384,13 @@
   Xid_log_event methods
 **************************************************************************/
 
-#ifndef DBUG_OFF
-my_bool binlog_no_xid;
+#if !defined(DBUG_OFF) && !defined(MYSQL_CLIENT)
+/*
+  This static class member could be removed when mysqltest is made to support
+  a --replace-regex command: then tests which have XIDs in their output can
+  use this command to suppress non-deterministic XID values.
+*/
+my_bool Xid_log_event::show_xid;
 #endif
 
 #if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT)
@@ -3393,7 +3398,9 @@
 {
   char buf[128], *pos;
   pos= strmov(buf, "COMMIT /* xid=");
-  if (!binlog_no_xid)
+#if !defined(DBUG_OFF) && !defined(MYSQL_CLIENT)
+  if (show_xid)
+#endif
     pos= longlong10_to_str(xid, pos, 10);
   pos= strmov(pos, " */");
   protocol->store(buf, (uint) (pos-buf), &my_charset_bin);

--- 1.145/sql/log_event.h	2005-12-14 16:45:01 +01:00
+++ 1.146/sql/log_event.h	2005-12-14 22:13:50 +01:00
@@ -1202,10 +1202,6 @@
 typedef ulonglong my_xid; // this line is the same as in handler.h
 #endif
 
-#ifndef DBUG_OFF
-extern my_bool binlog_no_xid;
-#endif
-
 class Xid_log_event: public Log_event
 {
  public:
@@ -1229,6 +1225,9 @@
   bool write(IO_CACHE* file);
 #endif
   bool is_valid() const { return 1; }
+#if !defined(DBUG_OFF) && !defined(MYSQL_CLIENT)
+  static my_bool show_xid;
+#endif
 };
 
 /*****************************************************************************

--- 1.503/sql/mysqld.cc	2005-12-14 16:45:01 +01:00
+++ 1.504/sql/mysqld.cc	2005-12-14 22:13:50 +01:00
@@ -4560,7 +4560,7 @@
   OPT_BINLOG_DO_DB,            OPT_BINLOG_IGNORE_DB,
   OPT_BINLOG_FORMAT,
 #ifndef DBUG_OFF
-  OPT_BINLOG_NO_XID,
+  OPT_BINLOG_SHOW_XID,
 #endif
 #ifdef HAVE_ROW_BASED_REPLICATION
   OPT_BINLOG_ROWS_EVENT_MAX_SIZE, 
@@ -4812,11 +4812,13 @@
   {"binlog-ignore-db", OPT_BINLOG_IGNORE_DB,
    "Tells the master that updates to the given database should not be logged tothe binary log.",
    0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
-#ifndef DBUG_OFF
-  {"binlog-no-xid", OPT_BINLOG_NO_XID,
-   "For testing: do not display the XID in SHOW BINLOG EVENTS",
-   (gptr*) &binlog_no_xid, (gptr*) &binlog_no_xid, 0, GET_BOOL,
-   NO_ARG, 0, 0, 0, 0, 0, 0},
+#if !defined(DBUG_OFF) && !defined(MYSQL_CLIENT)
+  {"binlog-show-xid", OPT_BINLOG_SHOW_XID,
+   "Option used by mysql-test for debugging and testing: "
+   "do not display the XID in SHOW BINLOG EVENTS; "
+   "may be removed in future versions",
+   (gptr*) &Xid_log_event::show_xid, (gptr*) &Xid_log_event::show_xid,
+   0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0},
 #endif
 #ifdef HAVE_ROW_BASED_REPLICATION
   {"binlog-row-event-max-size", OPT_BINLOG_ROWS_EVENT_MAX_SIZE,

--- 1.44/mysql-test/mysql-test-run.pl	2005-12-14 16:45:00 +01:00
+++ 1.45/mysql-test/mysql-test-run.pl	2005-12-14 22:13:50 +01:00
@@ -2041,7 +2041,7 @@
   mtr_add_arg($args, "%s--character-sets-dir=%s", $prefix, $path_charsetsdir);
   mtr_add_arg($args, "%s--core", $prefix);
   mtr_add_arg($args, "%s--log-bin-trust-function-creators", $prefix);
-  mtr_add_arg($args, "%s--loose-binlog-no-xid", $prefix);
+  mtr_add_arg($args, "%s--loose-binlog-show-xid=0", $prefix);
   mtr_add_arg($args, "%s--default-character-set=latin1", $prefix);
   mtr_add_arg($args, "%s--language=%s", $prefix, $path_language);
   mtr_add_arg($args, "%s--tmpdir=$opt_tmpdir", $prefix);
@@ -2165,7 +2165,7 @@
   mtr_add_arg($args, "%s--sort_buffer=256K", $prefix);
   mtr_add_arg($args, "%s--max_heap_table_size=1M", $prefix);
   mtr_add_arg($args, "%s--log-bin-trust-function-creators", $prefix);
-  mtr_add_arg($args, "%s--loose-binlog-no-xid", $prefix);
+  mtr_add_arg($args, "%s--loose-binlog-show-xid=0", $prefix);
 
   if ( $opt_ssl_supported )
   {
Thread
bk commit into 5.1 tree (guilhem:1.1963)guilhem14 Dec