database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge moksha.local:/Users/davi/mysql/push/bugs/25164-5.0

Browse Source 
into  moksha.local:/Users/davi/mysql/push/bugs/25164-5.1


sql/lock.cc:
  Auto merged
mysql-test/include/deadlock.inc:
  Auto merged
mysql-test/r/deadlock_innodb.result:
  Auto merged
This commit is contained in:
unknown
2007-08-27 10:19:58 -03:00
parent 6e96eeea5d 369a5f1cdc
commit e7d7a2382f
3 changed files with 39 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
mysql-test/include/deadlock.inc
View File

@ -144,4 +144,29 @@ disconnect con1;
disconnect con2;
drop table t1, t2;
# End of 4.1 tests
--echo End of 4.1 tests
#
# Bug#25164 create table `a` as select * from `A` hangs
#
set storage_engine=innodb;
--disable_warnings
drop table if exists a;
drop table if exists A;
--enable_warnings
create table A (c int);
insert into A (c) values (0);
--error 0,ER_LOCK_DEADLOCK,ER_UPDATE_TABLE_USED
create table a as select * from A;
drop table A;
--disable_warnings
drop table if exists a;
--enable_warnings
set storage_engine=default;
--echo End of 5.0 tests.