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

5.5 merge

Browse Source
This commit is contained in:
Sergei Golubchik
2013-03-27 23:41:02 +01:00
parent 1827d9591e 6599fd3e9c
commit 993ea79f2d
627 changed files with 17021 additions and 18027 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_class.h
View File

@ -581,6 +581,9 @@ typedef struct system_variables
ulong wt_timeout_long, wt_deadlock_search_depth_long;
double long_query_time_double;
my_bool pseudo_slave_mode;
} SV;
/**
@ -3366,6 +3369,7 @@ public:
#else
void begin_dataset() {}
#endif
virtual void update_used_tables() {}
};
@ -4133,6 +4137,7 @@ public:
return updated;
}
virtual void abort_result_set();
void update_used_tables();
};
class my_var : public Sql_alloc {
@ -4156,7 +4161,6 @@ public:
class select_dumpvar :public select_result_interceptor {
ha_rows row_count;
Item_func_set_user_var **set_var_items;
public:
List<my_var> var_list;
select_dumpvar() { var_list.empty(); row_count= 0;}