summaryrefslogtreecommitdiff
path: root/sql/sql_priv.h
diff options
context:
space:
mode:
authorunknown <hery.ramilison@oracle.com>2011-07-06 01:13:50 +0200
committerMySQL Release Engineering <mysql-re_ww@oracle.com>2011-07-06 01:13:50 +0200
commit7d605ec45f8e55e1775fd028931c459e6501d25a (patch)
tree31e14059cf5a1e5e8c1601a2488b98c4af1bfeb0 /sql/sql_priv.h
parent8f73e64fff57fe4080cfc4d2816555b0d22b9e13 (diff)
parent8b1566aaaf93e6e885badd6500a07a0f70cc81f3 (diff)
downloadmariadb-git-7d605ec45f8e55e1775fd028931c459e6501d25a.tar.gz
Merge from mysql-5.5.14-release
Diffstat (limited to 'sql/sql_priv.h')
-rw-r--r--sql/sql_priv.h7
1 files changed, 0 insertions, 7 deletions
diff --git a/sql/sql_priv.h b/sql/sql_priv.h
index ce331b7b36a..caf82beb982 100644
--- a/sql/sql_priv.h
+++ b/sql/sql_priv.h
@@ -261,13 +261,6 @@ enum enum_yes_no_unknown
#ifdef MYSQL_SERVER
/*
- 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
-
-/*
External variables
*/