Commit e8699b56 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 

into  jabberwock.site:/home/dlenev/mysql-5.1-bg18437
parents 15436eca b72a72aa

mysql-test/r/lock.result

+7 −0
Original line number Diff line number Diff line
@@ -68,3 +68,10 @@ ERROR HY000: Table 't2' was locked with a READ lock and can't be updated 
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;

mysql-test/t/lock.test

+15 −0
Original line number Diff line number Diff line
@@ -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;