diff options
| author | unknown <msvensson@pilot.mysql.com> | 2008-01-08 21:13:59 +0100 |
|---|---|---|
| committer | unknown <msvensson@pilot.mysql.com> | 2008-01-08 21:13:59 +0100 |
| commit | 6d45993694839525c71060243dac2af46d975200 (patch) | |
| tree | 9d1e1005e2ce2be7dcf0733f24080a0c40d98e95 /client/mysqltest.c | |
| parent | f2c4c8dd264a0607df382669660f14cefba0c887 (diff) | |
| parent | 03c2ee0d640820d54d2fb60dc8083fd5f609f3e7 (diff) | |
| download | mariadb-git-6d45993694839525c71060243dac2af46d975200.tar.gz | |
Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr-win
into pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr
Diffstat (limited to 'client/mysqltest.c')
| -rw-r--r-- | client/mysqltest.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c index 39675a168d9..628a4e639fd 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -7406,6 +7406,7 @@ void do_get_replace(struct st_command *command) if (!*from) die("Wrong number of arguments to replace_result in '%s'", command->query); + IF_WIN(fix_win_paths(to, from - to), 0); insert_pointer_name(&from_array,to); to= get_string(&buff, &from, command); insert_pointer_name(&to_array,to); @@ -8596,9 +8597,7 @@ void free_pointer_array(POINTER_ARRAY *pa) void replace_dynstr_append_mem(DYNAMIC_STRING *ds, const char *val, int len) { -#ifdef __WIN__ - fix_win_paths(val, len); -#endif + IF_WIN(fix_win_paths(val, len), 0); if (glob_replace_regex) { |