summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorgkodinov/kgeorge@rakia.(none) <>2006-09-05 13:12:30 +0300
committergkodinov/kgeorge@rakia.(none) <>2006-09-05 13:12:30 +0300
commit68b9ae4d14230514de87203f184eb892086d2084 (patch)
tree46ccb1fdf17163d2c06a25212defe887cd042e92 /mysql-test
parentcf3bed86b553fa410a5ef73cfdd397a491f0bdd3 (diff)
parent3758b975f8c535917c9507b005ccc8ff5a76bfb8 (diff)
downloadmariadb-git-68b9ae4d14230514de87203f184eb892086d2084.tar.gz
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-4.1-opt
into rakia.(none):/home/kgeorge/mysql/autopush/B21392-4.1-opt
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/delete.result4
-rw-r--r--mysql-test/t/delete.test10
2 files changed, 14 insertions, 0 deletions
diff --git a/mysql-test/r/delete.result b/mysql-test/r/delete.result
index 411cd52b4ca..cb632fcd6c8 100644
--- a/mysql-test/r/delete.result
+++ b/mysql-test/r/delete.result
@@ -172,3 +172,7 @@ a
0
2
DROP TABLE t1;
+create table t1 (a int);
+delete `4.t1` from t1 as `4.t1` where `4.t1`.a = 5;
+delete FROM `4.t1` USING t1 as `4.t1` where `4.t1`.a = 5;
+drop table t1;
diff --git a/mysql-test/t/delete.test b/mysql-test/t/delete.test
index 98e4c4e35fa..d4eb01cab23 100644
--- a/mysql-test/t/delete.test
+++ b/mysql-test/t/delete.test
@@ -153,4 +153,14 @@ DELETE FROM t1 WHERE t1.a > 0 ORDER BY t1.a LIMIT 1;
SELECT * FROM t1;
DROP TABLE t1;
+#
+# Bug #21392: multi-table delete with alias table name fails with
+# 1003: Incorrect table name
+#
+
+create table t1 (a int);
+delete `4.t1` from t1 as `4.t1` where `4.t1`.a = 5;
+delete FROM `4.t1` USING t1 as `4.t1` where `4.t1`.a = 5;
+drop table t1;
+
# End of 4.1 tests