summaryrefslogtreecommitdiff
path: root/mysql-test/r/mysqlbinlog.result
diff options
context:
space:
mode:
authorunknown <mats@mysql.com>2005-02-10 19:15:53 +0100
committerunknown <mats@mysql.com>2005-02-10 19:15:53 +0100
commit6520c161cf4d8f80a7701841e8e94ee53b95f6ed (patch)
tree56f1937e9b425efebfb44778547ae4244b1b9131 /mysql-test/r/mysqlbinlog.result
parent6cdda5b38b732d29aad9b6be487a74b3a0385bfa (diff)
parent00a71ae83ae3ddc6448852c31ad486025b5e197c (diff)
downloadmariadb-git-6520c161cf4d8f80a7701841e8e94ee53b95f6ed.tar.gz
Merge mysql.com:/home/bkroot/mysql-5.0
into mysql.com:/home/bk/b7853-mysql-5.0 client/mysqlbinlog.cc: Auto merged mysql-test/r/mysqlbinlog.result: Auto merged
Diffstat (limited to 'mysql-test/r/mysqlbinlog.result')
-rw-r--r--mysql-test/r/mysqlbinlog.result10
1 files changed, 10 insertions, 0 deletions
diff --git a/mysql-test/r/mysqlbinlog.result b/mysql-test/r/mysqlbinlog.result
index 33fddabf232..7f5adf799e3 100644
--- a/mysql-test/r/mysqlbinlog.result
+++ b/mysql-test/r/mysqlbinlog.result
@@ -102,4 +102,14 @@ SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.uniq
SET @@session.sql_mode=0;
SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8;
insert into t1 values ("Alas");
+
+--- reading stdin --
+/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+use test;
+SET TIMESTAMP=1065204671;
+BEGIN;
+/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+use test;
+SET TIMESTAMP=1065204671;
+BEGIN;
drop table t1, t2;