summaryrefslogtreecommitdiff
path: root/sql/mysql_priv.h
diff options
context:
space:
mode:
authoranozdrin/alik@ibm. <>2007-06-14 18:35:59 +0400
committeranozdrin/alik@ibm. <>2007-06-14 18:35:59 +0400
commit1ff91214c6103b8c4cefd6e47f01a5c7e83a64ba (patch)
tree5df007e2bd85f5bc10349ac41c610c1d6a36654d /sql/mysql_priv.h
parent96f57c13dfa1a53c2cfcc3c4925175d072ccd6dd (diff)
downloadmariadb-git-1ff91214c6103b8c4cefd6e47f01a5c7e83a64ba.tar.gz
The second cleanup patch in scope of BUG#11986.
1. Introduce parse_sql() as a high-level replacement for MYSQLparse(). parse_sql() is responsible to switch and restore "parser context" (THD::m_lip for now). 2. Fix typo in sp.cc: THD::spcont should be reset *before* calling the parser.
Diffstat (limited to 'sql/mysql_priv.h')
-rw-r--r--sql/mysql_priv.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h
index 1c961cf917f..9b9f9340c3f 100644
--- a/sql/mysql_priv.h
+++ b/sql/mysql_priv.h
@@ -618,6 +618,8 @@ bool check_string_char_length(LEX_STRING *str, const char *err_msg,
uint max_char_length, CHARSET_INFO *cs,
bool no_error);
+bool parse_sql(THD *thd, class Lex_input_stream *lip);
+
enum enum_mysql_completiontype {
ROLLBACK_RELEASE=-2, ROLLBACK=1, ROLLBACK_AND_CHAIN=7,
COMMIT_RELEASE=-1, COMMIT=0, COMMIT_AND_CHAIN=6
@@ -1953,7 +1955,6 @@ void free_list(I_List <i_string_pair> *list);
void free_list(I_List <i_string> *list);
/* sql_yacc.cc */
-extern int MYSQLparse(void *thd);
#ifndef DBUG_OFF
extern void turn_parser_debug_on();
#endif