diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-01-25 12:44:24 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-01-25 12:44:24 +0200 |
| commit | 961c7938bb4df7a19ccd8def1e57669f7600d3e5 (patch) | |
| tree | b3d208be6d95ea3e4d1ba81c78392517ffe8f7fd /sql/sql_lex.cc | |
| parent | 5adcb2e7b8f08cc459e478e5b118d924fbe18c86 (diff) | |
| parent | 3467f6376472ce695e36746ba5b3c13cb5fcbb9f (diff) | |
| download | mariadb-git-961c7938bb4df7a19ccd8def1e57669f7600d3e5.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'sql/sql_lex.cc')
| -rw-r--r-- | sql/sql_lex.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index f93db3d00de..6871699dc5b 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -2826,6 +2826,8 @@ int Lex_input_stream::scan_ident_delimited(THD *thd, Return the quote character, to have the parser fail on syntax error. */ m_ptr= (char *) m_tok_start + 1; + if (m_echo) + m_cpp_ptr= (char *) m_cpp_tok_start + 1; return quote_char; } int var_length= cs->charlen(get_ptr() - 1, get_end_of_query()); |