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

Manual merge from the bugfix tree.

Browse Source 
conflicts:
   conflict      sql/sql_parse.cc
This commit is contained in:
Alexey Kopytov
2010-06-11 16:52:06 +04:00
parent 0823afc8bf c2ebb0ac88
commit 386929d3ae
16 changed files with 182 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
sql/sql_prepare.cc
View File

@@ -3033,13 +3033,16 @@ bool Prepared_statement::prepare(const char *packet, uint packet_len)
old_stmt_arena= thd->stmt_arena;
thd->stmt_arena= this;
Parser_state parser_state(thd, thd->query(), thd->query_length());
parser_state.m_lip.stmt_prepare_mode= TRUE;
lex_start(thd);
Parser_state parser_state;
if (!parser_state.init(thd, thd->query(), thd->query_length()))
{
parser_state.m_lip.stmt_prepare_mode= TRUE;
lex_start(thd);
error= parse_sql(thd, & parser_state, NULL) ||
thd->is_error() ||
init_param_array(this);
error= parse_sql(thd, & parser_state, NULL) ||
thd->is_error() ||
init_param_array(this);
}
lex->set_trg_event_type_for_tables();