diff options
author | unknown <evgen@moonbone.local> | 2008-03-28 14:31:52 +0300 |
---|---|---|
committer | unknown <evgen@moonbone.local> | 2008-03-28 14:31:52 +0300 |
commit | 7c156537cc51c42ae58c61f6bb70a307b8216334 (patch) | |
tree | 4b7e91d38fed2b7d68d6dc8135ad21790e4909ec /sql/mysql_priv.h | |
parent | ab82016ae85b7126319e3749b5c8232e5b8fbf79 (diff) | |
parent | 9d661efd7f85b4208b9220434a0d5b5f21ac5070 (diff) | |
download | mariadb-git-7c156537cc51c42ae58c61f6bb70a307b8216334.tar.gz |
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-bugteam
into moonbone.local:/work/27219-5.0-opt-mysql
sql/item.cc:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/mysql_priv.h')
-rw-r--r-- | sql/mysql_priv.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 0b488900ac5..607c06f55d2 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -1045,6 +1045,13 @@ SQL_SELECT *make_select(TABLE *head, table_map const_tables, extern Item **not_found_item; /* + A set of constants used for checking non aggregated fields and sum + functions mixture in the ONLY_FULL_GROUP_BY_MODE. +*/ +#define NON_AGG_FIELD_USED 1 +#define SUM_FUNC_USED 2 + +/* This enumeration type is used only by the function find_item_in_list to return the info on how an item has been resolved against a list of possibly aliased items. |