diff options
| author | Alexander Barkov <bar@mariadb.org> | 2018-02-08 19:06:25 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2018-02-08 19:06:25 +0400 |
| commit | 3cad31f2a758f797ef0acac5625d0e007ecbce93 (patch) | |
| tree | 73c054636c4858b2a51eddf7eaa653746d67524e /client/mysql.cc | |
| parent | 560b9895d413bdfedda0a0ca871a635858990c05 (diff) | |
| parent | 5c057b3fef3aa92cfadbd63043799b430132a494 (diff) | |
| download | mariadb-git-3cad31f2a758f797ef0acac5625d0e007ecbce93.tar.gz | |
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
Diffstat (limited to 'client/mysql.cc')
| -rw-r--r-- | client/mysql.cc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index 929fba73ab5..81406df36c2 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -1140,6 +1140,7 @@ int main(int argc,char *argv[]) current_prompt = my_strdup(default_prompt,MYF(MY_WME)); prompt_counter=0; aborted= 0; + sf_leaking_memory= 1; /* no memory leak reports yet */ outfile[0]=0; // no (default) outfile strmov(pager, "stdout"); // the default, if --pager wasn't given @@ -1205,6 +1206,7 @@ int main(int argc,char *argv[]) my_end(0); exit(1); } + sf_leaking_memory= 0; glob_buffer.realloc(512); completion_hash_init(&ht, 128); init_alloc_root(&hash_mem_root, "hash", 16384, 0, MYF(0)); @@ -1799,10 +1801,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), #ifndef EMBEDDED_LIBRARY if ((opt_protocol= find_type_with_warning(argument, &sql_protocol_typelib, opt->name)) <= 0) - { - sf_leaking_memory= 1; /* no memory leak reports here */ exit(1); - } #endif break; case OPT_SERVER_ARG: @@ -4597,8 +4596,11 @@ static char *get_arg(char *line, get_arg_mode mode) } for (start=ptr ; *ptr; ptr++) { - if ((*ptr == '\\' && ptr[1]) || // escaped character - (!short_cmd && qtype && *ptr == qtype && ptr[1] == qtype)) // quote + /* if short_cmd use historical rules (only backslash) otherwise SQL rules */ + if (short_cmd + ? (*ptr == '\\' && ptr[1]) // escaped character + : (*ptr == '\\' && ptr[1] && qtype != '`') || // escaped character + (qtype && *ptr == qtype && ptr[1] == qtype)) // quote { // Remove (or skip) the backslash (or a second quote) if (mode != CHECK) |