diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-07-18 23:04:24 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-07-18 23:04:24 +0200 |
| commit | 4e46d8e5bff140f2549841167dc4b65a3c0a645d (patch) | |
| tree | c6612dcc1d0fbd801c084e6c36307d9e5913a293 /mysql-test/t/innodb-consistent-master.opt | |
| parent | 9a02c69f5c6766eaf552284a2a4dd0f1d26ecd2c (diff) | |
| parent | d4d7a8fa62c406be73f6c0f6d75e795293db548b (diff) | |
| download | mariadb-git-4e46d8e5bff140f2549841167dc4b65a3c0a645d.tar.gz | |
merge with xtradb-5.5.15
fix test cases
Diffstat (limited to 'mysql-test/t/innodb-consistent-master.opt')
| -rw-r--r-- | mysql-test/t/innodb-consistent-master.opt | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mysql-test/t/innodb-consistent-master.opt b/mysql-test/t/innodb-consistent-master.opt deleted file mode 100644 index cb48f1aaf60..00000000000 --- a/mysql-test/t/innodb-consistent-master.opt +++ /dev/null @@ -1 +0,0 @@ ---loose-innodb_lock_wait_timeout=2 |