1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00

merge 5.0->5.1

This commit is contained in:
gkodinov/kgeorge@magare.gmz
2007-03-14 18:18:30 +02:00
parent 5e2e4161d9
commit fe06c72d3f

View File

@@ -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));
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;
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