mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 23:04:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
into  jabberwock.site:/home/dlenev/mysql-5.1-bg18437
This commit is contained in:
dlenev@jabberwock.site 2006-07-08 01:33:50 +04:00
commit c15805f741
2 changed files with 22 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
mysql-test/r/lock.result
View file

@ -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; 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 ERROR HY000: Table 't2' was locked with a READ lock and can't be updated
drop table t1,t2; 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;

15
mysql-test/t/lock.test
View file

@ -93,3 +93,18 @@ delete t2 from t1,t2 where t1.a=t2.a;
drop table t1,t2; drop table t1,t2;
# End of 4.1 tests # 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;