diff options
| author | unknown <monty@mysql.com> | 2004-02-04 00:29:34 +0100 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-02-04 00:29:34 +0100 |
| commit | 7ba7ce6e6db22382e40a4fd90ada9cccae32bf13 (patch) | |
| tree | 0d7bc6937faed296cc805ae3ed4ed5cd6fa04e29 /mysql-test | |
| parent | 1e4d0a12d0a4530bb1842f6b96272534987597fe (diff) | |
| parent | 796a040d5c4384a2aba3c2fec715e26f9087d1c1 (diff) | |
| download | mariadb-git-7ba7ce6e6db22382e40a4fd90ada9cccae32bf13.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/my/mysql-4.0
sql/mysqld.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/lock.result | 4 | ||||
| -rw-r--r-- | mysql-test/t/lock.test | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/mysql-test/r/lock.result b/mysql-test/r/lock.result index ad5251b9110..31a18fe6cec 100644 --- a/mysql-test/r/lock.result +++ b/mysql-test/r/lock.result @@ -41,5 +41,9 @@ lock tables t1 write; check table t2; Table Op Msg_type Msg_text test.t2 check error Table 't2' was not locked with LOCK TABLES +insert into t1 select nr from t1; +Table 't1' was not locked with LOCK TABLES 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; diff --git a/mysql-test/t/lock.test b/mysql-test/t/lock.test index 385713174d2..9015ce12fde 100644 --- a/mysql-test/t/lock.test +++ b/mysql-test/t/lock.test @@ -51,5 +51,9 @@ check table t1; # Check error message lock tables t1 write; check table t2; +--error 1100 +insert into t1 select nr from t1; 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; |