summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <bar@mysql.com>2007-03-01 11:52:25 +0400
committerunknown <bar@mysql.com>2007-03-01 11:52:25 +0400
commitef02cb6305cab784573a8a607889bf3420c946b3 (patch)
treeb66ae9b637d362e5a71e878bce0b897ffd1b3967 /mysql-test
parentd93c7f39f8ff8db3a6106a474a3791d7b1b9e9c7 (diff)
downloadmariadb-git-ef02cb6305cab784573a8a607889bf3420c946b3.tar.gz
Renaming recenly added test case, because of name conflict
when merging into 5.1. mysql-test/t/rpl_loaddata_charset.test: Rename: mysql-test/t/rpl_loaddata2.test -> mysql-test/t/rpl_loaddata_charset.test mysql-test/r/rpl_loaddata_charset.result: Rename: mysql-test/r/rpl_loaddata2.result -> mysql-test/r/rpl_loaddata_charset.result
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/rpl_loaddata_charset.result (renamed from mysql-test/r/rpl_loaddata2.result)0
-rw-r--r--mysql-test/t/rpl_loaddata_charset.test (renamed from mysql-test/t/rpl_loaddata2.test)0
2 files changed, 0 insertions, 0 deletions
diff --git a/mysql-test/r/rpl_loaddata2.result b/mysql-test/r/rpl_loaddata_charset.result
index 929d06e74cf..929d06e74cf 100644
--- a/mysql-test/r/rpl_loaddata2.result
+++ b/mysql-test/r/rpl_loaddata_charset.result
diff --git a/mysql-test/t/rpl_loaddata2.test b/mysql-test/t/rpl_loaddata_charset.test
index 7f2389cb9f6..7f2389cb9f6 100644
--- a/mysql-test/t/rpl_loaddata2.test
+++ b/mysql-test/t/rpl_loaddata_charset.test