diff options
| author | unknown <elliot@mysql.com> | 2006-06-23 17:27:54 -0400 |
|---|---|---|
| committer | unknown <elliot@mysql.com> | 2006-06-23 17:27:54 -0400 |
| commit | b02748fd5c54e05aca990583a4cb0f71a82ee4b4 (patch) | |
| tree | e98cbbc277ba262a672f9a1aaef14d025bf1bc24 /mysql-test/r/lock_multi.result | |
| parent | 2deb5a611ab594d0601b2d3adbf67d5e9a2922ba (diff) | |
| parent | 783866ffe105c3e83a9bbc101ddd31c0d8a81d1e (diff) | |
| download | mariadb-git-b02748fd5c54e05aca990583a4cb0f71a82ee4b4.tar.gz | |
Merge mysql.com:/home/emurphy/src/bk-clean/tmp_merge
into mysql.com:/home/emurphy/src/bk-clean/mysql-5.1
mysql-test/r/func_time.result:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
mysql-test/r/lock_multi.result:
manual merge
mysql-test/t/lock_multi.test:
manual merge
sql/ha_innodb.cc:
manual merge
Diffstat (limited to 'mysql-test/r/lock_multi.result')
| -rw-r--r-- | mysql-test/r/lock_multi.result | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/mysql-test/r/lock_multi.result b/mysql-test/r/lock_multi.result index b04a5fb0a3e..b9500d1d4f9 100644 --- a/mysql-test/r/lock_multi.result +++ b/mysql-test/r/lock_multi.result @@ -74,3 +74,9 @@ ERROR HY000: Can't execute the query because you have a conflicting read lock UNLOCK TABLES; DROP DATABASE mysqltest_1; ERROR HY000: Can't drop database 'mysqltest_1'; database doesn't exist +create table t1 (f1 int(12) unsigned not null auto_increment, primary key(f1)) engine=innodb; +lock tables t1 write; + alter table t1 auto_increment=0; alter table t1 auto_increment=0; alter table t1 auto_increment=0; alter table t1 auto_increment=0; alter table t1 auto_increment=0; // + alter table t1 auto_increment=0; alter table t1 auto_increment=0; alter table t1 auto_increment=0; alter table t1 auto_increment=0; alter table t1 auto_increment=0; // +unlock tables; +drop table t1; |