diff options
| author | Alexander Barkov <bar@mariadb.org> | 2017-07-13 07:21:21 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2017-07-13 07:21:21 +0400 |
| commit | 29acdcd5427e13bc3aefbbeee17b42bfe23dea84 (patch) | |
| tree | f8f5365594c3b43e01891b7017f47fa6b934c646 /client/mysqltest.cc | |
| parent | e33bda183e80ff63a984ed2a938467950b23a3fd (diff) | |
| parent | daec0004502a1f8c2ff7d46de92a61b5c4da1d6c (diff) | |
| download | mariadb-git-MDEV-9804.tar.gz | |
Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3MDEV-9804
Conflicts:
VERSION
debian/mariadb-backup-10.2.files
debian/mariadb-backup-10.2.install
debian/mariadb-backup-10.3.files
mysql-test/unstable-tests
Diffstat (limited to 'client/mysqltest.cc')
| -rw-r--r-- | client/mysqltest.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc index 915727adedb..b036ff5645c 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -602,7 +602,7 @@ void do_eval(DYNAMIC_STRING *query_eval, const char *query, void str_to_file(const char *fname, char *str, int size); void str_to_file2(const char *fname, char *str, int size, my_bool append); -void fix_win_paths(char *val, int len); +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); @@ -2652,6 +2652,7 @@ void var_query_set(VAR *var, const char *query, const char** query_end) if (!mysql) { struct st_command command; + DBUG_ASSERT(query_end); memset(&command, 0, sizeof(command)); command.query= (char*)query; command.first_word_len= (*query_end - query); @@ -7468,7 +7469,7 @@ void free_win_path_patterns() => all \ from c:\mysql\m... until next space is converted into / */ -void fix_win_paths(char *val, int len) +void fix_win_paths(char *val, size_t len) { #ifdef _WIN32 uint i; |