diff options
author | Sergei Golubchik <serg@mariadb.org> | 2017-04-28 20:19:32 +0200 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2017-04-28 20:19:32 +0200 |
commit | e74f2e2b8629ab79a6c2f93acff6e17a7ddee7ff (patch) | |
tree | c6f2f7343bf9ad5dfd40ec83d5485ec3e05d26d2 /mysql-test/t/gis.test | |
parent | b82c602db588cfa688278ef772050c004590c124 (diff) | |
parent | 49552cf1f7adb3f3b7bb53696cc178363e4d9cb2 (diff) | |
download | mariadb-git-e74f2e2b8629ab79a6c2f93acff6e17a7ddee7ff.tar.gz |
Merge branch '10.0' 10.1
Diffstat (limited to 'mysql-test/t/gis.test')
-rw-r--r-- | mysql-test/t/gis.test | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/mysql-test/t/gis.test b/mysql-test/t/gis.test index ea4c024988d..b109b8f6b0c 100644 --- a/mysql-test/t/gis.test +++ b/mysql-test/t/gis.test @@ -1453,7 +1453,20 @@ SHOW CREATE VIEW v1; SELECT ASTEXT(p) FROM v1; DROP VIEW v1; ---echo End of 5.5 tests +# --echo End of 5.5 tests + +--echo # +--echo # Start of 10.0 tests +--echo # + +--echo # +--echo # MDEV-12495 Conditional jump depends on uninitialised value for: SELECT NULL UNION geom_expression +--echo # +SELECT AsText(g) FROM (SELECT NULL AS g UNION SELECT Point(1,1)) AS t1; + +--echo # +--echo # End 10.0 tests +--echo # SHOW CREATE TABLE information_schema.geometry_columns; SHOW CREATE TABLE information_schema.spatial_ref_sys; |