diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-07-07 11:30:03 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-07-07 11:30:03 +0200 |
| commit | 9e11e055ce1461caecbb30e8300dfdcd48af22f1 (patch) | |
| tree | 48f5dc07a29e44a106c37e7e8e3234c62abbebf6 /client/mysqltest.cc | |
| parent | 2b5c9bc2c813ea7963959e515da5d60392c35431 (diff) | |
| parent | 6b99859fff6b8c0a52ea45965834c9c3fdfc4cb3 (diff) | |
| download | mariadb-git-9e11e055ce1461caecbb30e8300dfdcd48af22f1.tar.gz | |
Merge branch '10.0' into 10.1
Diffstat (limited to 'client/mysqltest.cc')
| -rw-r--r-- | client/mysqltest.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc index 504eadcf2a8..99e4e4dfc66 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -600,7 +600,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(const char *val, int len); +void fix_win_paths(const 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); @@ -814,8 +814,7 @@ public: LogFile log_file; LogFile progress_file; -void replace_dynstr_append_mem(DYNAMIC_STRING *ds, const char *val, - int len); +void replace_dynstr_append_mem(DYNAMIC_STRING *ds, const char *val, size_t len); void replace_dynstr_append(DYNAMIC_STRING *ds, const char *val); void replace_dynstr_append_uint(DYNAMIC_STRING *ds, uint val); void dynstr_append_sorted(DYNAMIC_STRING* ds, DYNAMIC_STRING* ds_input, @@ -2653,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); @@ -7488,7 +7488,7 @@ void free_win_path_patterns() => all \ from c:\mysql\m... until next space is converted into / */ -void fix_win_paths(const char *val, int len) +void fix_win_paths(const char *val, size_t len) { uint i; char *p; @@ -11013,7 +11013,7 @@ void free_pointer_array(POINTER_ARRAY *pa) /* Append the string to ds, with optional replace */ void replace_dynstr_append_mem(DYNAMIC_STRING *ds, - const char *val, int len) + const char *val, size_t len) { char lower[512]; #ifdef __WIN__ |