summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <holyfoot/hf@mysql.com/deer.(none)>2006-12-07 13:38:16 +0400
committerunknown <holyfoot/hf@mysql.com/deer.(none)>2006-12-07 13:38:16 +0400
commite7efe2a9e2c0caac67580a6869658c379d33f7da (patch)
tree47d67d34d69e9879976d7f363a1b67e03ea9b2ac /mysql-test
parent07de4b3aff88d8e0ce6ce056babdb837c4959189 (diff)
downloadmariadb-git-e7efe2a9e2c0caac67580a6869658c379d33f7da.tar.gz
merging
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/gis.result4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/gis.result b/mysql-test/r/gis.result
index 047cc56e275..5ef06688ee6 100644
--- a/mysql-test/r/gis.result
+++ b/mysql-test/r/gis.result
@@ -680,13 +680,13 @@ def test t1 t1 g g 255 4294967295 0 Y 144 0 63
g
select asbinary(g) from t1;
Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr
-def asbinary(g) 252 8192 0 Y 128 0 63
+def asbinary(g) 252 16777216 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 22004: Column was set to data type implicit default; NULL supplied for NOT NULL column 'b' at row 1
+ERROR 22004: Column set to default value; NULL supplied to NOT NULL column 'b' at row 1
alter table t1 enable keys;
drop table t1;
create table t1 (s1 geometry not null,s2 char(100));