bk commit into 5.1 tree (svoj:1.2560) BUG#28248

[Sergey Vojtovich]

Below is the list of changes that have just been committed into a local
5.1 repository of svoj.  When svoj does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-03-15 00:24:10+04:00, svoj@stripped +2 -0
  BUG#28248 - mysqldump results with MERGE ... UNION=() cannot be executed
  After merge fix.

  mysql-test/r/merge.result@stripped, 2008-03-15 00:24:06+04:00, svoj@stripped +5 -5
    BUG#28248 - mysqldump results with MERGE ... UNION=() cannot be executed
    After merge fix.

  mysql-test/suite/rpl/r/rpl_row_create_table.result@stripped, 2008-03-15 00:24:07+04:00, svoj@stripped +4 -4
    BUG#28248 - mysqldump results with MERGE ... UNION=() cannot be executed
    After merge fix.

diff -Nrup a/mysql-test/r/merge.result b/mysql-test/r/merge.result
--- a/mysql-test/r/merge.result	2008-03-14 19:57:59 +04:00
+++ b/mysql-test/r/merge.result	2008-03-15 00:24:06 +04:00
@@ -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 -Nrup a/mysql-test/suite/rpl/r/rpl_row_create_table.result b/mysql-test/suite/rpl/r/rpl_row_create_table.result
--- a/mysql-test/suite/rpl/r/rpl_row_create_table.result	2007-12-14 17:40:43 +04:00
+++ b/mysql-test/suite/rpl/r/rpl_row_create_table.result	2008-03-15 00:24:07 +04:00
@@ -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` (