bk commit into 5.1 tree (gbichot:1.2187)

[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.2187 06/03/18 12:12:53 gbichot@stripped +1 -0
  Merge gbichot@stripped:/home/bk/mysql-5.1-new
  into  production.mysql.com:/usersnfs/gbichot/mysql-5.1-new

  sql/mysqld.cc
    1.548 06/03/18 12:12:45 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:	production.mysql.com
# Root:	/usersnfs/gbichot/mysql-5.1-new/RESYNC

--- 1.547/sql/mysqld.cc	2006-03-16 13:29:56 +01:00
+++ 1.548/sql/mysqld.cc	2006-03-18 12:12:45 +01:00
@@ -4655,9 +4655,6 @@
   OPT_REPLICATE_IGNORE_DB,     OPT_LOG_SLAVE_UPDATES,
   OPT_BINLOG_DO_DB,            OPT_BINLOG_IGNORE_DB,
   OPT_BINLOG_FORMAT,
-#ifndef DBUG_OFF
-  OPT_BINLOG_SHOW_XID,
-#endif
 #ifdef HAVE_ROW_BASED_REPLICATION
   OPT_BINLOG_ROWS_EVENT_MAX_SIZE, 
 #endif
@@ -4919,14 +4916,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 "