diff options
| author | Andrei Elkin <aelkin@mysql.com> | 2009-02-24 16:59:46 +0200 |
|---|---|---|
| committer | Andrei Elkin <aelkin@mysql.com> | 2009-02-24 16:59:46 +0200 |
| commit | 5b0721786ef51b8432bdbdb564348b4f5a22d4f3 (patch) | |
| tree | 5e487359d87e6c53aab379a96844c0e68e8dd156 /mysql-test/t | |
| parent | e641a297b043e4b8c26c26bd9aeb9008f97a4cf4 (diff) | |
| parent | a6ac350b3aacb277a15b8c2b03da4af049556bec (diff) | |
| download | mariadb-git-5b0721786ef51b8432bdbdb564348b4f5a22d4f3.tar.gz | |
merging bug#37313fixes from 5.0-bt to 5.1-bt
Diffstat (limited to 'mysql-test/t')
| -rw-r--r-- | mysql-test/t/mysqlbinlog.test | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/mysql-test/t/mysqlbinlog.test b/mysql-test/t/mysqlbinlog.test index 96965ba1793..d73f4356877 100644 --- a/mysql-test/t/mysqlbinlog.test +++ b/mysql-test/t/mysqlbinlog.test @@ -278,27 +278,6 @@ echo shell> mysqlbinlog std_data/corrupt-relay-bin.000624 > var/tmp/bug31793.sql error 1; exec $MYSQL_BINLOG $MYSQL_TEST_DIR/std_data/corrupt-relay-bin.000624 > $MYSQLTEST_VARDIR/tmp/bug31793.sql; -# -# Bug #37313 BINLOG Contains Incorrect server id -# - -let $save_server_id= `select @@global.server_id`; -let $s_id_max=`select (1 << 32) - 1`; -eval set @@global.server_id= $s_id_max; - -reset master; ---exec $MYSQL_BINLOG $MYSQLTEST_VARDIR/log/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/mysqlbinlog_bug37313.binlog ---replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR -eval select -(@a:=load_file("$MYSQLTEST_VARDIR/tmp/mysqlbinlog_bug37313.binlog")) -is not null; -let $s_id_unsigned= `select @a like "%server id $s_id_max%" /* must return 1 */`; -echo *** Unsigned server_id $s_id_max is found: $s_id_unsigned ***; - -eval set @@global.server_id= $save_server_id; ---remove_file $MYSQLTEST_VARDIR/tmp/mysqlbinlog_bug37313.binlog - ---echo End of 5.0 tests # # Test --disable-force-if-open and --force-if-open @@ -363,4 +342,25 @@ remove_file $MYSQLTEST_VARDIR/tmp/bug32580.sql; query_vertical SELECT * FROM t1; DROP TABLE t1; +# +# Bug #37313 BINLOG Contains Incorrect server id +# + +let $save_server_id= `select @@global.server_id`; +let $s_id_max=`select (1 << 32) - 1`; +eval set @@global.server_id= $s_id_max; + +reset master; +flush logs; +--exec $MYSQL_BINLOG $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/mysqlbinlog_bug37313.binlog +--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR +eval select +(@a:=load_file("$MYSQLTEST_VARDIR/tmp/mysqlbinlog_bug37313.binlog")) +is not null; +let $s_id_unsigned= `select @a like "%server id $s_id_max%" /* must return 1 */`; +echo *** Unsigned server_id $s_id_max is found: $s_id_unsigned ***; + +eval set @@global.server_id= $save_server_id; +--remove_file $MYSQLTEST_VARDIR/tmp/mysqlbinlog_bug37313.binlog + --echo End of 5.1 tests |