diff options
| author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2011-03-09 17:04:52 +0200 |
|---|---|---|
| committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2011-03-09 17:04:52 +0200 |
| commit | 44088f56a1cd59ed0f54b6c70081a73e3b18d0d2 (patch) | |
| tree | fe286fefb07ccf16ab958ea2350d41b542ef45d4 | |
| parent | 4eab28d8930daac3212e9e256f2218de17c23228 (diff) | |
| parent | ec802424493eb35bf8c82e86e7148af927eb8048 (diff) | |
| download | mariadb-git-44088f56a1cd59ed0f54b6c70081a73e3b18d0d2.tar.gz | |
merge mysql-5.1-security->mysql-5.5-security
| -rw-r--r-- | mysql-test/r/gis.result | 1 | ||||
| -rw-r--r-- | mysql-test/t/gis.test | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/r/gis.result b/mysql-test/r/gis.result index c0b800b959e..bfd0ddccb90 100644 --- 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 diff --git a/mysql-test/t/gis.test b/mysql-test/t/gis.test index fe6da647740..2a800140d1f 100644 --- 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 |