database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-02 09:41:40 +03:00
Code Activity

Automatic merge with 5.1

Browse Source
This commit is contained in:
Michael Widenius
2010-11-04 16:53:10 +02:00
parent 5789f96c62 3bac9cf7fe
commit 3797ca41b3
47 changed files with 758 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_parse.cc
View File

@@ -8011,6 +8011,8 @@ bool parse_sql(THD *thd,
Object_creation_ctx *creation_ctx)
{
bool mysql_parse_status;
DBUG_ENTER("parse_sql");
DBUG_ASSERT(thd->m_parser_state == NULL);
/* Backup creation context. */
@@ -8044,7 +8046,7 @@ bool parse_sql(THD *thd,
/* That's it. */
return mysql_parse_status || thd->is_fatal_error;
DBUG_RETURN(mysql_parse_status || thd->is_fatal_error);
}
/**