summaryrefslogtreecommitdiff
path: root/mysql-test/r/merge.result
diff options
context:
space:
mode:
authorAlexander Nozdrin <alik@sun.com>2010-08-30 18:07:40 +0400
committerAlexander Nozdrin <alik@sun.com>2010-08-30 18:07:40 +0400
commitf0fe6e4dac44c9555de1193990e9d2cbc77be62e (patch)
tree0a5202757c09044f2c476f93621c75c9df31e32d /mysql-test/r/merge.result
parentb7ed981f3793b4464b99c98b7baa3c511b52b6a5 (diff)
parent9ab0759ea4534c1581dfb62f2f7e3a6e06d3c3c3 (diff)
downloadmariadb-git-f0fe6e4dac44c9555de1193990e9d2cbc77be62e.tar.gz
Auto-merge from mysql-5.5-merge.
Diffstat (limited to 'mysql-test/r/merge.result')
-rw-r--r--mysql-test/r/merge.result3
1 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/r/merge.result b/mysql-test/r/merge.result
index f7f0cea3b19..c7e54288f8b 100644
--- a/mysql-test/r/merge.result
+++ b/mysql-test/r/merge.result
@@ -933,7 +933,8 @@ DROP TABLE tm1, t1, t2;
CREATE TABLE t1(c1 INT);
CREATE TABLE t2 (c1 INT) ENGINE=MERGE UNION=(t1) INSERT_METHOD=FIRST;
CREATE TABLE IF NOT EXISTS t1 SELECT * FROM t2;
-ERROR HY000: You can't specify target table 't1' for update in FROM clause
+Warnings:
+Note 1050 Table 't1' already exists
DROP TABLE t1, t2;
CREATE TABLE t1 (id INT NOT NULL, ref INT NOT NULL, INDEX (id)) ENGINE=MyISAM;
CREATE TABLE t2 LIKE t1;