mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Merged 4.1 -> 5.0.
This commit is contained in:
@ -26,6 +26,7 @@
|
||||
class Query_log_event;
|
||||
class Load_log_event;
|
||||
class Slave_log_event;
|
||||
class sp_rcontext;
|
||||
|
||||
enum enum_enable_or_disable { LEAVE_AS_IS, ENABLE, DISABLE };
|
||||
enum enum_ha_read_modes { RFIRST, RNEXT, RPREV, RLAST, RKEY };
|
||||
@ -550,6 +551,8 @@ public:
|
||||
bool volatile killed;
|
||||
bool prepare_command;
|
||||
bool tmp_table_used;
|
||||
sp_rcontext *spcont; // SP runtime context
|
||||
List<sp_head> spfuns; // SP FUNCTIONs
|
||||
|
||||
/*
|
||||
If we do a purge of binary logs, log index info of the threads
|
||||
@ -1019,13 +1022,22 @@ public:
|
||||
bool send_eof();
|
||||
};
|
||||
|
||||
class my_var : public Sql_alloc {
|
||||
public:
|
||||
LEX_STRING s;
|
||||
bool local;
|
||||
uint offset;
|
||||
my_var (LEX_STRING& j, bool i, uint o) : s(j), local(i), offset(o) {}
|
||||
~my_var() {}
|
||||
};
|
||||
|
||||
class select_dumpvar :public select_result {
|
||||
ha_rows row_count;
|
||||
public:
|
||||
List<LEX_STRING> var_list;
|
||||
List<my_var> var_list;
|
||||
List<Item_func_set_user_var> vars;
|
||||
select_dumpvar(void) { var_list.empty(); vars.empty(); row_count=0;}
|
||||
List<Item_splocal> local_vars;
|
||||
select_dumpvar(void) { var_list.empty(); local_vars.empty(); vars.empty(); row_count=0;}
|
||||
~select_dumpvar() {}
|
||||
int prepare(List<Item> &list, SELECT_LEX_UNIT *u);
|
||||
bool send_fields(List<Item> &list, uint flag) {return 0;}
|
||||
|
Reference in New Issue
Block a user