diff options
| author | unknown <jani@ua141d10.elisa.omakaista.fi> | 2006-05-31 14:18:12 +0300 |
|---|---|---|
| committer | unknown <jani@ua141d10.elisa.omakaista.fi> | 2006-05-31 14:18:12 +0300 |
| commit | aca736a4db1c26c53b5482b38d7e6774147e3fbc (patch) | |
| tree | 87754cff7f5f48a34e91eb02337121d08247dd46 /sql/mysqld.cc | |
| parent | dd370c9a23bcdbdef04e005437f2bf5e767fef1a (diff) | |
| parent | c402b00638a7912fd8bc55ab38db9a30eaeaf879 (diff) | |
| download | mariadb-git-aca736a4db1c26c53b5482b38d7e6774147e3fbc.tar.gz | |
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-new-marvel
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 029290d9f39..7f7136921ea 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -4901,14 +4901,6 @@ Disable with --skip-bdb (will save memory).", {"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 " |