diff options
| author | msvensson@neptunus.(none) <> | 2005-06-10 14:34:43 +0200 |
|---|---|---|
| committer | msvensson@neptunus.(none) <> | 2005-06-10 14:34:43 +0200 |
| commit | 6674e1e12e33399cd1f73d868a1aa0fb8d843f11 (patch) | |
| tree | 5a90c44beee06b07e6e874759e7abe69712c3cf8 /mysql-test/r | |
| parent | 6c38471e8796bd5ad10d668a43352057d76813e2 (diff) | |
| parent | 28aa57d6a0c06d37450afbe121e6e27c6d9312fa (diff) | |
| download | mariadb-git-6674e1e12e33399cd1f73d868a1aa0fb8d843f11.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
Diffstat (limited to 'mysql-test/r')
| -rw-r--r-- | mysql-test/r/lock_multi.result | 7 | ||||
| -rw-r--r-- | mysql-test/r/mysql.result | 6 |
2 files changed, 13 insertions, 0 deletions
diff --git a/mysql-test/r/lock_multi.result b/mysql-test/r/lock_multi.result index 9eedbf50064..73e3a9d32e3 100644 --- a/mysql-test/r/lock_multi.result +++ b/mysql-test/r/lock_multi.result @@ -36,3 +36,10 @@ lock table t1 write, t2 write; drop table t2; ERROR 42S02: Table 'test.t2' doesn't exist drop table t1; +create table t1(a int); +lock tables t1 write; +show columns from t1; +Field Type Null Key Default Extra +a int(11) YES NULL +unlock tables; +drop table t1; diff --git a/mysql-test/r/mysql.result b/mysql-test/r/mysql.result index feb0b2348cd..dbb47152926 100644 --- a/mysql-test/r/mysql.result +++ b/mysql-test/r/mysql.result @@ -48,3 +48,9 @@ Test 'go' command g a 1 drop table t1; +create table t1(a int); +lock tables t1 write; +database() +test +unlock tables; +drop table t1; |