summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoristruewing@stella.local <>2007-12-12 19:52:52 +0100
committeristruewing@stella.local <>2007-12-12 19:52:52 +0100
commit8506efa91e2bccbd312411a949960ec8736a363f (patch)
treeb2dcc82543a11ecc39e99d681ea914586060df6d
parent94c74110d91c694ee7496c6be05f96f9da8f1c64 (diff)
parent9217f011361bf7c09f05692c409f52d553ce9690 (diff)
downloadmariadb-git-8506efa91e2bccbd312411a949960ec8736a363f.tar.gz
Merge stella.local:/home2/mydev/mysql-5.0-axmrg
into stella.local:/home2/mydev/mysql-5.1-axmrg
-rw-r--r--mysql-test/t/merge.test2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/merge.test b/mysql-test/t/merge.test
index 3b71dc6fde1..090d1cbf244 100644
--- a/mysql-test/t/merge.test
+++ b/mysql-test/t/merge.test
@@ -1,5 +1,5 @@
#
-# test of MERGE TABLES
+# Test of MERGE TABLES
#
--disable_warnings