diff options
| author | unknown <ingo@mysql.com> | 2006-01-23 19:19:29 +0100 |
|---|---|---|
| committer | unknown <ingo@mysql.com> | 2006-01-23 19:19:29 +0100 |
| commit | cfbb86034d284c8c24a63725735f17cf00304b3b (patch) | |
| tree | 1d6a2586cc6dbd78e7aa54ba1b374e9d00f5e551 /mysql-test/r/lock.result | |
| parent | 6d5674dcd39917bff04be3c73570f66bc2aa05a4 (diff) | |
| parent | 15ecf9228a3ba5e65f39cf87f941d0d997683dc6 (diff) | |
| download | mariadb-git-cfbb86034d284c8c24a63725735f17cf00304b3b.tar.gz | |
Merge mysql.com:/home/mydev/mysql-4.0-bug5390
into mysql.com:/home/mydev/mysql-4.1-bug5390
sql/table.h:
Auto merged
mysql-test/r/lock.result:
BUG#5390 - problems with merge tables
Manual merge from 4.0.
mysql-test/t/lock.test:
BUG#5390 - problems with merge tables
Manual merge from 4.0.
sql/lock.cc:
BUG#5390 - problems with merge tables
Manual merge from 4.0.
Diffstat (limited to 'mysql-test/r/lock.result')
| -rw-r--r-- | mysql-test/r/lock.result | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/mysql-test/r/lock.result b/mysql-test/r/lock.result index 54162a36d83..2fe03b9fc14 100644 --- a/mysql-test/r/lock.result +++ b/mysql-test/r/lock.result @@ -47,6 +47,17 @@ unlock tables; lock tables t1 write, t1 as t1_alias read; insert into t1 select index1,nr from t1 as t1_alias; drop table t1,t2; +create table t1 (c1 int); +create table t2 (c1 int); +create table t3 (c1 int); +lock tables t1 write, t2 write, t3 write; +drop table t2, t3, t1; +create table t1 (c1 int); +create table t2 (c1 int); +create table t3 (c1 int); +lock tables t1 write, t2 write, t3 write, t1 as t4 read; +alter table t2 add column c2 int; +drop table t1, t2, t3; create table t1 ( a int(11) not null auto_increment, primary key(a)); create table t2 ( a int(11) not null auto_increment, primary key(a)); lock tables t1 write, t2 read; |