database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge 10.3 into 10.4

Browse Source
This commit is contained in:
Marko Mäkelä
2019-03-12 16:14:31 +02:00
parent 6d68a3464e 69b33fca8c
commit e450527938
29 changed files with 253 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
client/mysqltest.cc
View File

@@ -192,6 +192,7 @@ static char TMPDIR[FN_REFLEN];
static char global_subst_from[200];
static char global_subst_to[200];
static char *global_subst= NULL;
static char *read_command_buf= NULL;
static MEM_ROOT require_file_root;
static const my_bool my_true= 1;
static const my_bool my_false= 0;
@@ -1531,6 +1532,7 @@ void free_used_memory()
free_defaults(default_argv);
free_root(&require_file_root, MYF(0));
free_re();
my_free(read_command_buf);
#ifdef _WIN32
free_tmp_sh_file();
free_win_path_patterns();
@@ -6552,7 +6554,6 @@ static inline bool is_escape_char(char c, char in_string)
*/
static char *read_command_buf= NULL;
static size_t read_command_buflen= 0;
static const size_t max_multibyte_length= 6;