diff options
| author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2010-12-16 16:40:52 +0200 |
|---|---|---|
| committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2010-12-16 16:40:52 +0200 |
| commit | b908a74bc93607e39958aaafd0f28821c6cd94fb (patch) | |
| tree | 99ca0d190d46ddddecfc124efe2f2cfc7a4f604a /client/mysqltest.cc | |
| parent | 338e0d5cac3a772efe2b4ac451f4defd28c4a4ce (diff) | |
| parent | f1431e158281596497e5cc33adcd6d84ca4b10a4 (diff) | |
| download | mariadb-git-b908a74bc93607e39958aaafd0f28821c6cd94fb.tar.gz | |
merge
Diffstat (limited to 'client/mysqltest.cc')
| -rw-r--r-- | client/mysqltest.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc index 0764020fc92..b0ed1d88a51 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -444,7 +444,7 @@ struct st_command char *query, *query_buf,*first_argument,*last_argument,*end; DYNAMIC_STRING content; int first_word_len, query_len; - my_bool abort_on_error; + my_bool abort_on_error, used_replace; struct st_expected_errors expected_errors; char require_file[FN_REFLEN]; enum enum_commands type; @@ -3287,7 +3287,7 @@ static int get_list_files(DYNAMIC_STRING *ds, const DYNAMIC_STRING *ds_dirname, if (ds_wild && ds_wild->length && wild_compare(file->name, ds_wild->str, 0)) continue; - dynstr_append(ds, file->name); + replace_dynstr_append(ds, file->name); dynstr_append(ds, "\n"); } set_wild_chars(0); @@ -3317,6 +3317,7 @@ static void do_list_files(struct st_command *command) {"file", ARG_STRING, FALSE, &ds_wild, "Filename (incl. wildcard)"} }; DBUG_ENTER("do_list_files"); + command->used_replace= 1; check_command_args(command, command->first_argument, list_files_args, @@ -3358,6 +3359,7 @@ static void do_list_files_write_file_command(struct st_command *command, {"file", ARG_STRING, FALSE, &ds_wild, "Filename (incl. wildcard)"} }; DBUG_ENTER("do_list_files_write_file"); + command->used_replace= 1; check_command_args(command, command->first_argument, list_files_args, @@ -8404,7 +8406,7 @@ int main(int argc, char **argv) memset(&saved_expected_errors, 0, sizeof(saved_expected_errors)); } - if (command_executed != last_command_executed) + if (command_executed != last_command_executed || command->used_replace) { /* As soon as any command has been executed, |