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

2011-03-09 17:04:52 +02:00 · 2011-03-09 17:04:52 +02:00 · 692b01d27a
commit 692b01d27a
parent 81c0f94c32 3d7d43665b
2 changed files with 3 additions and 0 deletions
--- 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