Skip to content

M
mariadb
Commit 480a4ef9 authored by unknown's avatar unknown
Browse files
Options

merge 5.0->5.1

parent 7e237e4f
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
mysql-test/r/alter_table.result
View file @ 480a4ef9
...@@ -886,7 +886,7 @@ ALTER TABLE t1 ADD b GEOMETRY NOT NULL, ADD SPATIAL INDEX(b); ...@@ -886,7 +886,7 @@ ALTER TABLE t1 ADD b GEOMETRY NOT NULL, ADD SPATIAL INDEX(b);
SHOW CREATE TABLE t1; SHOW CREATE TABLE t1;
Table Create Table Table Create Table
t1 CREATE TABLE `t1` ( t1 CREATE TABLE `t1` (
`a` varchar(500) default NULL, `a` varchar(500) DEFAULT NULL,
`b` geometry NOT NULL, `b` geometry NOT NULL,
SPATIAL KEY `b` (`b`) SPATIAL KEY `b` (`b`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
...@@ -894,7 +894,7 @@ ALTER TABLE t1 ADD KEY(b(50)); ...@@ -894,7 +894,7 @@ ALTER TABLE t1 ADD KEY(b(50));
SHOW CREATE TABLE t1; SHOW CREATE TABLE t1;
Table Create Table Table Create Table
t1 CREATE TABLE `t1` ( t1 CREATE TABLE `t1` (
`a` varchar(500) default NULL, `a` varchar(500) DEFAULT NULL,
`b` geometry NOT NULL, `b` geometry NOT NULL,
SPATIAL KEY `b` (`b`), SPATIAL KEY `b` (`b`),
KEY `b_2` (`b`(50)) KEY `b_2` (`b`(50))
...@@ -903,9 +903,9 @@ ALTER TABLE t1 ADD c POINT; ...@@ -903,9 +903,9 @@ ALTER TABLE t1 ADD c POINT;
SHOW CREATE TABLE t1; SHOW CREATE TABLE t1;
Table Create Table Table Create Table
t1 CREATE TABLE `t1` ( t1 CREATE TABLE `t1` (
`a` varchar(500) default NULL, `a` varchar(500) DEFAULT NULL,
`b` geometry NOT NULL, `b` geometry NOT NULL,
`c` point default NULL, `c` point DEFAULT NULL,
SPATIAL KEY `b` (`b`), SPATIAL KEY `b` (`b`),
KEY `b_2` (`b`(50)) KEY `b_2` (`b`(50))
) ENGINE=MyISAM DEFAULT CHARSET=latin1 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7