summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRamil Kalimullin <ramil@mysql.com>2010-06-24 21:19:25 +0400
committerRamil Kalimullin <ramil@mysql.com>2010-06-24 21:19:25 +0400
commit56dc363dbc5cbe06d1842c1fa0001b09c50c441d (patch)
tree325019cf6d12beed102510de51448813fcec9e69
parent0611703f62b13b4dacd12d27bc43ae84e8801437 (diff)
parent479d24a2130e629306ce8c2e02bad3b0aa7b57e6 (diff)
downloadmariadb-git-56dc363dbc5cbe06d1842c1fa0001b09c50c441d.tar.gz
Automerge.
-rw-r--r--mysql-test/t/select.test1
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/t/select.test b/mysql-test/t/select.test
index a47eb4efe47..463b3f39baa 100644
--- a/mysql-test/t/select.test
+++ b/mysql-test/t/select.test
@@ -4127,4 +4127,5 @@ EXPLAIN SELECT 1 FROM t1 ORDER BY a COLLATE latin1_german2_ci;
SELECT 1 FROM t1 ORDER BY a COLLATE latin1_german2_ci;
DROP TABLE t1;
+
--echo End of 5.1 tests