diff options
| author | unknown <gshchepa/uchum@gleb.loc> | 2007-07-07 20:14:06 +0500 |
|---|---|---|
| committer | unknown <gshchepa/uchum@gleb.loc> | 2007-07-07 20:14:06 +0500 |
| commit | a0336ad7d8f28b8de5a2b01ec285634952692abb (patch) | |
| tree | a95fb8d593c69b8db4fa05ae09a5b11c223c117c /mysql-test/r/gis.result | |
| parent | bc52d1d6e306e5fa915d5ebd4db673f2ca552329 (diff) | |
| parent | 8195a213c2fadfb185e755ce6dda2162df1a5529 (diff) | |
| download | mariadb-git-a0336ad7d8f28b8de5a2b01ec285634952692abb.tar.gz | |
Merge gleb.loc:/home/uchum/work/bk/5.0-opt
into gleb.loc:/home/uchum/work/bk/5.1-opt
mysql-test/r/gis.result:
Auto merged
mysql-test/r/view.result:
Auto merged
mysql-test/t/gis.test:
Auto merged
mysql-test/t/loaddata.test:
Auto merged
sql/item.h:
Auto merged
sql/spatial.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
mysql-test/r/loaddata.result:
Merge with 5.0-opt.
mysql-test/t/view.test:
Merge with 5.0-opt.
Diffstat (limited to 'mysql-test/r/gis.result')
| -rw-r--r-- | mysql-test/r/gis.result | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/r/gis.result b/mysql-test/r/gis.result index 1529fe77ac4..f68559fa8ea 100644 --- a/mysql-test/r/gis.result +++ b/mysql-test/r/gis.result @@ -886,6 +886,9 @@ AsText(a) POINT(1 1) LINESTRING(0 0,1 1,2 2) drop table t1, t2; +SELECT 1; +1 +1 End of 5.0 tests create table t1 (f1 tinyint(1), f2 char(1), f3 varchar(1), f4 geometry, f5 datetime); create view v1 as select * from t1; |