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

Merge 10.0-base -> 10.0

Browse Source
This commit is contained in:
Igor Babaev
2013-04-17 10:18:04 -07:00
parent 0e7410a154 43fe53acc2
commit a1cd28e2e5
64 changed files with 5911 additions and 418 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sql_class.h
View File

@ -59,6 +59,7 @@ void set_thd_stage_info(void *thd,
class Reprepare_observer;
class Relay_log_info;
class Rpl_filter;
class Query_log_event;
class Load_log_event;
@ -516,7 +517,10 @@ typedef struct system_variables
ulong net_write_timeout;
ulong optimizer_prune_level;
ulong optimizer_search_depth;
ulong optimizer_use_condition_selectivity;
ulong use_stat_tables;
ulong histogram_size;
ulong histogram_type;
ulong preload_buff_size;
ulong profiling_history_size;
ulong read_buff_size;
@ -1602,6 +1606,9 @@ public:
/* Slave applier execution context */
Relay_log_info* rli_slave;
/* Used to SLAVE SQL thread */
Rpl_filter* rpl_filter;
void reset_for_next_command(bool calculate_userstat);
/*
Constant for THD::where initialization in the beginning of every query.
@ -4140,6 +4147,7 @@ class Unique :public Sql_alloc
uint size;
uint full_size;
uint min_dupl_count; /* always 0 for unions, > 0 for intersections */
bool with_counters;
bool merge(TABLE *table, uchar *buff, bool without_last_merge);