diff options
| author | unknown <ramil/ram@ramil.myoffice.izhnet.ru> | 2007-03-05 17:12:37 +0400 |
|---|---|---|
| committer | unknown <ramil/ram@ramil.myoffice.izhnet.ru> | 2007-03-05 17:12:37 +0400 |
| commit | 57c08a6a3355faa28ab243281e8aca86f1e7b46c (patch) | |
| tree | 4e122dc2fcc68efa8a2682f9282622f6e00664a8 /mysql-test/include | |
| parent | 71a25f2b3e07abd83affc63c485fb69366fa369a (diff) | |
| parent | d4272a16deb9aa1b2428e446b2321697aebf9d94 (diff) | |
| download | mariadb-git-57c08a6a3355faa28ab243281e8aca86f1e7b46c.tar.gz | |
Merge mysql.com:/home/ram/work/b26038/b26038.5.0
into mysql.com:/home/ram/work/b26038/b26038.5.1
mysql-test/t/gis.test:
Auto merged
sql/item_geofunc.cc:
Auto merged
sql/item_geofunc.h:
Auto merged
sql/spatial.cc:
Auto merged
sql/spatial.h:
Auto merged
mysql-test/include/gis_generic.inc:
manual merge
mysql-test/r/archive_gis.result:
manual merge
mysql-test/r/gis.result:
manual merge
mysql-test/r/innodb_gis.result:
manual merge
mysql-test/r/ndb_gis.result:
manual merge
Diffstat (limited to 'mysql-test/include')
| -rw-r--r-- | mysql-test/include/gis_generic.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/include/gis_generic.inc b/mysql-test/include/gis_generic.inc index 3abc18283fa..e3b716953c3 100644 --- a/mysql-test/include/gis_generic.inc +++ b/mysql-test/include/gis_generic.inc @@ -166,14 +166,14 @@ insert IGNORE into t1 (a) values ('Garbage'); drop table t1; -create table t1 (pk integer primary key auto_increment, fl geometry); +create table t1 (pk integer primary key auto_increment, fl geometry not null); --error 1416 insert into t1 (fl) values (1); --error 1416 insert into t1 (fl) values (1.11); --error 1416 insert into t1 (fl) values ("qwerty"); ---error 1416 +--error 1048 insert into t1 (fl) values (pointfromtext('point(1,1)')); drop table t1; |