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 5.2->5.3

Browse Source
This commit is contained in:
Igor Babaev
2013-01-21 21:29:19 -08:00
parent 2255132f20 8127e631de
commit 746152959a
14 changed files with 251 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_class.h
View File

@ -3447,6 +3447,8 @@ class Unique :public Sql_alloc
uint full_size;
uint min_dupl_count; /* always 0 for unions, > 0 for intersections */
bool merge(TABLE *table, uchar *buff, bool without_last_merge);
public:
ulong elements;
Unique(qsort_cmp2 comp_func, void *comp_func_fixed_arg,
@ -3487,7 +3489,7 @@ public:
}
void reset();
bool walk(tree_walk_action action, void *walk_action_arg);
bool walk(TABLE *table, tree_walk_action action, void *walk_action_arg);
uint get_size() const { return size; }
ulonglong get_max_in_memory_size() const { return max_in_memory_size; }