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

44088f56 · Georgi Kodinov · 4eab28d8 · ec802424 · 44088f56 · 44088f56
Commit 44088f56 authored Mar 09, 2011 by Georgi Kodinov
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

mysql-test/r/gis.result mysql-test/r/gis.result +1 -0

mysql-test/t/gis.test mysql-test/t/gis.test +2 -0

No files found.
--- a/mysql-test/r/gis.result
+++ b/mysql-test/r/gis.result
@@ -1076,3 +1076,4 @@ SPATIAL INDEX i1 (col1, col2)
 );
 ERROR HY000: Incorrect arguments to SPATIAL INDEX
 DROP TABLE t0, t1, t2;
+End of 5.5 tests
--- a/mysql-test/t/gis.test
+++ b/mysql-test/t/gis.test
@@ -820,3 +820,5 @@ CREATE TABLE t3 (
 # cleanup
 DROP TABLE t0, t1, t2;

+
+--echo End of 5.5 tests