diff options
author | unknown <holyfoot/hf@mysql.com/deer.(none)> | 2006-10-23 16:50:01 +0500 |
---|---|---|
committer | unknown <holyfoot/hf@mysql.com/deer.(none)> | 2006-10-23 16:50:01 +0500 |
commit | bda4032fa4b5ce3bb84d8fcb5e1c571027a0574f (patch) | |
tree | 0107bee9648f6738988eae97c771bfb155cc0cc4 /mysql-test/t/flush_block_commit.test | |
parent | ab133655360a284567b74be79765031493823479 (diff) | |
parent | 4ddb48c619c5fb703a846f5dd2659a4854a8c0d7 (diff) | |
download | mariadb-git-bda4032fa4b5ce3bb84d8fcb5e1c571027a0574f.tar.gz |
Merge mysql.com:/home/hf/work/w3475/my41-w3475
into mysql.com:/home/hf/work/w3475/my50-w3475
mysql-test/t/flush.test:
Auto merged
mysql-test/t/flush_block_commit.test:
Auto merged
mysql-test/t/innodb-deadlock.test:
Auto merged
mysql-test/t/innodb-lock.test:
Auto merged
mysql-test/t/lock_multi.test:
Auto merged
mysql-test/t/rename.test:
Auto merged
mysql-test/t/show_check.test:
Auto merged
mysql-test/t/status.test:
Auto merged
client/mysqltest.c:
merging
libmysql/libmysql.c:
merging
Diffstat (limited to 'mysql-test/t/flush_block_commit.test')
-rw-r--r-- | mysql-test/t/flush_block_commit.test | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/mysql-test/t/flush_block_commit.test b/mysql-test/t/flush_block_commit.test index ebb48242a4d..4412b2c357c 100644 --- a/mysql-test/t/flush_block_commit.test +++ b/mysql-test/t/flush_block_commit.test @@ -3,9 +3,6 @@ # We verify that we did not introduce a deadlock. # This is intended to mimick how mysqldump and innobackup work. -# This test doesn't work with the embedded server --- source include/not_embedded.inc - # And it requires InnoDB -- source include/have_innodb.inc |