summaryrefslogtreecommitdiff
path: root/sql/sql_lex.cc
diff options
context:
space:
mode:
Diffstat (limited to 'sql/sql_lex.cc')
-rw-r--r--sql/sql_lex.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc
index ca36cb9f205..b8d2ee13b0e 100644
--- a/sql/sql_lex.cc
+++ b/sql/sql_lex.cc
@@ -250,7 +250,8 @@ static char *get_text(LEX *lex)
str=lex->tok_start+1;
end=lex->ptr-1;
- start=(uchar*) sql_alloc((uint) (end-str)+1);
+ if (!(start=(uchar*) sql_alloc((uint) (end-str)+1)))
+ return (char*) ""; // Sql_alloc has set error flag
if (!found_escape)
{
lex->yytoklen=(uint) (end-str);