bk commit into 5.1 tree (gbichot:1.2157)

[guilhem]

Below is the list of changes that have just been committed into a local
5.1 repository of gbichot. When gbichot 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.2157 06/05/17 22:43:47 gbichot@stripped +4 -0
  Merge bk://localhost:5556
  into  dl145j.mysql.com:/users/gbichot/mysql-5.1-new

  sql/mysqld.cc
    1.545 06/05/17 22:43:22 gbichot@stripped +0 -0
    Auto merged

  sql/log_event.cc
    1.223 06/05/17 22:43:19 gbichot@stripped +0 -0
    Auto merged

  mysql-test/extra/binlog_tests/binlog.test
    1.10 06/05/17 22:43:18 gbichot@stripped +0 -0
    Auto merged

  mysql-test/extra/binlog_tests/binlog.test
    1.7.1.2 06/05/17 22:43:16 gbichot@stripped +0 -0
    Change mode to -rw-rw-r--

  mysql-test/mysql-test-run.pl
    1.115 06/05/17 22:22:38 gbichot@stripped +0 -0
    Auto merged

# 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:	gbichot
# Host:	dl145j.mysql.com
# Root:	/users/gbichot/mysql-5.1-new/RESYNC

--- 1.222/sql/log_event.cc	2006-05-11 11:14:08 +02:00
+++ 1.223/sql/log_event.cc	2006-05-17 22:43:19 +02:00
@@ -3481,24 +3481,12 @@
   Xid_log_event methods
 **************************************************************************/
 
-#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)
 void Xid_log_event::pack_info(Protocol *protocol)
 {
   char buf[128], *pos;
   pos= strmov(buf, "COMMIT /* xid=");
-#if !defined(DBUG_OFF) && !defined(MYSQL_CLIENT)
-  if (show_xid)
-#endif
-    pos= longlong10_to_str(xid, pos, 10);
+  pos= longlong10_to_str(xid, pos, 10);
   pos= strmov(pos, " */");
   protocol->store(buf, (uint) (pos-buf), &my_charset_bin);
 }

--- 1.544/sql/mysqld.cc	2006-05-17 15:03:28 +02:00
+++ 1.545/sql/mysqld.cc	2006-05-17 22:43:22 +02:00
@@ -4882,14 +4882,6 @@
   {"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},
-#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,
    "The maximum size of a row-based binary log event in bytes. Rows will be "

--- 1.114/mysql-test/mysql-test-run.pl	2006-05-12 12:31:59 +02:00
+++ 1.115/mysql-test/mysql-test-run.pl	2006-05-17 22:22:38 +02:00
@@ -2597,7 +2597,6 @@
   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-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);
@@ -2743,7 +2742,6 @@
   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-show-xid=0", $prefix);
 
   if ( $opt_ssl_supported )
   {