summaryrefslogtreecommitdiff
path: root/sql/sql_priv.h
diff options
context:
space:
mode:
authorTor Didriksen <tor.didriksen@oracle.com>2011-05-05 08:13:22 +0200
committerTor Didriksen <tor.didriksen@oracle.com>2011-05-05 08:13:22 +0200
commit6848f6c0d6e8c4bb5aa1ad2d39cd536860bd7e0b (patch)
treecd172df35bbbc323a22f426774bc859ed6080cb5 /sql/sql_priv.h
parent2da8ba6404bbba119d5d90575411978ace0f6ee6 (diff)
parente257fb3319ea6919de0a3c74c7025d4f9a218fed (diff)
downloadmariadb-git-6848f6c0d6e8c4bb5aa1ad2d39cd536860bd7e0b.tar.gz
merge 5.1 => 5.5 : Bug#12329653
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 434dfb1e306..da7f3f6f116 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
*/