Skip to content

M
mariadb
Commit 44088f56 authored by Georgi Kodinov's avatar Georgi Kodinov
Browse files
Options

merge mysql-5.1-security->mysql-5.5-security

parents 4eab28d8 ec802424
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 0 deletions
mysql-test/r/gis.result
View file @ 44088f56
...@@ -1076,3 +1076,4 @@ SPATIAL INDEX i1 (col1, col2) ...@@ -1076,3 +1076,4 @@ SPATIAL INDEX i1 (col1, col2)
); );
ERROR HY000: Incorrect arguments to SPATIAL INDEX ERROR HY000: Incorrect arguments to SPATIAL INDEX
DROP TABLE t0, t1, t2; DROP TABLE t0, t1, t2;
End of 5.5 tests
mysql-test/t/gis.test
View file @ 44088f56
...@@ -820,3 +820,5 @@ CREATE TABLE t3 ( ...@@ -820,3 +820,5 @@ CREATE TABLE t3 (
# cleanup # cleanup
DROP TABLE t0, t1, t2; DROP TABLE t0, t1, t2;
--echo End of 5.5 tests
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7