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 from mysql-trunk-bugfixing

Browse Source
This commit is contained in:
Jon Olav Hauglid
2010-05-18 14:52:51 +02:00
parent d1dd2d11c4 21643fb22e
commit 198d51efe7
116 changed files with 1439 additions and 963 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
sql/sql_lex.h
View File

@ -1379,6 +1379,8 @@ public:
Lex_input_stream(THD *thd, const char* buff, unsigned int length);
~Lex_input_stream();
void reset(const char *buff, unsigned int length);
/**
Set the echo mode.
@ -2206,8 +2208,8 @@ struct LEX: public Query_tables_list
class Set_signal_information
{
public:
/** Constructor. */
Set_signal_information();
/** Empty default constructor, use clear() */
Set_signal_information() {}
/** Copy constructor. */
Set_signal_information(const Set_signal_information& set);
@ -2220,7 +2222,7 @@ public:
void clear();
/**
For each contition item assignment, m_item[] contains the parsed tree
For each condition item assignment, m_item[] contains the parsed tree
that represents the expression assigned, if any.
m_item[] is an array indexed by Diag_condition_item_name.
*/
@ -2237,8 +2239,17 @@ class Yacc_state
{
public:
Yacc_state()
: yacc_yyss(NULL), yacc_yyvs(NULL), m_lock_type(TL_READ_DEFAULT)
{}
{
reset();
}
void reset()
{
yacc_yyss= NULL;
yacc_yyvs= NULL;
m_set_signal_info.clear();
m_lock_type= TL_READ_DEFAULT;
}
~Yacc_state();
@ -2311,6 +2322,12 @@ public:
Lex_input_stream m_lip;
Yacc_state m_yacc;
void reset(const char *found_semicolon, unsigned int length)
{
m_lip.reset(found_semicolon, length);
m_yacc.reset();
}
};