Merge stella.local:/home2/mydev/mysql-5.0-axmrg

into  stella.local:/home2/mydev/mysql-5.1-axmrg


mysql-test/t/merge.test:
  Auto merged
This commit is contained in:
unknown 2007-12-12 19:52:52 +01:00
commit 0d5caaa4a1

View File

@ -1,5 +1,5 @@
#
# test of MERGE TABLES
# Test of MERGE TABLES
#
--disable_warnings