diff options
author | unknown <msvensson@neptunus.(none)> | 2006-02-17 12:07:45 +0100 |
---|---|---|
committer | unknown <msvensson@neptunus.(none)> | 2006-02-17 12:07:45 +0100 |
commit | c61fb3c359e0712d0796937b6fed673c4409084a (patch) | |
tree | a1cacf62e53acdec8145e09b38bfaf287cf65cab /mysql-test/t/client_xml.test | |
parent | 1be9ba8ae8295e753d4516b4faf42ba0b02dca25 (diff) | |
download | mariadb-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/client_xml.test')
-rw-r--r-- | mysql-test/t/client_xml.test | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mysql-test/t/client_xml.test b/mysql-test/t/client_xml.test index 58e9178ef3a..017b7a1569a 100644 --- a/mysql-test/t/client_xml.test +++ b/mysql-test/t/client_xml.test @@ -9,13 +9,13 @@ create table t1 ( `a>b` text ); insert into t1 values (1, 2, 'a&b a<b a>b'); ---exec $MYSQL --xml test -e 'select * from t1' +--exec $MYSQL --xml test -e "select * from t1" --exec $MYSQL_DUMP --xml --skip-create test ---exec $MYSQL --xml test -e 'select count(*) from t1' ---exec $MYSQL --xml test -e 'select 1 < 2 from dual' ---exec $MYSQL --xml test -e 'select 1 > 2 from dual' ---exec $MYSQL --xml test -e 'select 1 & 3 from dual' ---exec $MYSQL --xml test -e 'select null from dual' +--exec $MYSQL --xml test -e "select count(*) from t1" +--exec $MYSQL --xml test -e "select 1 < 2 from dual" +--exec $MYSQL --xml test -e "select 1 > 2 from dual" +--exec $MYSQL --xml test -e "select 1 & 3 from dual" +--exec $MYSQL --xml test -e "select null from dual" drop table t1; |