summaryrefslogtreecommitdiff
path: root/mysql-test/t/rpl000015.test
diff options
context:
space:
mode:
authorunknown <msvensson@neptunus.(none)>2006-02-17 12:07:45 +0100
committerunknown <msvensson@neptunus.(none)>2006-02-17 12:07:45 +0100
commitc61fb3c359e0712d0796937b6fed673c4409084a (patch)
treea1cacf62e53acdec8145e09b38bfaf287cf65cab /mysql-test/t/rpl000015.test
parent1be9ba8ae8295e753d4516b4faf42ba0b02dca25 (diff)
downloadmariadb-git-c61fb3c359e0712d0796937b6fed673c4409084a.tar.gz
Replace win filename s with unix equivalent
Evaluate commands passed to "exec" and "system" to expand any $variables before executing command. client/mysqltest.c: do_exec, do_system - call do_eval on the command to be executed in order to expand any $variables - Remove old subst_env_var and my_popen, not needed anymore Rewrite 'replace_strings' into 'replace_strings_append' - copy whole strings instead of byte by byte copy - insert result directly inito dynamic_string, no need to check if out string needs to be realloced for every byte. - Add comments and DBUG_PRINT's New function 'fix_win_paths', detect filenames in win format that should be converted do_eval - Only set "escaped" if next char is \ or $ mysql-test/mysql-test-run.pl: Always pass path for DBUG .trace file in unix format Add search path client_debug to find debug compiled windows binaries Remove unused MYSQL_TEST_WINDIR and MASTER_WINMYSOCK mysql-test/r/mysqldump.result: Update test result mysql-test/t/client_xml.test: Use " instead of ' mysql-test/t/mysql_client_test.test: Remove the useless "exec echo" command mysql-test/t/mysqltest.test: Escape $variables passed to --exec, that should not be evaluated in exec. mysql-test/t/rpl000015.test: Remove unneccessary replace mysql-test/t/system_mysql_db_fix.test: Call the "shell script" $MYSQL_FIX_SYSTEM_TABLE using --system
Diffstat (limited to 'mysql-test/t/rpl000015.test')
-rw-r--r--mysql-test/t/rpl000015.test2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/rpl000015.test b/mysql-test/t/rpl000015.test
index a53049386af..df4bf6f977b 100644
--- a/mysql-test/t/rpl000015.test
+++ b/mysql-test/t/rpl000015.test
@@ -12,7 +12,7 @@ show slave status;
change master to master_host='127.0.0.1';
# The following needs to be cleaned up when change master is fixed
---replace_result $MASTER_MYPORT MASTER_PORT $MYSQL_TCP_PORT MASTER_PORT
+--replace_result $MYSQL_TCP_PORT MASTER_PORT
--replace_column 1 # 8 # 9 # 23 # 33 #
show slave status;
--replace_result $MASTER_MYPORT MASTER_PORT