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.2181 06/03/17 16:50:48 gbichot@stripped +7 -0
XID in the output of SHOW BINLOG EVENTS is not repeatable (depends on if test
is run alone or with others). In Dec 2005 I added --binlog-show-xid in debug builds,
so that the tests output is deterministic. Now that mysqltest features replace_regex,
I remove this option. Note that it's ok to remove the option, as it was introduced in 5.1-alpha, only in debug builds, and the "mysqld --help"
said it's "used for testing and debugging, may be removed in the future", so does not affect users. Will push when tree gets better.
sql/mysqld.cc
1.546 06/03/17 16:50:42 gbichot@stripped +0 -11
Removing --binlog-show-xid.
sql/log_event.h
1.133 06/03/17 16:50:41 gbichot@stripped +0 -3
--binlog-show-xid is gone, its value was stored in the static
Xid_log_event::show_xid.
sql/log_event.cc
1.217 06/03/17 16:50:41 gbichot@stripped +1 -13
--binlog-show-xid is gone
mysql-test/mysql-test-run.sh
1.310 06/03/17 16:50:40 gbichot@stripped +0 -3
option is gone
mysql-test/mysql-test-run.pl
1.89 06/03/17 16:50:40 gbichot@stripped +0 -2
option is gone
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test
1.28 06/03/17 16:50:40 gbichot@stripped +13 -14
using replace_regex allows us to run this test in non-debug binaries too.
mysql-test/extra/binlog_tests/binlog.test
1.8 06/03/17 16:50:39 gbichot@stripped +3 -4
using replace_regex allows to run this test in non-debug binaries too
# 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
--- 1.309/mysql-test/mysql-test-run.sh 2006-03-07 21:26:45 +01:00
+++ 1.310/mysql-test/mysql-test-run.sh 2006-03-17 16:50:40 +01:00
@@ -1422,7 +1422,6 @@
--innodb_data_file_path=ibdata1:128M:autoextend \
--open-files-limit=1024 \
--log-bin-trust-function-creators \
- --loose-binlog-show-xid=0 \
$MASTER_40_ARGS \
$SMALL_SERVER \
$MASTER_MYSQLD_BINLOG_OPT \
@@ -1446,7 +1445,6 @@
--language=$LANGUAGE \
--innodb_data_file_path=ibdata1:128M:autoextend \
--log-bin-trust-function-creators \
- --loose-binlog-show-xid=0 \
$MASTER_40_ARGS \
$SMALL_SERVER \
$MASTER_MYSQLD_BINLOG_OPT \
@@ -1619,7 +1617,6 @@
--master-retry-count=10 \
-O slave_net_timeout=10 \
--log-bin-trust-function-creators \
- --loose-binlog-show-xid=0 \
$SMALL_SERVER \
$SLAVE_MYSQLD_BINLOG_OPT \
$EXTRA_SLAVE_MYSQLD_OPT $EXTRA_SLAVE_OPT \
--- 1.216/sql/log_event.cc 2006-03-13 16:00:20 +01:00
+++ 1.217/sql/log_event.cc 2006-03-17 16:50:41 +01:00
@@ -3450,24 +3450,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.132/sql/log_event.h 2006-03-08 21:49:44 +01:00
+++ 1.133/sql/log_event.h 2006-03-17 16:50:41 +01:00
@@ -1225,9 +1225,6 @@
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.545/sql/mysqld.cc 2006-03-13 18:57:54 +01:00
+++ 1.546/sql/mysqld.cc 2006-03-17 16:50:42 +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 "
--- 1.27/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test 2006-02-24 16:28:12 +01:00
+++ 1.28/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test 2006-03-17 16:50:40 +01:00
@@ -9,7 +9,6 @@
-- source include/not_embedded.inc
-- source include/have_innodb.inc
--- source include/have_debug.inc
--disable_warnings
drop table if exists t1, t2;
@@ -30,7 +29,7 @@
commit;
--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;
delete from t1;
@@ -44,7 +43,7 @@
rollback;
--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;
delete from t1;
@@ -60,7 +59,7 @@
commit;
--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;
delete from t1;
@@ -78,7 +77,7 @@
select a from t1 order by a; # check that savepoints work :)
--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;
# and when ROLLBACK is not explicit?
@@ -100,7 +99,7 @@
# logging has been done, we use a user lock.
select get_lock("a",10);
--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;
# and when not in a transact1on?
@@ -112,7 +111,7 @@
insert into t2 select * from t1;
--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;
# Check that when the query updat1ng the MyISAM table is the first in the
@@ -125,13 +124,13 @@
begin;
insert into t2 select * from t1;
--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;
insert into t1 values(11);
commit;
--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;
@@ -150,7 +149,7 @@
commit;
--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;
delete from t1;
@@ -163,7 +162,7 @@
rollback;
--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;
delete from t1;
@@ -179,7 +178,7 @@
commit;
--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;
delete from t1;
@@ -197,7 +196,7 @@
select a from t1 order by a; # check that savepoints work :)
--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;
# Test for BUG#5714, where a MyISAM update in the transaction used to
@@ -258,7 +257,7 @@
connection con3;
select get_lock("lock1",60);
--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;
do release_lock("lock1");
drop table t0,t2;
--- 1.88/mysql-test/mysql-test-run.pl 2006-03-14 11:24:57 +01:00
+++ 1.89/mysql-test/mysql-test-run.pl 2006-03-17 16:50:40 +01:00
@@ -2505,7 +2505,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);
@@ -2645,7 +2644,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 )
{
--- 1.7/mysql-test/extra/binlog_tests/binlog.test 2006-02-28 09:53:03 +01:00
+++ 1.8/mysql-test/extra/binlog_tests/binlog.test 2006-03-17 16:50:39 +01:00
@@ -5,7 +5,6 @@
-- source include/not_embedded.inc
-- source include/have_bdb.inc
-- source include/have_innodb.inc
--- source include/have_debug.inc
--disable_warnings
drop table if exists t1, t2;
@@ -22,7 +21,7 @@
commit;
# first COMMIT must be Query_log_event, second - Xid_log_event
--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;
drop table t1,t2;
@@ -44,8 +43,8 @@
commit;
drop table t1;
--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;
--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;
| Thread |
|---|
| • bk commit into 5.1 tree (gbichot:1.2181) | guilhem | 17 Mar |
