diff options
| author | Bjorn Munch <bjorn.munch@oracle.com> | 2010-08-30 11:26:40 +0200 |
|---|---|---|
| committer | Bjorn Munch <bjorn.munch@oracle.com> | 2010-08-30 11:26:40 +0200 |
| commit | c3f69b4191faf745b8e495d390e581e4c679898a (patch) | |
| tree | d2b380a1baa8283ff97dbe30b9fc09e531974bac /client | |
| parent | fd9b6b8e079e34ce14872a2633ed67786a4e5919 (diff) | |
| parent | 3ca814b76065c8c251128fc4d187f60d90cec679 (diff) | |
| download | mariadb-git-c3f69b4191faf745b8e495d390e581e4c679898a.tar.gz | |
merge 55413
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqltest.cc | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc index 756208a0f96..b7b7ad25d23 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -5509,6 +5509,8 @@ int read_line(char *buf, int size) char c, UNINIT_VAR(last_quote); char *p= buf, *buf_end= buf + size - 1; int skip_char= 0; + my_bool have_slash= FALSE; + enum {R_NORMAL, R_Q, R_SLASH_IN_Q, R_COMMENT, R_LINE_START} state= R_LINE_START; DBUG_ENTER("read_line"); @@ -5580,9 +5582,13 @@ int read_line(char *buf, int size) } else if (c == '\'' || c == '"' || c == '`') { - last_quote= c; - state= R_Q; + if (! have_slash) + { + last_quote= c; + state= R_Q; + } } + have_slash= (c == '\\'); break; case R_COMMENT: |