diff options
| author | unknown <holyfoot/hf@mysql.com/deer.(none)> | 2006-12-08 15:22:46 +0400 |
|---|---|---|
| committer | unknown <holyfoot/hf@mysql.com/deer.(none)> | 2006-12-08 15:22:46 +0400 |
| commit | 5e3f06db4285a8cdffff3f764eb9ab937b0bd5a7 (patch) | |
| tree | 43128114a85f5d57da70cd789bda9061ff995896 /mysql-test/r/flush_block_commit.result | |
| parent | e8be5f6d50cf87ca36f77c08a6ab76688aca411d (diff) | |
| parent | ea1f7e4b5697c3275c301011beaa394548f273ae (diff) | |
| download | mariadb-git-5e3f06db4285a8cdffff3f764eb9ab937b0bd5a7.tar.gz | |
Merge bk@192.168.21.1:mysql-5.0-opt
into mysql.com:/home/hf/work/embt/my50-embt
libmysqld/lib_sql.cc:
Auto merged
mysql-test/include/federated.inc:
Auto merged
mysql-test/t/flush_block_commit.test:
Auto merged
mysql-test/t/innodb.test:
Auto merged
mysql-test/t/join.test:
Auto merged
mysql-test/t/status.test:
Auto merged
mysql-test/t/trigger.test:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
mysql-test/mysql-test-run.pl:
merging
mysql-test/r/flush_block_commit.result:
SCCS merged
Diffstat (limited to 'mysql-test/r/flush_block_commit.result')
| -rw-r--r-- | mysql-test/r/flush_block_commit.result | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/mysql-test/r/flush_block_commit.result b/mysql-test/r/flush_block_commit.result index 9e9085d2fc8..d5b10868358 100644 --- a/mysql-test/r/flush_block_commit.result +++ b/mysql-test/r/flush_block_commit.result @@ -37,18 +37,3 @@ show create database test; Database Create Database test CREATE DATABASE `test` /*!40100 DEFAULT CHARACTER SET latin1 */ drop table t1; -create table t1 (a int) engine=innodb; -reset master; -set autocommit=0; -insert t1 values (1); -flush tables with read lock; -show master status; -File Position Binlog_Do_DB Binlog_Ignore_DB -master-bin.000001 98 -commit; -show master status; -File Position Binlog_Do_DB Binlog_Ignore_DB -master-bin.000001 98 -unlock tables; -drop table t1; -set autocommit=1; |