diff options
| author | unknown <gkodinov/kgeorge@magare.gmz> | 2007-03-14 17:04:45 +0200 |
|---|---|---|
| committer | unknown <gkodinov/kgeorge@magare.gmz> | 2007-03-14 17:04:45 +0200 |
| commit | f3a731cadd96a08395210e201d63a85b018896a2 (patch) | |
| tree | 5d2eeb6a9fb0b831bce583b40626468473f9bc0a /mysql-test/r/alter_table.result | |
| parent | f0c50440966778b8e084f2ab6f9119dc177a4da7 (diff) | |
| parent | ff810fb952f5f104337ea2614c96387e4c44918c (diff) | |
| download | mariadb-git-f3a731cadd96a08395210e201d63a85b018896a2.tar.gz | |
Merge magare.gmz:/home/kgeorge/mysql/autopush/B26794-5.0-opt
into magare.gmz:/home/kgeorge/mysql/autopush/B26794-merge-5.1-opt
mysql-test/r/select.result:
Auto merged
mysql-test/t/select.test:
Auto merged
sql/field.cc:
Auto merged
sql/filesort.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
mysql-test/r/alter_table.result:
merged 5.0-opt -> 5.1-opt
mysql-test/r/gis-rtree.result:
merged 5.0-opt -> 5.1-opt
mysql-test/r/order_by.result:
merged 5.0-opt -> 5.1-opt
mysql-test/r/subselect.result:
merged 5.0-opt -> 5.1-opt
mysql-test/t/alter_table.test:
merged 5.0-opt -> 5.1-opt
mysql-test/t/order_by.test:
merged 5.0-opt -> 5.1-opt
mysql-test/t/subselect.test:
merged 5.0-opt -> 5.1-opt
Diffstat (limited to 'mysql-test/r/alter_table.result')
| -rw-r--r-- | mysql-test/r/alter_table.result | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/r/alter_table.result b/mysql-test/r/alter_table.result index fa18b58a927..f2317961e99 100644 --- a/mysql-test/r/alter_table.result +++ b/mysql-test/r/alter_table.result @@ -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 |