diff options
| author | unknown <davi@moksha.local> | 2007-08-27 10:19:58 -0300 |
|---|---|---|
| committer | unknown <davi@moksha.local> | 2007-08-27 10:19:58 -0300 |
| commit | e7d7a2382f2e95670805bafdf40e114d42f30c58 (patch) | |
| tree | 5771cd9fb43a6f45a4fe36e3301902abb4186989 /mysql-test/include/deadlock.inc | |
| parent | 6e96eeea5d867d29d0ce320533e999ff00e218c3 (diff) | |
| parent | 369a5f1cdcd569a02de4a12d64faebc33e9128f0 (diff) | |
| download | mariadb-git-e7d7a2382f2e95670805bafdf40e114d42f30c58.tar.gz | |
Merge moksha.local:/Users/davi/mysql/push/bugs/25164-5.0
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
Diffstat (limited to 'mysql-test/include/deadlock.inc')
| -rw-r--r-- | mysql-test/include/deadlock.inc | 27 |
1 files changed, 26 insertions, 1 deletions
diff --git a/mysql-test/include/deadlock.inc b/mysql-test/include/deadlock.inc index 41c68f39320..89c34abc871 100644 --- a/mysql-test/include/deadlock.inc +++ b/mysql-test/include/deadlock.inc @@ -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. |