From 4e7979fe91a5341b3a07a0ef489e87b57e2686d6 Mon Sep 17 00:00:00 2001
From: unknown <istruewing@stella.local>
Date: Fri, 14 Mar 2008 21:37:19 +0100
Subject: [PATCH] Post-merge fixes

---
 mysql-test/r/merge.result                          | 10 +++++-----
 mysql-test/r/type_set.result                       |  1 +
 mysql-test/suite/rpl/r/rpl_row_create_table.result |  8 ++++----
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/mysql-test/r/merge.result b/mysql-test/r/merge.result
index 170cffc13d5..4c05000573c 100644
--- a/mysql-test/r/merge.result
+++ b/mysql-test/r/merge.result
@@ -969,21 +969,21 @@ CREATE TABLE m1(a INT) ENGINE=MERGE;
 SHOW CREATE TABLE m1;
 Table	Create Table
 m1	CREATE TABLE `m1` (
-  `a` int(11) default NULL
+  `a` int(11) DEFAULT NULL
 ) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1
 DROP TABLE m1;
 CREATE TABLE m1(a INT) ENGINE=MERGE UNION=();
 SHOW CREATE TABLE m1;
 Table	Create Table
 m1	CREATE TABLE `m1` (
-  `a` int(11) default NULL
+  `a` int(11) DEFAULT NULL
 ) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1
 ALTER TABLE m1 UNION=(t1);
 ALTER TABLE m1 UNION=();
 SHOW CREATE TABLE m1;
 Table	Create Table
 m1	CREATE TABLE `m1` (
-  `a` int(11) default NULL
+  `a` int(11) DEFAULT NULL
 ) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t1, m1;
 End of 5.0 tests
@@ -1151,7 +1151,7 @@ SHOW CREATE TABLE t4;
 Table	Create Table
 t4	CREATE TABLE `t4` (
   `c1` int(11) DEFAULT NULL
-) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1 UNION=()
+) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1
 INSERT INTO t4 VALUES (4);
 ERROR HY000: Table 't4' is read only
 DROP TABLE t4;
@@ -1168,7 +1168,7 @@ SHOW CREATE TABLE t4;
 Table	Create Table
 t4	CREATE TABLE `t4` (
   `c1` int(11) DEFAULT NULL
-) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1 UNION=()
+) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1
 INSERT INTO t4 VALUES (4);
 ERROR HY000: Table 't4' is read only
 DROP TABLE t4;
diff --git a/mysql-test/r/type_set.result b/mysql-test/r/type_set.result
index 659215eda33..e36f21f2996 100644
--- a/mysql-test/r/type_set.result
+++ b/mysql-test/r/type_set.result
@@ -93,3 +93,4 @@ c
 1,2,3
 64
 DROP TABLE t1;
+End of 5.0 tests
diff --git a/mysql-test/suite/rpl/r/rpl_row_create_table.result b/mysql-test/suite/rpl/r/rpl_row_create_table.result
index ba5a13a57bf..a8011756bbb 100644
--- a/mysql-test/suite/rpl/r/rpl_row_create_table.result
+++ b/mysql-test/suite/rpl/r/rpl_row_create_table.result
@@ -45,7 +45,7 @@ Table	t2
 Create Table	CREATE TABLE `t2` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL
-) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1 UNION=()
+) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1
 SHOW CREATE TABLE t3;
 Table	t3
 Create Table	CREATE TABLE `t3` (
@@ -64,7 +64,7 @@ Table	t2
 Create Table	CREATE TABLE `t2` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL
-) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1 UNION=()
+) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1
 SHOW CREATE TABLE t3;
 Table	t3
 Create Table	CREATE TABLE `t3` (
@@ -185,7 +185,7 @@ Table	t8
 Create Table	CREATE TABLE `t8` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL
-) ENGINE=MRG_MyISAM DEFAULT CHARSET=utf8 UNION=()
+) ENGINE=MRG_MyISAM DEFAULT CHARSET=utf8
 SHOW CREATE TABLE t9;
 Table	t9
 Create Table	CREATE TABLE `t9` (
@@ -205,7 +205,7 @@ Table	t8
 Create Table	CREATE TABLE `t8` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL
-) ENGINE=MRG_MyISAM DEFAULT CHARSET=utf8 UNION=()
+) ENGINE=MRG_MyISAM DEFAULT CHARSET=utf8
 SHOW CREATE TABLE t9;
 Table	t9
 Create Table	CREATE TABLE `t9` (