I was wrong about concurrent insert issue in rpl000016 - it still failed

once after the lock. Now changed test case and added eval support to
mysqltest to make it easier to debug

2 files changed, 15 insertions, 2 deletions

diff --git a/mysql-test/t/drop.test b/mysql-test/t/drop.test
new file mode 100644
index 00000000000..1de387f6e4c
--- /dev/null
+++ b/mysql-test/t/drop.test
@@ -0,0 +1,12 @@
+drop table if exists t1;
+drop table if exists t1;
+--error 1051;
+drop table t1;
+create table t1(n int);
+insert into t1 values(1);
+create temporary table t1( n int);
+insert into t1 values(2);
+--error 1050;
+create table t1(n int);
+drop table t1;
+select * from t1;
diff --git a/mysql-test/t/rpl000016.test b/mysql-test/t/rpl000016.test
index be694b0e434..9161d2e4734 100644
--- a/mysql-test/t/rpl000016.test
+++ b/mysql-test/t/rpl000016.test
@@ -74,7 +74,8 @@ drop table if exists t3;
 create table t3 (n int);
 while ($1)
 {
- insert into t3 values(4);
+#eval means expand $ expressions
+ eval insert into t3 values($1 + 4);
  dec $1;
 }
 show master logs;
@@ -88,7 +89,7 @@ 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;
+select count(*) from t3 where n >= 4;
 unlock tables;
 #clean up
 connection master;