diff options
author | unknown <serg@serg.mylan> | 2005-05-14 19:28:29 +0200 |
---|---|---|
committer | unknown <serg@serg.mylan> | 2005-05-14 19:28:29 +0200 |
commit | 6d6f546e28cbe1d13ea209d6ab2312f8c3bd9736 (patch) | |
tree | ef2346baa5a2fe4cff6f083464efec28e5ea3c34 /mysql-test/r/gis-rtree.result | |
parent | 2e9e0dfaa4f8f5b6e028981299ef4ba6f87758b4 (diff) | |
parent | 33504c6f7c697f650e07a4231522dcafb9bbb524 (diff) | |
download | mariadb-git-6d6f546e28cbe1d13ea209d6ab2312f8c3bd9736.tar.gz |
merged
BitKeeper/etc/logging_ok:
auto-union
client/mysql.cc:
automerged
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 0e558e47594..73cde35993e 100644 --- a/mysql-test/r/gis-rtree.result +++ b/mysql-test/r/gis-rtree.result @@ -801,5 +801,5 @@ CREATE TABLE t1 (st varchar(100)); INSERT INTO t1 VALUES ("Fake string"); CREATE TABLE t2 (geom GEOMETRY NOT NULL, SPATIAL KEY gk(geom)); INSERT INTO t2 SELECT GeomFromText(st) FROM t1; -ERROR HY000: Unknown error +ERROR 22003: Cannot get geometry object from data you send to the GEOMETRY field drop table t1, t2; |