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
commit294fb44d67ff1b12e11b7f771d5260ed2b1b97fb (patch)
treecd172df35bbbc323a22f426774bc859ed6080cb5 /sql/sql_priv.h
parente889b48749583751895b8f34e1906c93f69d53f0 (diff)
parent9baf84e99a6d7edd36c777593a90671d02aacbc9 (diff)
downloadmariadb-git-294fb44d67ff1b12e11b7f771d5260ed2b1b97fb.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
*/