database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Merge bb-10.2-compatibility into 10.3

Browse Source
This commit is contained in:
Alexander Barkov
2017-04-06 08:34:28 +04:00
parent 9764efe52c e1cff0ac5d
commit ea751857db
247 changed files with 52125 additions and 2477 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_parse.cc
View File

@@ -9849,6 +9849,7 @@ bool check_host_name(LEX_STRING *str)
extern int MYSQLparse(THD *thd); // from sql_yacc.cc
extern int ORAparse(THD *thd); // from sql_yacc_ora.cc
/**
@@ -9908,7 +9909,10 @@ bool parse_sql(THD *thd, Parser_state *parser_state,
/* Parse the query. */
bool mysql_parse_status= MYSQLparse(thd) != 0;
bool mysql_parse_status=
((thd->variables.sql_mode & MODE_ORACLE) ?
ORAparse(thd) :
MYSQLparse(thd)) != 0;
/*
Check that if MYSQLparse() failed either thd->is_error() is set, or an