Commit 480a4ef9 authored by unknown's avatar unknown
Browse files

merge 5.0->5.1

parent 7e237e4f

mysql-test/r/alter_table.result

+4 −4
Original line number Diff line number Diff line
@@ -886,7 +886,7 @@ ALTER TABLE t1 ADD b GEOMETRY NOT NULL, ADD SPATIAL INDEX(b); 
SHOW CREATE TABLE t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `a` varchar(500) default NULL,

  `a` varchar(500) DEFAULT NULL,

  `b` geometry NOT NULL,

  SPATIAL KEY `b` (`b`)

) ENGINE=MyISAM DEFAULT CHARSET=latin1
@@ -894,7 +894,7 @@ ALTER TABLE t1 ADD KEY(b(50)); 
SHOW CREATE TABLE t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `a` varchar(500) default NULL,

  `a` varchar(500) DEFAULT NULL,

  `b` geometry NOT NULL,

  SPATIAL KEY `b` (`b`),

  KEY `b_2` (`b`(50))
@@ -903,9 +903,9 @@ ALTER TABLE t1 ADD c POINT; 
SHOW CREATE TABLE t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `a` varchar(500) default NULL,

  `a` varchar(500) DEFAULT NULL,

  `b` geometry NOT NULL,

  `c` point default NULL,

  `c` point DEFAULT NULL,

  SPATIAL KEY `b` (`b`),

  KEY `b_2` (`b`(50))

) ENGINE=MyISAM DEFAULT CHARSET=latin1