merge with 5.3

sql/sql_insert.cc:
  CREATE ... IF NOT EXISTS may do nothing, but
  it is still not a failure. don't forget to my_ok it.
  ******
  CREATE ... IF NOT EXISTS may do nothing, but
  it is still not a failure. don't forget to my_ok it.
sql/sql_table.cc:
  small cleanup
  ******
  small cleanup

1 files changed, 0 insertions, 15 deletions

diff --git a/mysql-test/t/merge.test b/mysql-test/t/merge.test
index e45813ff616..ca2f5ebb4d7 100644
--- a/mysql-test/t/merge.test
+++ b/mysql-test/t/merge.test
@@ -1976,21 +1976,6 @@ SELECT f1() FROM (SELECT 1 UNION SELECT 1) c1;
 DROP FUNCTION f1;
 DROP TABLE tm1, t1, t2;
 #
-CREATE TEMPORARY TABLE t1 (c1 INT);
-INSERT INTO t1 (c1) VALUES (1);
-CREATE TEMPORARY TABLE tm1 (c1 INT) ENGINE=MRG_MYISAM UNION=(t1);
-DELIMITER |;
---error ER_SP_BADSTATEMENT
-CREATE FUNCTION f1() RETURNS INT
-BEGIN
-  CREATE TEMPORARY TABLE t2 (c1 INT);
-  ALTER TEMPORARY TABLE tm1 UNION=(t1,t2);
-  INSERT INTO t2 (c1) VALUES (2);
-  RETURN (SELECT MAX(c1) FROM tm1);
-END|
-DELIMITER ;|
-DROP TABLE tm1, t1;
-#
 # Base table. No LOCK TABLES, no functions/triggers.
 #
 CREATE TABLE t1 (c1 INT) ENGINE=MyISAM;