summaryrefslogtreecommitdiff
path: root/mysql-test/r/temp_table.result
diff options
context:
space:
mode:
authorunknown <dlenev@mockturtle.local>2006-09-29 12:36:12 +0400
committerunknown <dlenev@mockturtle.local>2006-09-29 12:36:12 +0400
commitd4553e35586398a89b005bff0d55280ce237483e (patch)
treed0c779af9a5aa85477ef52d21a56f644886a76ae /mysql-test/r/temp_table.result
parentbe6911d2af9d6a1118aa01e2c798cb8911d15df2 (diff)
parent5d46e2993389f3cffe2a37374ba61334f86f7e5e (diff)
downloadmariadb-git-d4553e35586398a89b005bff0d55280ce237483e.tar.gz
Merge mockturtle.local:/home/dlenev/src/mysql-4.1-bg22338-2
into mockturtle.local:/home/dlenev/src/mysql-5.0-rt-merge mysql-test/r/temp_table.result: Auto merged mysql-test/t/temp_table.test: Auto merged sql/sql_select.cc: Manual merge. sql/sql_table.cc: Manual merge.
Diffstat (limited to 'mysql-test/r/temp_table.result')
-rw-r--r--mysql-test/r/temp_table.result17
1 files changed, 17 insertions, 0 deletions
diff --git a/mysql-test/r/temp_table.result b/mysql-test/r/temp_table.result
index 82479504b10..139a7da77de 100644
--- a/mysql-test/r/temp_table.result
+++ b/mysql-test/r/temp_table.result
@@ -135,3 +135,20 @@ d c
bar 2
foo 1
drop table t1, t2;
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 (i INT);
+LOCK TABLE t1 WRITE;
+CREATE TEMPORARY TABLE t1 (i INT);
+The following command should not block
+DROP TEMPORARY TABLE t1;
+DROP TABLE t1;
+CREATE TABLE t1 (i INT);
+CREATE TEMPORARY TABLE t2 (i INT);
+DROP TEMPORARY TABLE t2, t1;
+ERROR 42S02: Unknown table 't1'
+SELECT * FROM t2;
+ERROR 42S02: Table 'test.t2' doesn't exist
+SELECT * FROM t1;
+i
+DROP TABLE t1;
+End of 4.1 tests.