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

11
mysql-test/r/deadlock_innodb.result
View File

@ -112,3 +112,14 @@ id x
commit;
# Switch to connection default + disconnect con1 and con2
drop table t1, t2;
End of 4.1 tests
set storage_engine=innodb;
drop table if exists a;
drop table if exists A;
create table A (c int);
insert into A (c) values (0);
create table a as select * from A;
drop table A;
drop table if exists a;
set storage_engine=default;
End of 5.0 tests.