summaryrefslogtreecommitdiff
path: root/sql/item.h
diff options
context:
space:
mode:
authorGeorgi Kodinov <kgeorge@mysql.com>2008-10-08 15:19:55 +0300
committerGeorgi Kodinov <kgeorge@mysql.com>2008-10-08 15:19:55 +0300
commit835cbfd34896ad1175fa0e71b7e40e4a8f30fef5 (patch)
tree9ec845aa41c65f6e17404abe0ffd95214594c535 /sql/item.h
parent6d54b0443a55142263754e0f7a6a36a5bafc2a21 (diff)
parent9846ab0a70241945f59e1f474137546dcbd66ed8 (diff)
downloadmariadb-git-835cbfd34896ad1175fa0e71b7e40e4a8f30fef5.tar.gz
merge 5.1-bugteam -> bug 32124 5.1 tree
Diffstat (limited to 'sql/item.h')
-rw-r--r--sql/item.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item.h b/sql/item.h
index 9b5062eee88..a3c3cbc78c1 100644
--- a/sql/item.h
+++ b/sql/item.h
@@ -2131,7 +2131,7 @@ class Item_ref :public Item_ident
protected:
void set_properties();
public:
- enum Ref_Type { REF, DIRECT_REF, VIEW_REF, OUTER_REF };
+ enum Ref_Type { REF, DIRECT_REF, VIEW_REF, OUTER_REF, AGGREGATE_REF };
Field *result_field; /* Save result here */
Item **ref;
Item_ref(Name_resolution_context *context_arg,