bk commit into 5.1 tree (kostja:1.2242) BUG#18884

[konstantin]

Below is the list of changes that have just been committed into a local
5.1 repository of kostja. When kostja does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-07-08 00:26:18+04:00, kostja@stripped +2 -0
  Add a test case for Bug#18884 "lock table + global read lock = crash"
  (the bug itself is not repeatable any more).

  mysql-test/r/lock.result@stripped, 2006-07-08 00:26:15+04:00, kostja@stripped +7 -0
    Update test results (Bug#18884)

  mysql-test/t/lock.test@stripped, 2006-07-08 00:26:15+04:00, kostja@stripped +15 -0
    Add a test case for Bug#18884 "lock table + global read lock = crash"

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	kostja
# Host:	bodhi.local
# Root:	/opt/local/work/mysql-5.1-18884

--- 1.17/mysql-test/r/lock.result	2006-07-08 00:26:23 +04:00
+++ 1.18/mysql-test/r/lock.result	2006-07-08 00:26:23 +04:00
@@ -68,3 +68,10 @@ ERROR HY000: Table 't2' was locked with 
 delete t2 from t1,t2 where t1.a=t2.a;
 ERROR HY000: Table 't2' was locked with a READ lock and can't be updated
 drop table t1,t2;
+drop table if exists t1;
+create table t1 (a int);
+lock table t1 write;
+flush tables with read lock;
+ERROR HY000: Can't execute the given command because you have active locked tables or an active transaction
+unlock tables;
+drop table t1;

--- 1.15/mysql-test/t/lock.test	2006-07-08 00:26:23 +04:00
+++ 1.16/mysql-test/t/lock.test	2006-07-08 00:26:23 +04:00
@@ -93,3 +93,18 @@ delete t2 from t1,t2 where t1.a=t2.a;
 drop table t1,t2;
 
 # End of 4.1 tests
+
+#
+# Bug#18884 "lock table + global read lock = crash"
+# The bug is not repeatable, just add the test case.
+#
+--disable_warnings
+drop table if exists t1;
+--enable_warnings
+create table t1 (a int);
+lock table t1 write;
+--error ER_LOCK_OR_ACTIVE_TRANSACTION
+flush tables with read lock;
+unlock tables;
+drop table t1;
+