diff options
author | unknown <rburnett@bk-internal.mysql.com> | 2006-08-04 19:19:26 +0200 |
---|---|---|
committer | unknown <rburnett@bk-internal.mysql.com> | 2006-08-04 19:19:26 +0200 |
commit | d166ede9a3d6637ab95d30b12ec834cf77433942 (patch) | |
tree | b49598e9c6be40ecbc029786563289b786dec5bb /mysql-test/r/gis.result | |
parent | 6017f911e33c3a44e6b7b090215446300c38b7be (diff) | |
parent | cc10958f4984a5fa85956c1de245dc93cb73a43f (diff) | |
download | mariadb-git-d166ede9a3d6637ab95d30b12ec834cf77433942.tar.gz |
Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
into bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
client/mysql.cc:
Auto merged
mysql-test/r/gis.result:
Auto merged
Diffstat (limited to 'mysql-test/r/gis.result')
-rw-r--r-- | mysql-test/r/gis.result | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/r/gis.result b/mysql-test/r/gis.result index 0dd34c16268..46aecde2cc5 100644 --- a/mysql-test/r/gis.result +++ b/mysql-test/r/gis.result @@ -583,6 +583,8 @@ t1 CREATE TABLE `t1` ( drop table t1; CREATE TABLE `t1` (`object_id` bigint(20) unsigned NOT NULL default '0', `geo` geometry NOT NULL default '') ENGINE=MyISAM ; +Warnings: +Warning 1101 BLOB/TEXT column 'geo' can't have a default value insert into t1 values ('85984',GeomFromText('MULTIPOLYGON(((-115.006363 36.305435,-114.992394 36.305202,-114.991219 36.305975,-114.991163 36.306845,-114.989432 36.309452,-114.978275 36.312642,-114.977363 |