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/r/mysqlbinlog.result | |
| 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/r/mysqlbinlog.result')
| -rw-r--r-- | mysql-test/r/mysqlbinlog.result | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/mysql-test/r/mysqlbinlog.result b/mysql-test/r/mysqlbinlog.result index 2ded167e6bd..1efa944bf9b 100644 --- a/mysql-test/r/mysqlbinlog.result +++ b/mysql-test/r/mysqlbinlog.result @@ -411,17 +411,6 @@ drop table t1; 1 drop table t1; shell> mysqlbinlog std_data/corrupt-relay-bin.000624 > var/tmp/bug31793.sql -set @@global.server_id= 4294967295; -reset master; -select -(@a:=load_file("MYSQLTEST_VARDIR/tmp/mysqlbinlog_bug37313.binlog")) -is not null; -(@a:=load_file("MYSQLTEST_VARDIR/tmp/mysqlbinlog_bug37313.binlog")) -is not null -1 -*** Unsigned server_id 4294967295 is found: 1 *** -set @@global.server_id= 1; -End of 5.0 tests flush logs; BUG#31611: Security risk with BINLOG statement SET BINLOG_FORMAT=ROW; @@ -471,4 +460,15 @@ an_int 1000 a_decimal 907.79 a_string Just a test DROP TABLE t1; +set @@global.server_id= 4294967295; +reset master; +flush logs; +select +(@a:=load_file("MYSQLTEST_VARDIR/tmp/mysqlbinlog_bug37313.binlog")) +is not null; +(@a:=load_file("MYSQLTEST_VARDIR/tmp/mysqlbinlog_bug37313.binlog")) +is not null +1 +*** Unsigned server_id 4294967295 is found: 1 *** +set @@global.server_id= 1; End of 5.1 tests |