diff options
| author | monty@mysql.com <> | 2005-07-28 17:09:54 +0300 |
|---|---|---|
| committer | monty@mysql.com <> | 2005-07-28 17:09:54 +0300 |
| commit | 15d48525afc66df10f8f4e68c0a33a4e3ef2ae8c (patch) | |
| tree | efa95d21efbbc033b0cabce038118a09be44e9ac /mysql-test/t/merge.test | |
| parent | b3cbd0048fe5fe36fe4fba9ce591b0d1b26e10a1 (diff) | |
| parent | 3c12d0ae54eccaef7c265af4f782d95250308dc9 (diff) | |
| download | mariadb-git-15d48525afc66df10f8f4e68c0a33a4e3ef2ae8c.tar.gz | |
Merge mysql.com:/home/my/mysql-4.1
into mysql.com:/home/my/mysql-5.0
Diffstat (limited to 'mysql-test/t/merge.test')
| -rw-r--r-- | mysql-test/t/merge.test | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/t/merge.test b/mysql-test/t/merge.test index 165c16823a2..7d708243a10 100644 --- a/mysql-test/t/merge.test +++ b/mysql-test/t/merge.test @@ -320,3 +320,4 @@ INSERT INTO t2 (b) VALUES (1) ON DUPLICATE KEY UPDATE b=3; SELECT b FROM t2; DROP TABLE t1, t2; +# End of 4.1 tests |