Skip to content

M
mariadb
Commit bb0a990a authored by unknown's avatar unknown
Browse files
Options

Merge bk://localhost:5556 

into  dl145j.mysql.com:/users/gbichot/mysql-5.1-new


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/extra/binlog_tests/binlog.test:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
parents 2d0297f0 fb1ed390
Show whitespace changes
Inline Side-by-side
Showing with 17 additions and 45 deletions
mysql-test/extra/binlog_tests/binlog.test
View file @ bb0a990a
...@@ -22,7 +22,7 @@ insert t2 values (5); ...@@ -22,7 +22,7 @@ insert t2 values (5);
commit; commit;
# first COMMIT must be Query_log_event, second - Xid_log_event # first COMMIT must be Query_log_event, second - Xid_log_event
--replace_column 2 # 5 # --replace_column 2 # 5 #
--replace_regex /table_id: [0-9]+/table_id: #/ --replace_regex /table_id: [0-9]+/table_id: #/ /\/\* xid=.* \*\//\/* xid= *\//
show binlog events from 102; show binlog events from 102;
drop table t1,t2; drop table t1,t2;
...@@ -44,8 +44,8 @@ while ($1) ...@@ -44,8 +44,8 @@ while ($1)
commit; commit;
drop table t1; drop table t1;
--replace_column 2 # 5 # --replace_column 2 # 5 #
--replace_regex /table_id: [0-9]+/table_id: #/ --replace_regex /table_id: [0-9]+/table_id: #/ /\/\* xid=.* \*\//\/* xid= *\//
show binlog events in 'master-bin.000001' from 102; show binlog events in 'master-bin.000001' from 102;
--replace_column 2 # 5 # --replace_column 2 # 5 #
--replace_regex /table_id: [0-9]+/table_id: #/ --replace_regex /table_id: [0-9]+/table_id: #/ /\/\* xid=.* \*\//\/* xid= *\//
show binlog events in 'master-bin.000002' from 102; show binlog events in 'master-bin.000002' from 102;
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test
View file @ bb0a990a
...@@ -30,7 +30,7 @@ insert into t2 select * from t1; ...@@ -30,7 +30,7 @@ insert into t2 select * from t1;
commit; commit;
--replace_column 5 # --replace_column 5 #
--replace_regex /table_id: [0-9]+/table_id: #/ --replace_regex /table_id: [0-9]+/table_id: #/ /\/\* xid=.* \*\//\/* xid= *\//
show binlog events from 102; show binlog events from 102;
delete from t1; delete from t1;
...@@ -44,7 +44,7 @@ insert into t2 select * from t1; ...@@ -44,7 +44,7 @@ insert into t2 select * from t1;
rollback; rollback;
--replace_column 5 # --replace_column 5 #
--replace_regex /table_id: [0-9]+/table_id: #/ --replace_regex /table_id: [0-9]+/table_id: #/ /\/\* xid=.* \*\//\/* xid= *\//
show binlog events from 102; show binlog events from 102;
delete from t1; delete from t1;
...@@ -60,7 +60,7 @@ rollback to savepoint my_savepoint; ...@@ -60,7 +60,7 @@ rollback to savepoint my_savepoint;
commit; commit;
--replace_column 5 # --replace_column 5 #
--replace_regex /table_id: [0-9]+/table_id: #/ --replace_regex /table_id: [0-9]+/table_id: #/ /\/\* xid=.* \*\//\/* xid= *\//
show binlog events from 102; show binlog events from 102;
delete from t1; delete from t1;
...@@ -78,7 +78,7 @@ commit; ...@@ -78,7 +78,7 @@ commit;
select a from t1 order by a; # check that savepoints work :) select a from t1 order by a; # check that savepoints work :)
--replace_column 5 # --replace_column 5 #
--replace_regex /table_id: [0-9]+/table_id: #/ --replace_regex /table_id: [0-9]+/table_id: #/ /\/\* xid=.* \*\//\/* xid= *\//
show binlog events from 102; show binlog events from 102;
# and when ROLLBACK is not explicit? # and when ROLLBACK is not explicit?
...@@ -100,7 +100,7 @@ connection con2; ...@@ -100,7 +100,7 @@ connection con2;
# logging has been done, we use a user lock. # logging has been done, we use a user lock.
select get_lock("a",10); select get_lock("a",10);
--replace_column 5 # --replace_column 5 #
--replace_regex /table_id: [0-9]+/table_id: #/ --replace_regex /table_id: [0-9]+/table_id: #/ /\/\* xid=.* \*\//\/* xid= *\//
show binlog events from 102; show binlog events from 102;
# and when not in a transact1on? # and when not in a transact1on?
...@@ -112,7 +112,7 @@ insert into t1 values(9); ...@@ -112,7 +112,7 @@ insert into t1 values(9);
insert into t2 select * from t1; insert into t2 select * from t1;
--replace_column 5 # --replace_column 5 #
--replace_regex /table_id: [0-9]+/table_id: #/ --replace_regex /table_id: [0-9]+/table_id: #/ /\/\* xid=.* \*\//\/* xid= *\//
show binlog events from 102; show binlog events from 102;
# Check that when the query updat1ng the MyISAM table is the first in the # Check that when the query updat1ng the MyISAM table is the first in the
...@@ -125,13 +125,13 @@ insert into t1 values(10); # first make t1 non-empty ...@@ -125,13 +125,13 @@ insert into t1 values(10); # first make t1 non-empty
begin; begin;
insert into t2 select * from t1; insert into t2 select * from t1;
--replace_column 5 # --replace_column 5 #
--replace_regex /table_id: [0-9]+/table_id: #/ --replace_regex /table_id: [0-9]+/table_id: #/ /\/\* xid=.* \*\//\/* xid= *\//
show binlog events from 102; show binlog events from 102;
insert into t1 values(11); insert into t1 values(11);
commit; commit;
--replace_column 5 # --replace_column 5 #
--replace_regex /table_id: [0-9]+/table_id: #/ --replace_regex /table_id: [0-9]+/table_id: #/ /\/\* xid=.* \*\//\/* xid= *\//
show binlog events from 102; show binlog events from 102;
...@@ -150,7 +150,7 @@ insert into t2 select * from t1; ...@@ -150,7 +150,7 @@ insert into t2 select * from t1;
commit; commit;
--replace_column 5 # --replace_column 5 #
--replace_regex /table_id: [0-9]+/table_id: #/ --replace_regex /table_id: [0-9]+/table_id: #/ /\/\* xid=.* \*\//\/* xid= *\//
show binlog events from 102; show binlog events from 102;
delete from t1; delete from t1;
...@@ -163,7 +163,7 @@ insert into t2 select * from t1; ...@@ -163,7 +163,7 @@ insert into t2 select * from t1;
rollback; rollback;
--replace_column 5 # --replace_column 5 #
--replace_regex /table_id: [0-9]+/table_id: #/ --replace_regex /table_id: [0-9]+/table_id: #/ /\/\* xid=.* \*\//\/* xid= *\//
show binlog events from 102; show binlog events from 102;
delete from t1; delete from t1;
...@@ -179,7 +179,7 @@ rollback to savepoint my_savepoint; ...@@ -179,7 +179,7 @@ rollback to savepoint my_savepoint;
commit; commit;
--replace_column 5 # --replace_column 5 #
--replace_regex /table_id: [0-9]+/table_id: #/ --replace_regex /table_id: [0-9]+/table_id: #/ /\/\* xid=.* \*\//\/* xid= *\//
show binlog events from 102; show binlog events from 102;
delete from t1; delete from t1;
...@@ -197,7 +197,7 @@ commit; ...@@ -197,7 +197,7 @@ commit;
select a from t1 order by a; # check that savepoints work :) select a from t1 order by a; # check that savepoints work :)
--replace_column 5 # --replace_column 5 #
--replace_regex /table_id: [0-9]+/table_id: #/ --replace_regex /table_id: [0-9]+/table_id: #/ /\/\* xid=.* \*\//\/* xid= *\//
show binlog events from 102; show binlog events from 102;
# Test for BUG#5714, where a MyISAM update in the transaction used to # Test for BUG#5714, where a MyISAM update in the transaction used to
...@@ -258,7 +258,7 @@ disconnect con2; ...@@ -258,7 +258,7 @@ disconnect con2;
connection con3; connection con3;
select get_lock("lock1",60); select get_lock("lock1",60);
--replace_column 5 # --replace_column 5 #
--replace_regex /table_id: [0-9]+/table_id: #/ --replace_regex /table_id: [0-9]+/table_id: #/ /\/\* xid=.* \*\//\/* xid= *\//
show binlog events from 102; show binlog events from 102;
do release_lock("lock1"); do release_lock("lock1");
drop table t0,t2; drop table t0,t2;
......
mysql-test/mysql-test-run.pl
View file @ bb0a990a
...@@ -2597,7 +2597,6 @@ sub mysqld_arguments ($$$$$$) { ...@@ -2597,7 +2597,6 @@ sub mysqld_arguments ($$$$$$) {
mtr_add_arg($args, "%s--character-sets-dir=%s", $prefix, $path_charsetsdir); mtr_add_arg($args, "%s--character-sets-dir=%s", $prefix, $path_charsetsdir);
mtr_add_arg($args, "%s--core", $prefix); mtr_add_arg($args, "%s--core", $prefix);
mtr_add_arg($args, "%s--log-bin-trust-function-creators", $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--default-character-set=latin1", $prefix);
mtr_add_arg($args, "%s--language=%s", $prefix, $path_language); mtr_add_arg($args, "%s--language=%s", $prefix, $path_language);
mtr_add_arg($args, "%s--tmpdir=$opt_tmpdir", $prefix); mtr_add_arg($args, "%s--tmpdir=$opt_tmpdir", $prefix);
...@@ -2743,7 +2742,6 @@ sub mysqld_arguments ($$$$$$) { ...@@ -2743,7 +2742,6 @@ sub mysqld_arguments ($$$$$$) {
mtr_add_arg($args, "%s--sort_buffer=256K", $prefix); 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--max_heap_table_size=1M", $prefix);
mtr_add_arg($args, "%s--log-bin-trust-function-creators", $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 ) if ( $opt_ssl_supported )
{ {
......
mysql-test/mysql-test-run.sh
View file @ bb0a990a
...@@ -1345,7 +1345,6 @@ start_master() ...@@ -1345,7 +1345,6 @@ start_master()
--innodb_data_file_path=ibdata1:128M:autoextend \ --innodb_data_file_path=ibdata1:128M:autoextend \
--open-files-limit=1024 \ --open-files-limit=1024 \
--log-bin-trust-function-creators \ --log-bin-trust-function-creators \
--loose-binlog-show-xid=0 \
$MASTER_40_ARGS \ $MASTER_40_ARGS \
$SMALL_SERVER \ $SMALL_SERVER \
$MASTER_MYSQLD_BINLOG_OPT \ $MASTER_MYSQLD_BINLOG_OPT \
...@@ -1369,7 +1368,6 @@ start_master() ...@@ -1369,7 +1368,6 @@ start_master()
--language=$LANGUAGE \ --language=$LANGUAGE \
--innodb_data_file_path=ibdata1:128M:autoextend \ --innodb_data_file_path=ibdata1:128M:autoextend \
--log-bin-trust-function-creators \ --log-bin-trust-function-creators \
--loose-binlog-show-xid=0 \
$MASTER_40_ARGS \ $MASTER_40_ARGS \
$SMALL_SERVER \ $SMALL_SERVER \
$MASTER_MYSQLD_BINLOG_OPT \ $MASTER_MYSQLD_BINLOG_OPT \
...@@ -1542,7 +1540,6 @@ start_slave() ...@@ -1542,7 +1540,6 @@ start_slave()
--master-retry-count=10 \ --master-retry-count=10 \
-O slave_net_timeout=10 \ -O slave_net_timeout=10 \
--log-bin-trust-function-creators \ --log-bin-trust-function-creators \
--loose-binlog-show-xid=0 \
$SMALL_SERVER \ $SMALL_SERVER \
$SLAVE_MYSQLD_BINLOG_OPT \ $SLAVE_MYSQLD_BINLOG_OPT \
$EXTRA_SLAVE_MYSQLD_OPT $EXTRA_SLAVE_OPT \ $EXTRA_SLAVE_MYSQLD_OPT $EXTRA_SLAVE_OPT \
......
sql/log_event.cc
View file @ bb0a990a
...@@ -3481,23 +3481,11 @@ int Rand_log_event::exec_event(struct st_relay_log_info* rli) ...@@ -3481,23 +3481,11 @@ int Rand_log_event::exec_event(struct st_relay_log_info* rli)
Xid_log_event methods 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) #if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT)
void Xid_log_event::pack_info(Protocol *protocol) void Xid_log_event::pack_info(Protocol *protocol)
{ {
char buf[128], *pos; char buf[128], *pos;
pos= strmov(buf, "COMMIT /* xid="); 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, " */"); pos= strmov(pos, " */");
protocol->store(buf, (uint) (pos-buf), &my_charset_bin); protocol->store(buf, (uint) (pos-buf), &my_charset_bin);
......
sql/log_event.h
View file @ bb0a990a
...@@ -1221,9 +1221,6 @@ class Xid_log_event: public Log_event ...@@ -1221,9 +1221,6 @@ class Xid_log_event: public Log_event
bool write(IO_CACHE* file); bool write(IO_CACHE* file);
#endif #endif
bool is_valid() const { return 1; } bool is_valid() const { return 1; }
#if !defined(DBUG_OFF) && !defined(MYSQL_CLIENT)
static my_bool show_xid;
#endif
}; };
/***************************************************************************** /*****************************************************************************
......
sql/mysqld.cc
View file @ bb0a990a
...@@ -4882,14 +4882,6 @@ Disable with --skip-bdb (will save memory).", ...@@ -4882,14 +4882,6 @@ Disable with --skip-bdb (will save memory).",
{"binlog-ignore-db", OPT_BINLOG_IGNORE_DB, {"binlog-ignore-db", OPT_BINLOG_IGNORE_DB,
"Tells the master that updates to the given database should not be logged tothe binary log.", "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}, 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 #ifdef HAVE_ROW_BASED_REPLICATION
{"binlog-row-event-max-size", OPT_BINLOG_ROWS_EVENT_MAX_SIZE, {"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 " "The maximum size of a row-based binary log event in bytes. Rows will be "
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7