diff options
| author | Monty <monty@mariadb.org> | 2020-07-03 00:35:28 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2020-07-03 00:35:28 +0300 |
| commit | 5211af1c16063e9c7a62e39ae4acfdc7c9f15e35 (patch) | |
| tree | a615a9bf9aaec7dd3f2f510ba2c194d673c65e78 /client | |
| parent | f347b3e0e6592329b1447fa460aca0a4b1f680b1 (diff) | |
| parent | b6ec1e8bbf0ffca2d715aded694722e0c4b5d484 (diff) | |
| download | mariadb-git-5211af1c16063e9c7a62e39ae4acfdc7c9f15e35.tar.gz | |
Merge remote-tracking branch 'origin/10.3' into 10.4
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqltest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc index 84a3875f308..33e4d04527f 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -10126,7 +10126,7 @@ void append_replace_regex(char* expr, char *expr_end, struct st_replace_regex* r /* Allow variable for the *entire* list of replacements */ if (*p == '$') { - const char *v_end; + const char *v_end= 0; VAR *val= var_get(p, &v_end, 0, 1); if (val) @@ -10767,7 +10767,7 @@ REPLACE *init_replace(char * *from, char * *to,uint count, for (i=1 ; i <= found_sets ; i++) { pos=from[found_set[i-1].table_offset]; - rep_str[i].found= !memcmp(pos, "\\^", 3) ? 2 : 1; + rep_str[i].found= !strncmp(pos, "\\^", 3) ? 2 : 1; rep_str[i].replace_string=to_array[found_set[i-1].table_offset]; rep_str[i].to_offset=found_set[i-1].found_offset-start_at_word(pos); rep_str[i].from_offset=found_set[i-1].found_offset-replace_len(pos)+ |