diff options
| author | unknown <ramil/ram@mysql.com/ramil.myoffice.izhnet.ru> | 2007-08-01 15:31:20 +0500 |
|---|---|---|
| committer | unknown <ramil/ram@mysql.com/ramil.myoffice.izhnet.ru> | 2007-08-01 15:31:20 +0500 |
| commit | d4ba395aa6a61ed9c25838aec409270429db281b (patch) | |
| tree | dab728c3f27061a6f6225499edc46f884915bc46 /mysql-test/r/mysqlbinlog.result | |
| parent | 06cffaabd1ae2c054599ec7516c5b6bc94c0c609 (diff) | |
| parent | f87acb594a15b415b58a3053e76bfd1b27a6d594 (diff) | |
| download | mariadb-git-d4ba395aa6a61ed9c25838aec409270429db281b.tar.gz | |
Merge mysql.com:/home/ram/work/b29928.new/b29928.new.5.0
into mysql.com:/home/ram/work/b29928.new/b29928.new.5.1
mysql-test/r/mysqlbinlog.result:
Auto merged
sql/item_func.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
mysql-test/t/mysqlbinlog.test:
manual merge
Diffstat (limited to 'mysql-test/r/mysqlbinlog.result')
| -rw-r--r-- | mysql-test/r/mysqlbinlog.result | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/mysql-test/r/mysqlbinlog.result b/mysql-test/r/mysqlbinlog.result index 7a76e45ee10..f10ae4b4df5 100644 --- a/mysql-test/r/mysqlbinlog.result +++ b/mysql-test/r/mysqlbinlog.result @@ -319,6 +319,13 @@ INSERT INTO t1 VALUES ('0123456789'); flush logs; DROP TABLE t1; # Query thread_id=REMOVED exec_time=REMOVED error_code=REMOVED +flush logs; +create table t1(a int); +insert into t1 values(connection_id()); +flush logs; +drop table t1; +1 +drop table t1; End of 5.0 tests flush logs; End of 5.1 tests |