summaryrefslogtreecommitdiff
path: root/mysql-test/r/merge.result
diff options
context:
space:
mode:
authorunknown <bell@sanja.is.com.ua>2004-09-10 13:09:27 +0300
committerunknown <bell@sanja.is.com.ua>2004-09-10 13:09:27 +0300
commit76001900fd1a13a4dba02472cbbda0f04214db34 (patch)
tree9560974673aa614e7656f2485096c20b9d315d73 /mysql-test/r/merge.result
parentf3d4db99c3c9d53f3910d6534c6a6b7c3ca871db (diff)
downloadmariadb-git-76001900fd1a13a4dba02472cbbda0f04214db34.tar.gz
thd pointer fixed
BitKeeper/etc/ignore: Added libmysqld/sql_trigger.cc to the ignore list mysql-test/r/merge.result: fix of test
Diffstat (limited to 'mysql-test/r/merge.result')
-rw-r--r--mysql-test/r/merge.result2
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/r/merge.result b/mysql-test/r/merge.result
index 5755033190b..7334d5acf4d 100644
--- a/mysql-test/r/merge.result
+++ b/mysql-test/r/merge.result
@@ -650,4 +650,6 @@ create table t3 engine=merge union=(t1, t2) select * from t1;
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;
ERROR HY000: You can't specify target table 't2' for update in FROM clause
+create table t3 engine=merge union=(t1, t2) select (select max(a) from t2);
+ERROR HY000: You can't specify target table 't2' for update in FROM clause
drop table t1, t2;