diff options
| author | Alexander Barkov <bar@mariadb.org> | 2016-11-28 17:28:37 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2016-11-28 17:28:37 +0400 |
| commit | 9976223c0063944a7fb598b8e22512a35c841f67 (patch) | |
| tree | 2ff44240c044b539cc228b54af4a8365e9ccdf2f /sql/sql_lex.cc | |
| parent | adc38ed81140701f89b40b3356b5fb7f9587c2b7 (diff) | |
| download | mariadb-git-9976223c0063944a7fb598b8e22512a35c841f67.tar.gz | |
MDEV-11171 Assertion `m_cpp_buf <= ptr && ptr <= m_cpp_buf + m_buf_length' failed in Lex_input_stream::body_utf8_append(const char*, const char*)
Diffstat (limited to 'sql/sql_lex.cc')
| -rw-r--r-- | sql/sql_lex.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index ee0e09acbf9..2462f0fea17 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -1074,7 +1074,7 @@ static int lex_one_token(YYSTYPE *yylval, THD *thd) state= (enum my_lex_states) state_map[c]; break; case MY_LEX_ESCAPE: - if (lip->yyGet() == 'N') + if (!lip->eof() && lip->yyGet() == 'N') { // Allow \N as shortcut for NULL yylval->lex_str.str=(char*) "\\N"; yylval->lex_str.length=2; |