diff options
author | unknown <jani@hundin.mysql.fi> | 2006-05-04 13:17:16 +0300 |
---|---|---|
committer | unknown <jani@hundin.mysql.fi> | 2006-05-04 13:17:16 +0300 |
commit | ac94170069e4de0447fa5b76a1e38a437a66a197 (patch) | |
tree | f95ded980fb145e0769ba2413665e1c2cfaa4c88 /mysql-test/r/gis-rtree.result | |
parent | 29a3343e6bb419110d936d18cf929430bd329682 (diff) | |
parent | 66d4b40ceefa447d3cf24f56f4095c6f9799ecb2 (diff) | |
download | mariadb-git-ac94170069e4de0447fa5b76a1e38a437a66a197.tar.gz |
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/jani/mysql-4.1
sql/sql_show.cc:
Auto merged
Diffstat (limited to 'mysql-test/r/gis-rtree.result')
-rw-r--r-- | mysql-test/r/gis-rtree.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/gis-rtree.result b/mysql-test/r/gis-rtree.result index 5283ef4d889..f479fc41ffb 100644 --- a/mysql-test/r/gis-rtree.result +++ b/mysql-test/r/gis-rtree.result @@ -294,7 +294,7 @@ t2 CREATE TABLE `t2` ( `g` geometry NOT NULL default '', PRIMARY KEY (`fid`), SPATIAL KEY `g` (`g`(32)) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM AUTO_INCREMENT=101 DEFAULT CHARSET=latin1 SELECT count(*) FROM t2; count(*) 100 |