merge 5.1 => 5.5 : Bug#12329653

This commit is contained in:
Tor Didriksen 2011-05-05 08:13:22 +02:00
commit 6848f6c0d6
12 changed files with 124 additions and 50 deletions

View file

@ -260,13 +260,6 @@ enum enum_yes_no_unknown
#endif /* MYSQL_SERVER */
#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
*/