summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorserg@serg.mylan <>2004-08-23 21:25:25 +0200
committerserg@serg.mylan <>2004-08-23 21:25:25 +0200
commitf68219f6df87bc6d62cf940111fe9ef95fa0580f (patch)
treeff4a6bbbc41307bc20735502f5ee83bf9ecaacc9
parent2f8be12b85d313422a43973e72a17da45a2abeab (diff)
parent871625c5d5f8e70d3db46032dec7ffcba840bb17 (diff)
downloadmariadb-git-f68219f6df87bc6d62cf940111fe9ef95fa0580f.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
-rw-r--r--mysql-test/t/flush_block_commit-master.opt1
1 files changed, 0 insertions, 1 deletions
diff --git a/mysql-test/t/flush_block_commit-master.opt b/mysql-test/t/flush_block_commit-master.opt
deleted file mode 100644
index a25aa115e06..00000000000
--- a/mysql-test/t/flush_block_commit-master.opt
+++ /dev/null
@@ -1 +0,0 @@
---loose-innodb_lock_wait_timeout=5