summaryrefslogtreecommitdiff
path: root/mysql-test/r
diff options
context:
space:
mode:
authorunknown <gluh@mysql.com/gluh.(none)>2006-12-11 15:32:07 +0400
committerunknown <gluh@mysql.com/gluh.(none)>2006-12-11 15:32:07 +0400
commit1c1c35d2b5c27172e3d9becd76c8fe01db118647 (patch)
tree7876c9f317876b6a9650ce0fb0639cdf220801f7 /mysql-test/r
parentc586037a45a8f88c66540a141f20ff67c0a73319 (diff)
parent63fce3a24e33407d58a17ec2946caa08e6c1b537 (diff)
downloadmariadb-git-1c1c35d2b5c27172e3d9becd76c8fe01db118647.tar.gz
Merge mysql.com:/home/gluh/MySQL/Merge/4.1
into mysql.com:/home/gluh/MySQL/Merge/4.1-opt
Diffstat (limited to 'mysql-test/r')
-rw-r--r--mysql-test/r/gis.result6
1 files changed, 6 insertions, 0 deletions
diff --git a/mysql-test/r/gis.result b/mysql-test/r/gis.result
index f7066e7edca..ce2b5deadbd 100644
--- a/mysql-test/r/gis.result
+++ b/mysql-test/r/gis.result
@@ -671,3 +671,9 @@ Catalog Database Table Table_alias Column Column_alias Type Length Max length Is
def asbinary(g) 252 8192 0 Y 128 0 63
asbinary(g)
drop table t1;
+create table t1 (a TEXT, b GEOMETRY NOT NULL, SPATIAL KEY(b));
+alter table t1 disable keys;
+load data infile '../../std_data/bad_gis_data.dat' into table t1;
+ERROR 01000: Data truncated; NULL supplied to NOT NULL column 'b' at row 1
+alter table t1 enable keys;
+drop table t1;