diff options
| author | unknown <istruewing@stella.local> | 2007-12-12 19:52:52 +0100 |
|---|---|---|
| committer | unknown <istruewing@stella.local> | 2007-12-12 19:52:52 +0100 |
| commit | 0d5caaa4a1213e7d2d52a27ed41de32f3da0c050 (patch) | |
| tree | b2dcc82543a11ecc39e99d681ea914586060df6d /mysql-test/t/merge.test | |
| parent | 573353c2ebc69f91263a6b9bca37effead7f206e (diff) | |
| parent | 0ced2a4d19839417ca6a6d6c8cc9c5cba259ef76 (diff) | |
| download | mariadb-git-0d5caaa4a1213e7d2d52a27ed41de32f3da0c050.tar.gz | |
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
Diffstat (limited to 'mysql-test/t/merge.test')
| -rw-r--r-- | mysql-test/t/merge.test | 2 |
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 |