diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2014-12-02 22:25:16 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2014-12-02 22:25:16 +0100 |
| commit | 853077ad7e81be1ade20b4beab1b95d5766d87b1 (patch) | |
| tree | 4c158691947ba7beb4577f26b160f243eabf39ef /mysql-test/t/gis.test | |
| parent | bf3b4a23f75de50e0f1ab4a562e5801dabc7305b (diff) | |
| parent | 2b5db1d5bcd7b46b654d59a07fc119ef6a6b8651 (diff) | |
| download | mariadb-git-853077ad7e81be1ade20b4beab1b95d5766d87b1.tar.gz | |
Merge branch '10.0' into bb-10.1-merge
Conflicts:
.bzrignore
VERSION
cmake/plugin.cmake
debian/dist/Debian/control
debian/dist/Ubuntu/control
mysql-test/r/join_outer.result
mysql-test/r/join_outer_jcl6.result
mysql-test/r/null.result
mysql-test/r/old-mode.result
mysql-test/r/union.result
mysql-test/t/join_outer.test
mysql-test/t/null.test
mysql-test/t/old-mode.test
mysql-test/t/union.test
packaging/rpm-oel/mysql.spec.in
scripts/mysql_config.sh
sql/ha_ndbcluster.cc
sql/ha_ndbcluster_binlog.cc
sql/ha_ndbcluster_cond.cc
sql/item_cmpfunc.h
sql/lock.cc
sql/sql_select.cc
sql/sql_show.cc
sql/sql_update.cc
sql/sql_yacc.yy
storage/innobase/buf/buf0flu.cc
storage/innobase/fil/fil0fil.cc
storage/innobase/include/srv0srv.h
storage/innobase/lock/lock0lock.cc
storage/tokudb/CMakeLists.txt
storage/xtradb/buf/buf0flu.cc
storage/xtradb/fil/fil0fil.cc
storage/xtradb/include/srv0srv.h
storage/xtradb/lock/lock0lock.cc
support-files/mysql.spec.sh
Diffstat (limited to 'mysql-test/t/gis.test')
| -rw-r--r-- | mysql-test/t/gis.test | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/mysql-test/t/gis.test b/mysql-test/t/gis.test index 60642e5741c..2cc9f0c930b 100644 --- a/mysql-test/t/gis.test +++ b/mysql-test/t/gis.test @@ -1379,6 +1379,11 @@ insert into t1 values(geomfromtext("POINT(0 9.2233720368548e18)")); select equals(`a`,convert(`a` using utf8)) from `t1`; drop table t1; +--echo # +--echo # MDEV-6883 ST_WITHIN crashes server if (0,0) is matched to POLYGON((0 0)) +--echo # +select st_within(GeomFromText('Polygon((0 0))'), Point(0,0)); + --echo End of 5.3 tests --echo # |