diff options
| author | unknown <mkindahl@dl145h.mysql.com> | 2007-11-15 13:31:39 +0100 |
|---|---|---|
| committer | unknown <mkindahl@dl145h.mysql.com> | 2007-11-15 13:31:39 +0100 |
| commit | 9e0d1dbd0a2889ecce3506da4a17ba6c2e0d9da5 (patch) | |
| tree | d03eb4d843f8ff15df435e97127d4b41ce7897fe /mysql-test/r/mysqlbinlog.result | |
| parent | 8f798dffea964598eed2a02ed6cfcb7ba7c0fb6e (diff) | |
| parent | 5a3baf3d05824ebd6581eea8a717bd982ca5bba5 (diff) | |
| download | mariadb-git-9e0d1dbd0a2889ecce3506da4a17ba6c2e0d9da5.tar.gz | |
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
mysql-test/r/mysqlbinlog.result:
Auto merged
mysql-test/t/mysqlbinlog.test:
Auto merged
sql/log_event.cc:
Auto merged
BitKeeper/deleted/.del-compile-solaris-amd64:
Delete: BUILD/compile-solaris-amd64
Diffstat (limited to 'mysql-test/r/mysqlbinlog.result')
| -rw-r--r-- | mysql-test/r/mysqlbinlog.result | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/r/mysqlbinlog.result b/mysql-test/r/mysqlbinlog.result index 1deb9401aa1..e6485720c49 100644 --- a/mysql-test/r/mysqlbinlog.result +++ b/mysql-test/r/mysqlbinlog.result @@ -326,6 +326,7 @@ flush logs; drop table t1; 1 drop table t1; +shell> mysqlbinlog std_data/corrupt-relay-bin.000624 > var/tmp/bug31793.sql End of 5.0 tests flush logs; BUG#31611: Security risk with BINLOG statement |