Merge bk-internal.mysql.com:/home/bk/mysql-4.1/

into serg.mylan:/usr/home/serg/Abk/mysql-4.1

Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
f68219f6 · serg@serg.mylan · 2f8be12b · 871625c5 · 2f8be12b
Commit f68219f6 authored Aug 23, 2004 by serg@serg.mylan
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

mysql-test/t/flush_block_commit-master.opt mysql-test/t/flush_block_commit-master.opt +0 -1

No files found.
--- a/mysql-test/t/flush_block_commit-master.opt
+++ b/mysql-test/t/flush_block_commit-master.opt
--loose-innodb_lock_wait_timeout=5