database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge 5.1->5.2

Browse Source
This commit is contained in:
Igor Babaev
2013-01-21 15:23:40 -08:00
parent 02d368ff9d 82fe8a4e71
commit 8127e631de
8 changed files with 174 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_class.h
View File

@ -3068,6 +3068,8 @@ class Unique :public Sql_alloc
bool flush();
uint size;
bool merge(TABLE *table, uchar *buff, bool without_last_merge);
public:
ulong elements;
Unique(qsort_cmp2 comp_func, void *comp_func_fixed_arg,
@ -3095,7 +3097,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; }