diff options
| author | unknown <ingo@mysql.com> | 2006-07-04 10:02:11 +0200 |
|---|---|---|
| committer | unknown <ingo@mysql.com> | 2006-07-04 10:02:11 +0200 |
| commit | 597ee0392c6457f22ac450609557cd117fe1f235 (patch) | |
| tree | 0d83d5fae0e2ee575858f6cd66a909db278d2c56 /mysql-test/r/lock_multi.result | |
| parent | 2ef57b836248f945657c7bd0fe02fa7fe3660b54 (diff) | |
| parent | 0f93a64effb53f2902698a9d6f020f89d0edd26a (diff) | |
| download | mariadb-git-597ee0392c6457f22ac450609557cd117fe1f235.tar.gz | |
Merge mysql.com:/home/mydev/mysql-5.0-tmp_merge
into mysql.com:/home/mydev/mysql-5.1-amerge
mysys/thr_lock.c:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_handler.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
mysql-test/r/lock_multi.result:
Manual merge
mysql-test/t/lock_multi.test:
Manual merge
sql/lock.cc:
Manual merge
sql/sql_base.cc:
Manual merge
sql/sql_parse.cc:
Manual merge
sql/sql_table.cc:
Manual merge
Diffstat (limited to 'mysql-test/r/lock_multi.result')
| -rw-r--r-- | mysql-test/r/lock_multi.result | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/mysql-test/r/lock_multi.result b/mysql-test/r/lock_multi.result index f8cf539bd02..d7ba9174408 100644 --- a/mysql-test/r/lock_multi.result +++ b/mysql-test/r/lock_multi.result @@ -66,6 +66,21 @@ Select_priv N use test; use test; +CREATE TABLE t1 (c1 int); +LOCK TABLE t1 WRITE; + FLUSH TABLES WITH READ LOCK; +CREATE TABLE t2 (c1 int); +UNLOCK TABLES; +UNLOCK TABLES; +DROP TABLE t1, t2; +CREATE TABLE t1 (c1 int); +LOCK TABLE t1 WRITE; + FLUSH TABLES WITH READ LOCK; +CREATE TABLE t2 AS SELECT * FROM t1; +ERROR HY000: Table 't2' was not locked with LOCK TABLES +UNLOCK TABLES; +UNLOCK TABLES; +DROP TABLE t1; CREATE DATABASE mysqltest_1; FLUSH TABLES WITH READ LOCK; DROP DATABASE mysqltest_1; |