diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-02-26 00:22:35 +0200 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-02-26 00:22:35 +0200 |
| commit | 86355b533275eb1f77773a9e1e2d181540b89d2c (patch) | |
| tree | 7ab76a019795a4806b97cb19efc02d2efcfaff5e /mysql-test | |
| parent | aad47c9009b4de82ca67b9e39d60df1de5a483c4 (diff) | |
| parent | 0e3fc000d5f5c108f289240cf9126518c0822fe2 (diff) | |
| download | mariadb-git-86355b533275eb1f77773a9e1e2d181540b89d2c.tar.gz | |
merge with 3.23 to get corrected error message files and rename of files in mysql-test
innobase/ibuf/ibuf0ibuf.c:
Auto merged
sql/share/english/errmsg.txt:
Auto merged
sql/share/french/errmsg.txt:
Auto merged
sql/share/german/errmsg.txt:
Auto merged
sql/share/greek/errmsg.txt:
Auto merged
sql/share/hungarian/errmsg.txt:
Auto merged
sql/share/italian/errmsg.txt:
Auto merged
sql/share/japanese/errmsg.txt:
Auto merged
sql/share/korean/errmsg.txt:
Auto merged
sql/share/norwegian-ny/errmsg.txt:
Auto merged
sql/share/norwegian/errmsg.txt:
Auto merged
sql/sql_analyse.cc:
Auto merged
sql/sql_analyse.h:
Auto merged
sql/share/polish/errmsg.txt:
Auto merged
sql/share/portuguese/errmsg.txt:
Auto merged
sql/share/romanian/errmsg.txt:
Auto merged
sql/share/russian/errmsg.txt:
Auto merged
sql/share/slovak/errmsg.txt:
Auto merged
sql/share/spanish/errmsg.txt:
Auto merged
sql/share/ukrainian/errmsg.txt:
Auto merged
mysql-test/t/rpl000015.slave-mi:
Auto merged
mysql-test/t/rpl_rotate_logs.slave-mi:
Auto merged
mysql-test/mysql-test-run.sh:
merge with 3.23
scripts/make_binary_distribution.sh:
merge with 3.23
sql/share/czech/errmsg.txt:
merge with 3.23
sql/share/danish/errmsg.txt:
merge with 3.23
sql/share/dutch/errmsg.txt:
merge with 3.23
sql/share/estonian/errmsg.txt:
merge with 3.23
sql/share/swedish/errmsg.txt:
merge with 3.23
sql/sql_class.cc:
merge with 3.23 (Keep local copy)
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/mysql-test-run.sh | 2 | ||||
| -rw-r--r-- | mysql-test/t/rpl000015.slave-mi (renamed from mysql-test/t/rpl000015-slave-master-info.opt) | 0 | ||||
| -rw-r--r-- | mysql-test/t/rpl_rotate_logs.slave-mi (renamed from mysql-test/t/rpl_rotate_logs-slave-master-info.opt) | 0 |
3 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index b05779e8af2..48bb94ea0e4 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -1118,7 +1118,7 @@ run_testcase () slave_opt_file=$TESTDIR/$tname-slave.opt master_init_script=$TESTDIR/$tname-master.sh slave_init_script=$TESTDIR/$tname-slave.sh - slave_master_info_file=$TESTDIR/$tname-slave-master-info.opt + slave_master_info_file=$TESTDIR/$tname.slave-mi echo $tname > $CURRENT_TEST SKIP_SLAVE=`$EXPR \( $tname : rpl \) = 0` if [ $USE_MANAGER = 1 ] ; then diff --git a/mysql-test/t/rpl000015-slave-master-info.opt b/mysql-test/t/rpl000015.slave-mi index 28bc753dd56..28bc753dd56 100644 --- a/mysql-test/t/rpl000015-slave-master-info.opt +++ b/mysql-test/t/rpl000015.slave-mi diff --git a/mysql-test/t/rpl_rotate_logs-slave-master-info.opt b/mysql-test/t/rpl_rotate_logs.slave-mi index 80190bf6d29..80190bf6d29 100644 --- a/mysql-test/t/rpl_rotate_logs-slave-master-info.opt +++ b/mysql-test/t/rpl_rotate_logs.slave-mi |