After merge fixes

mysql-test/r/show_check.result

@@ -90,8 +90,8 @@ test_set set( 'val1', 'val2', 'val3' ) not null default '',
 name char(20) default 'O''Brien' comment 'O''Brien as default',
 c int not null comment 'int column',
 `c-b` int comment 'name with a minus',
-`space 2` int comment 'name with a space',
-) comment = 'it\'s a table' ;
+`space 2` int comment 'name with a space'
+  ) comment = 'it\'s a table' ;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (

mysql-test/r/subselect.result

@@ -1151,7 +1151,7 @@ CREATE TABLE `t1` (
 `id` mediumint(8) unsigned NOT NULL auto_increment,
 `pseudo` varchar(35) character set latin1 NOT NULL default '',
 PRIMARY KEY  (`id`),
-UNIQUE KEY `pseudo` (`pseudo`),
+UNIQUE KEY `pseudo` (`pseudo`)
 ) ENGINE=MyISAM PACK_KEYS=1 ROW_FORMAT=DYNAMIC;
 INSERT INTO t1 (pseudo) VALUES ('test');
 SELECT 0 IN (SELECT 1 FROM t1 a);
@@ -1256,7 +1256,7 @@ CREATE TABLE `t1` (
 `email` varchar(60) NOT NULL default '',
 PRIMARY KEY  (`id`),
 UNIQUE KEY `email` (`email`),
-UNIQUE KEY `pseudo` (`pseudo`),
+UNIQUE KEY `pseudo` (`pseudo`)
 ) ENGINE=MyISAM CHARSET=latin1 PACK_KEYS=1 ROW_FORMAT=DYNAMIC;
 INSERT INTO t1 (id,pseudo,email) VALUES (1,'test','test'),(2,'test1','test1');
 SELECT pseudo as a, pseudo as b FROM t1 GROUP BY (SELECT a) ORDER BY (SELECT id*1);

mysql-test/t/show_check.test

@@ -55,7 +55,7 @@ create table t1 (
   name char(20) default 'O''Brien' comment 'O''Brien as default',
   c int not null comment 'int column',
   `c-b` int comment 'name with a minus',
-  `space 2` int comment 'name with a space',
+  `space 2` int comment 'name with a space'
   ) comment = 'it\'s a table' ;
 show create table t1;
 set sql_quote_show_create=0;

mysql-test/t/subselect.test

@@ -673,7 +673,7 @@ CREATE TABLE `t1` (
   `id` mediumint(8) unsigned NOT NULL auto_increment,
   `pseudo` varchar(35) character set latin1 NOT NULL default '',
   PRIMARY KEY  (`id`),
-  UNIQUE KEY `pseudo` (`pseudo`),
+  UNIQUE KEY `pseudo` (`pseudo`)
 ) ENGINE=MyISAM PACK_KEYS=1 ROW_FORMAT=DYNAMIC;
 INSERT INTO t1 (pseudo) VALUES ('test');
 SELECT 0 IN (SELECT 1 FROM t1 a);
@@ -776,7 +776,7 @@ CREATE TABLE `t1` (
   `email` varchar(60) NOT NULL default '',
   PRIMARY KEY  (`id`),
   UNIQUE KEY `email` (`email`),
-  UNIQUE KEY `pseudo` (`pseudo`),
+  UNIQUE KEY `pseudo` (`pseudo`)
 ) ENGINE=MyISAM CHARSET=latin1 PACK_KEYS=1 ROW_FORMAT=DYNAMIC;
 INSERT INTO t1 (id,pseudo,email) VALUES (1,'test','test'),(2,'test1','test1');
 SELECT pseudo as a, pseudo as b FROM t1 GROUP BY (SELECT a) ORDER BY (SELECT id*1);