diff options
| author | Mattias Jonsson <mattias.jonsson@oracle.com> | 2010-11-17 10:13:57 +0100 |
|---|---|---|
| committer | Mattias Jonsson <mattias.jonsson@oracle.com> | 2010-11-17 10:13:57 +0100 |
| commit | 21bc09c26b69e01ffa155886dc4622827678f3df (patch) | |
| tree | a775c32621099d20b8031c0071fa8eafd6c1203d /client | |
| parent | dd0a6227c7bbf98467b29e6a49fe553c8b76b454 (diff) | |
| download | mariadb-git-21bc09c26b69e01ffa155886dc4622827678f3df.tar.gz | |
post-push fix, backported --replace_result patch
for --list_files in mysqltest.
client/mysqltest.cc:
Backported --replace_result for --list_files.
mysql-test/r/mysqltest.result:
updated test.
mysql-test/t/mysqltest.test:
added test for replace_result on list_files.
Diffstat (limited to 'client')
| -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 35ceaaaa5de..b473169b58b 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -441,7 +441,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; @@ -3284,7 +3284,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); @@ -3314,6 +3314,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, @@ -3355,6 +3356,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, @@ -8386,7 +8388,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, |