diff options
| -rw-r--r-- | .bzrignore | 4 | ||||
| -rwxr-xr-x | BUILD/compile-pentium-gcov | 2 | ||||
| -rw-r--r-- | mysql-test/t/flush.test | 9 | ||||
| -rw-r--r-- | mysql-test/t/rpl000016.test | 4 |
4 files changed, 18 insertions, 1 deletions
diff --git a/.bzrignore b/.bzrignore index caf62f16682..23eac357111 100644 --- a/.bzrignore +++ b/.bzrignore @@ -199,3 +199,7 @@ bdb/dist/tags bdb/build_unix/* sql/.gdbinit BitKeeper/etc/level +*.gcov +*.bb +*.bbg +*.da diff --git a/BUILD/compile-pentium-gcov b/BUILD/compile-pentium-gcov index 4cb4ddb8057..6b5c432e999 100755 --- a/BUILD/compile-pentium-gcov +++ b/BUILD/compile-pentium-gcov @@ -4,6 +4,6 @@ path=`dirname $0` . "$path/SETUP.sh" extra_flags="$pentium_cflags -O2 -fprofile-arcs -ftest-coverage" -extra_configs="$pentium_configs $debug_configs" +extra_configs="$pentium_configs $debug_configs --disable-shared" . "$path/FINISH.sh" diff --git a/mysql-test/t/flush.test b/mysql-test/t/flush.test index 773becfeba1..94586519c66 100644 --- a/mysql-test/t/flush.test +++ b/mysql-test/t/flush.test @@ -22,4 +22,13 @@ while ($1) connection con1; select * from t1; +connection con2; +flush tables with read lock; +--error 1099; drop table t2; +connection con1; +send drop table t2; +connection con2; +unlock tables; +connection con1; +reap; diff --git a/mysql-test/t/rpl000016.test b/mysql-test/t/rpl000016.test index a12fde7eb4c..be694b0e434 100644 --- a/mysql-test/t/rpl000016.test +++ b/mysql-test/t/rpl000016.test @@ -85,7 +85,11 @@ slave stop; slave start; sync_with_master; show slave status; +# because of concurrent insert, the table may not be up to date +# if we do not lock +lock tables t3 read; select count(*) from t3 where n = 4; +unlock tables; #clean up connection master; drop table if exists t1,t2,t3; |