database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

manual merge 5.0-runtime -> 5.1->runtime, with 25411 part I

Browse Source
This commit is contained in:
malff/marcsql@weblab.(none)
2007-04-25 21:38:12 -06:00
parent 18d7ed6564
commit 62fd6aa696
18 changed files with 479 additions and 300 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sql/sql_prepare.cc
View File

@ -2850,10 +2850,14 @@ bool Prepared_statement::prepare(const char *packet, uint packet_len)
old_stmt_arena= thd->stmt_arena;
thd->stmt_arena= this;
lex_start(thd, thd->query, thd->query_length);
lex->stmt_prepare_mode= TRUE;
error= MYSQLparse((void *)thd) || thd->is_fatal_error ||
Lex_input_stream lip(thd, thd->query, thd->query_length);
thd->m_lip= &lip;
lex_start(thd);
lex->stmt_prepare_mode= TRUE;
int err= MYSQLparse((void *)thd);
error= err || thd->is_fatal_error ||
thd->net.report_error || init_param_array(this);
/*