summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@mariadb.com>2021-09-24 15:17:52 +0200
committerVladislav Vaintroub <wlad@mariadb.com>2021-09-24 15:17:52 +0200
commita5df5aec06d429cfaf0c7a8994e67eaeeebf080b (patch)
tree1d15ed36a62fc19ac98d1dbb3e9502efd521ba8f
parent8221708e389728aef799046eef3c49b1eec2e400 (diff)
downloadmariadb-git-a5df5aec06d429cfaf0c7a8994e67eaeeebf080b.tar.gz
Fixup "Windows, mysqltest : cleanup, remove dead code USE_CYGWIN"
last commit 8221708e389728aef799046eef3c49b1eec2e400 removed too much, mtr is failing
-rw-r--r--client/mysqltest.cc8
1 files changed, 8 insertions, 0 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc
index 736e708e0f4..bca35b74a64 100644
--- a/client/mysqltest.cc
+++ b/client/mysqltest.cc
@@ -614,6 +614,10 @@ void fix_win_paths(char *val, size_t len);
const char *get_errname_from_code (uint error_code);
int multi_reg_replace(struct st_replace_regex* r,char* val);
+#ifdef _WIN32
+void free_win_path_patterns();
+#endif
+
/* For replace_column */
static char *replace_column[MAX_COLUMNS];
@@ -1462,6 +1466,9 @@ void free_used_memory()
free_root(&require_file_root, MYF(0));
free_re();
my_free(read_command_buf);
+#ifdef _WIN32
+ free_win_path_patterns();
+#endif
DBUG_VOID_RETURN;
}
@@ -9172,6 +9179,7 @@ int main(int argc, char **argv)
init_builtin_echo();
#ifdef _WIN32
is_windows= 1;
+ init_win_path_patterns();
#endif
read_command_buf= (char*)my_malloc(read_command_buflen= 65536, MYF(MY_FAE));