summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorMattias Jonsson <mattias.jonsson@oracle.com>2010-09-15 10:22:12 +0200
committerMattias Jonsson <mattias.jonsson@oracle.com>2010-09-15 10:22:12 +0200
commitafd4b25d8a0ab1447d37033a377ee05a03314d44 (patch)
treeb1791eed3cd16a558ad6bda52bc8ada6af38900b /client
parent73384c99c0fc5c0a90e34647d6e1eebf2ddc14d4 (diff)
downloadmariadb-git-afd4b25d8a0ab1447d37033a377ee05a03314d44.tar.gz
Bug#56659: Mismatch of CAPITAL vs small letters in "unified filelist" partitioning output
Bug#56657: Test still uses "--exec rm -f ..." which is non-portable Bug#56601: Test uses Unix path for temporary file, fails, and writes misleading message Several tests that was written in a non portable way (failed on windows) Fixed by 1) backporting the fix for replace_result to also apply to list_files (mysqltest from mysql-trunk) 2) replacing all #p#/#sp#/#tmp# to #P#/#SP#/#TMP#/ (innodb always converts filenames to lower case in windows). 3) replacing '--exec rm -f' with '--remove_files_wildcard' 4) replacing a perl snippet with '--write_file' client/mysqltest.cc: backport from mysql-trunk to allow replace_result to apply also on list_files mysql-test/suite/parts/inc/partition_check_drop.inc: Compensate for differences between innodb on windows vs unix. Using mysqltest command, instead of unix command to remove files. mysql-test/suite/parts/inc/partition_crash.inc: compensate for differences between innodb on windows vs unix mysql-test/suite/parts/inc/partition_fail.inc: compensate for differences between innodb on windows vs unix mysql-test/suite/parts/inc/partition_layout.inc: compensate for differences between innodb on windows vs unix mysql-test/suite/parts/inc/partition_layout_check1.inc: compensate for differences between innodb on windows vs unix mysql-test/suite/parts/inc/partition_layout_check2.inc: compensate for differences between innodb on windows vs unix mysql-test/suite/parts/r/partition_recover_myisam.result: updated result mysql-test/suite/parts/r/partition_special_myisam.result: updated result mysql-test/suite/parts/t/part_supported_sql_func_innodb.test: Test takes very long time, require --big flag mysql-test/suite/parts/t/partition_alter1_1_2_innodb.test: Test takes very long time, require --big flag mysql-test/suite/parts/t/partition_alter1_2_innodb.test: Test takes very long time, require --big flag mysql-test/suite/parts/t/partition_alter2_1_1_innodb.test: Test takes very long time, require --big flag mysql-test/suite/parts/t/partition_alter2_1_2_innodb.test: Test takes very long time, require --big flag mysql-test/suite/parts/t/partition_alter2_2_2_innodb.test: Test takes very long time, require --big flag mysql-test/suite/parts/t/partition_alter4_innodb.test: Test takes very long time, require --big flag mysql-test/suite/parts/t/partition_debug_sync_innodb.test: compensate for differences between innodb on windows vs unix mysql-test/suite/parts/t/partition_recover_myisam.test: more generic suppression (failed in windows) mysql-test/suite/parts/t/partition_special_myisam.test: Using portable mysqltest command 'write_file' instead of perl snippet.
Diffstat (limited to 'client')
-rw-r--r--client/mysqltest.cc8
1 files changed, 5 insertions, 3 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc
index ca9217bf428..abe845b3710 100644
--- a/client/mysqltest.cc
+++ b/client/mysqltest.cc
@@ -447,7 +447,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;
@@ -3414,7 +3414,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);
@@ -3444,6 +3444,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,
@@ -3485,6 +3486,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,
@@ -8473,7 +8475,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,