Merge neptunus.(none):/home/msvensson/mysql/bug10460/my51-bug10460

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


mysql-test/r/bigint.result:
  Auto merged
mysql-test/r/binary.result:
  Auto merged
mysql-test/r/case.result:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/r/events.result:
  Auto merged
mysql-test/r/heap.result:
  Auto merged
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/merge.result:
  Auto merged
mysql-test/r/mysqldump.result:
  Auto merged
mysql-test/r/partition.result:
  Auto merged
mysql-test/r/partition_02myisam.result:
  Auto merged
mysql-test/r/partition_mgm_err.result:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/trigger.result:
  Auto merged
mysql-test/r/type_timestamp.result:
  Auto merged
sql/sql_show.cc:
  Auto merged
mysql-test/r/archive_gis.result:
  Merge bug10460
mysql-test/r/bdb_gis.result:
  Merge bug10460
mysql-test/r/func_system.result:
  Merge bug10460
mysql-test/r/innodb_gis.result:
  Merge bug10460
mysql-test/r/ndb_gis.result:
  Merge bug10460

1 files changed, 44 insertions, 44 deletions

diff --git a/mysql-test/r/show_check.result b/mysql-test/r/show_check.result
index f6cae1ba42a..a8af5c59b81 100644
--- a/mysql-test/r/show_check.result
+++ b/mysql-test/r/show_check.result
@@ -103,21 +103,21 @@ c int not null comment 'int column',
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `test_set` set('val1','val2','val3') NOT NULL default '',
-  `name` char(20) default 'O''Brien' COMMENT 'O''Brien as default',
+  `test_set` set('val1','val2','val3') NOT NULL DEFAULT '',
+  `name` char(20) DEFAULT 'O''Brien' COMMENT 'O''Brien as default',
   `c` int(11) NOT NULL COMMENT 'int column',
-  `c-b` int(11) default NULL COMMENT 'name with a minus',
-  `space 2` int(11) default NULL COMMENT 'name with a space'
+  `c-b` int(11) DEFAULT NULL COMMENT 'name with a minus',
+  `space 2` int(11) DEFAULT NULL COMMENT 'name with a space'
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COMMENT='it''s a table'
 set sql_quote_show_create=0;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE t1 (
-  test_set set('val1','val2','val3') NOT NULL default '',
-  `name` char(20) default 'O''Brien' COMMENT 'O''Brien as default',
+  test_set set('val1','val2','val3') NOT NULL DEFAULT '',
+  `name` char(20) DEFAULT 'O''Brien' COMMENT 'O''Brien as default',
   c int(11) NOT NULL COMMENT 'int column',
-  `c-b` int(11) default NULL COMMENT 'name with a minus',
-  `space 2` int(11) default NULL COMMENT 'name with a space'
+  `c-b` int(11) DEFAULT NULL COMMENT 'name with a minus',
+  `space 2` int(11) DEFAULT NULL COMMENT 'name with a space'
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COMMENT='it''s a table'
 set sql_quote_show_create=1;
 show full columns from t1;
@@ -162,7 +162,7 @@ show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) NOT NULL,
-  `b` varchar(10) default NULL,
+  `b` varchar(10) DEFAULT NULL,
   KEY `b` (`b`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 MIN_ROWS=10 MAX_ROWS=100 AVG_ROW_LENGTH=10 PACK_KEYS=1 CHECKSUM=1 DELAY_KEY_WRITE=1 ROW_FORMAT=FIXED COMMENT='test'
 alter table t1 MAX_ROWS=200 ROW_FORMAT=dynamic PACK_KEYS=0;
@@ -170,7 +170,7 @@ show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) NOT NULL,
-  `b` varchar(10) default NULL,
+  `b` varchar(10) DEFAULT NULL,
   KEY `b` (`b`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 MIN_ROWS=10 MAX_ROWS=200 AVG_ROW_LENGTH=10 PACK_KEYS=0 CHECKSUM=1 DELAY_KEY_WRITE=1 ROW_FORMAT=DYNAMIC COMMENT='test'
 ALTER TABLE t1 AVG_ROW_LENGTH=0 CHECKSUM=0 COMMENT="" MIN_ROWS=0 MAX_ROWS=0 PACK_KEYS=DEFAULT DELAY_KEY_WRITE=0 ROW_FORMAT=default;
@@ -178,7 +178,7 @@ show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) NOT NULL,
-  `b` varchar(10) default NULL,
+  `b` varchar(10) DEFAULT NULL,
   KEY `b` (`b`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
@@ -227,23 +227,23 @@ index(type_short)
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `type_bool` tinyint(1) NOT NULL default '0',
-  `type_tiny` tinyint(4) NOT NULL auto_increment,
-  `type_short` smallint(3) default NULL,
-  `type_mediumint` mediumint(9) default NULL,
-  `type_bigint` bigint(20) default NULL,
-  `type_decimal` decimal(5,2) default NULL,
-  `type_numeric` decimal(5,2) default NULL,
-  `empty_char` char(0) default NULL,
-  `type_char` char(2) default NULL,
-  `type_varchar` varchar(10) default NULL,
-  `type_timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
-  `type_date` date NOT NULL default '0000-00-00',
-  `type_time` time NOT NULL default '00:00:00',
-  `type_datetime` datetime NOT NULL default '0000-00-00 00:00:00',
-  `type_year` year(4) default NULL,
-  `type_enum` enum('red','green','blue') default NULL,
-  `type_set` enum('red','green','blue') default NULL,
+  `type_bool` tinyint(1) NOT NULL DEFAULT '0',
+  `type_tiny` tinyint(4) NOT NULL AUTO_INCREMENT,
+  `type_short` smallint(3) DEFAULT NULL,
+  `type_mediumint` mediumint(9) DEFAULT NULL,
+  `type_bigint` bigint(20) DEFAULT NULL,
+  `type_decimal` decimal(5,2) DEFAULT NULL,
+  `type_numeric` decimal(5,2) DEFAULT NULL,
+  `empty_char` char(0) DEFAULT NULL,
+  `type_char` char(2) DEFAULT NULL,
+  `type_varchar` varchar(10) DEFAULT NULL,
+  `type_timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `type_date` date NOT NULL DEFAULT '0000-00-00',
+  `type_time` time NOT NULL DEFAULT '00:00:00',
+  `type_datetime` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `type_year` year(4) DEFAULT NULL,
+  `type_enum` enum('red','green','blue') DEFAULT NULL,
+  `type_set` enum('red','green','blue') DEFAULT NULL,
   `type_tinyblob` tinyblob,
   `type_blob` blob,
   `type_medium_blob` mediumblob,
@@ -283,28 +283,28 @@ CREATE TABLE ```ab``cd``` (i INT);
 SHOW CREATE TABLE ```ab``cd```;
 Table	Create Table
 `ab`cd`	CREATE TABLE ```ab``cd``` (
-  i int(11) default NULL
+  i int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE ```ab``cd```;
 CREATE TABLE ```ab````cd``` (i INT);
 SHOW CREATE TABLE ```ab````cd```;
 Table	Create Table
 `ab``cd`	CREATE TABLE ```ab````cd``` (
-  i int(11) default NULL
+  i int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE ```ab````cd```;
 CREATE TABLE ```a` (i INT);
 SHOW CREATE TABLE ```a`;
 Table	Create Table
 `a	CREATE TABLE ```a` (
-  i int(11) default NULL
+  i int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE ```a`;
 CREATE TABLE `a.1` (i INT);
 SHOW CREATE TABLE `a.1`;
 Table	Create Table
 a.1	CREATE TABLE `a.1` (
-  i int(11) default NULL
+  i int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE `a.1`;
 SET sql_mode= 'ANSI_QUOTES';
@@ -312,7 +312,7 @@ CREATE TABLE """a" (i INT);
 SHOW CREATE TABLE """a";
 Table	Create Table
 "a	CREATE TABLE """a" (
-  i int(11) default NULL
+  i int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE """a";
 SET sql_mode= '';
@@ -321,14 +321,14 @@ CREATE TABLE t1 (i INT);
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE t1 (
-  i int(11) default NULL
+  i int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t1;
 CREATE TABLE `table` (i INT);
 SHOW CREATE TABLE `table`;
 Table	Create Table
 table	CREATE TABLE `table` (
-  i int(11) default NULL
+  i int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE `table`;
 SET sql_quote_show_create= @old_sql_quote_show_create;
@@ -451,7 +451,7 @@ CREATE TABLE t1 (i int, KEY (i)) ENGINE=MEMORY;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `i` int(11) default NULL,
+  `i` int(11) DEFAULT NULL,
   KEY `i` (`i`)
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1
 DROP TABLE t1;
@@ -459,7 +459,7 @@ CREATE TABLE t1 (i int, KEY USING HASH (i)) ENGINE=MEMORY;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `i` int(11) default NULL,
+  `i` int(11) DEFAULT NULL,
   KEY `i` USING HASH (`i`)
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1
 DROP TABLE t1;
@@ -467,7 +467,7 @@ CREATE TABLE t1 (i int, KEY USING BTREE (i)) ENGINE=MEMORY;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `i` int(11) default NULL,
+  `i` int(11) DEFAULT NULL,
   KEY `i` USING BTREE (`i`)
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1
 DROP TABLE t1;
@@ -475,7 +475,7 @@ CREATE TABLE t1 (i int, KEY (i)) ENGINE=MyISAM;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `i` int(11) default NULL,
+  `i` int(11) DEFAULT NULL,
   KEY `i` (`i`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t1;
@@ -483,7 +483,7 @@ CREATE TABLE t1 (i int, KEY USING BTREE (i)) ENGINE=MyISAM;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `i` int(11) default NULL,
+  `i` int(11) DEFAULT NULL,
   KEY `i` USING BTREE (`i`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t1;
@@ -491,14 +491,14 @@ CREATE TABLE t1 (i int, KEY (i)) ENGINE=MyISAM;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `i` int(11) default NULL,
+  `i` int(11) DEFAULT NULL,
   KEY `i` (`i`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 ALTER TABLE t1 ENGINE=MEMORY;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `i` int(11) default NULL,
+  `i` int(11) DEFAULT NULL,
   KEY `i` (`i`)
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1
 DROP TABLE t1;
@@ -506,14 +506,14 @@ CREATE TABLE t1 (i int, KEY USING BTREE (i)) ENGINE=MyISAM;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `i` int(11) default NULL,
+  `i` int(11) DEFAULT NULL,
   KEY `i` USING BTREE (`i`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 ALTER TABLE t1 ENGINE=MEMORY;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `i` int(11) default NULL,
+  `i` int(11) DEFAULT NULL,
   KEY `i` USING BTREE (`i`)
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1
 DROP TABLE t1;