diff options
| author | Igor Babaev <igor@askmonty.org> | 2013-01-23 15:18:05 -0800 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2013-01-23 15:18:05 -0800 |
| commit | 32151409c13ddc09ebda7cd02fdfe40db290503e (patch) | |
| tree | 86997a41bbc6c4379209af0cccdb4ae612c8d4f4 /sql/sql_class.h | |
| parent | f1e758dc6f4183a8e3856d21c95f7e4973c585c1 (diff) | |
| parent | 746152959a8787f3c7cf6b1c710fc1ee6c54419f (diff) | |
| download | mariadb-git-32151409c13ddc09ebda7cd02fdfe40db290503e.tar.gz | |
Merge 5.3->5.5
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index e92ba129a29..bdf08cea250 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -3856,6 +3856,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, @@ -3896,7 +3898,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; } |