summaryrefslogtreecommitdiff
path: root/sql/item_sum.h
diff options
context:
space:
mode:
authorAlexey Botchkov <holyfoot@mysql.com>2009-11-17 15:24:23 +0400
committerAlexey Botchkov <holyfoot@mysql.com>2009-11-17 15:24:23 +0400
commit5b8a24cf04b4aa76b301036f58fb624a4ff361e0 (patch)
treeb01533f7105fd4c9b16c327c83553918dbd9dbe2 /sql/item_sum.h
parent8afc2658d7fc473932151a8bde1d0b50d96f7169 (diff)
parentcd994f0ee4c67e892d35e9f928b67491b0e264b1 (diff)
downloadmariadb-git-5b8a24cf04b4aa76b301036f58fb624a4ff361e0.tar.gz
merging.
Diffstat (limited to 'sql/item_sum.h')
-rw-r--r--sql/item_sum.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/item_sum.h b/sql/item_sum.h
index 6d7418204fc..9e062ce1d16 100644
--- a/sql/item_sum.h
+++ b/sql/item_sum.h
@@ -364,6 +364,7 @@ protected:
Item **orig_args, *tmp_orig_args[2];
table_map used_tables_cache;
bool forced_const;
+ static ulonglong ram_limitation(THD *thd);
public: