summaryrefslogtreecommitdiff
path: root/mysql-test/r/merge.result
diff options
context:
space:
mode:
authormonty@mysql.com <>2004-09-05 02:31:11 +0300
committermonty@mysql.com <>2004-09-05 02:31:11 +0300
commit5d71817c7049e9db5c22e1667a41f57cf558d8ed (patch)
tree55690b876ca9820a38795a27dd53ab63a4e2ef9d /mysql-test/r/merge.result
parent9d8555c0f0fba1564fb661deac4d5405ba5aa30b (diff)
downloadmariadb-git-5d71817c7049e9db5c22e1667a41f57cf558d8ed.tar.gz
After merge fixes
Diffstat (limited to 'mysql-test/r/merge.result')
-rw-r--r--mysql-test/r/merge.result4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/merge.result b/mysql-test/r/merge.result
index 2f4f0071fa7..5755033190b 100644
--- a/mysql-test/r/merge.result
+++ b/mysql-test/r/merge.result
@@ -647,7 +647,7 @@ create table t2 (a int);
insert into t1 values (0);
insert into t2 values (1);
create table t3 engine=merge union=(t1, t2) select * from t1;
-INSERT TABLE 't1' isn't allowed in FROM table list
+ERROR HY000: You can't specify target table 't1' for update in FROM clause
create table t3 engine=merge union=(t1, t2) select * from t2;
-INSERT TABLE 't2' isn't allowed in FROM table list
+ERROR HY000: You can't specify target table 't2' for update in FROM clause
drop table t1, t2;