bk commit into 5.0 tree (gkodinov:1.2423)

[kgeorge]

Below is the list of changes that have just been committed into a local
5.0 repository of kgeorge. When kgeorge does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-03-29 19:20:33+03:00, gkodinov@stripped +2 -0
  Merge gkodinov@stripped:/home/bk/mysql-5.0-opt
  into  magare.gmz:/home/kgeorge/mysql/autopush/B26815-5.0-opt
  MERGE: 1.2420.1.3

  sql/item_sum.cc@stripped, 2007-03-29 19:20:31+03:00, gkodinov@stripped +0 -0
    Auto merged
    MERGE: 1.201.1.1

  sql/sql_select.cc@stripped, 2007-03-29 19:20:31+03:00, gkodinov@stripped +0 -0
    Auto merged
    MERGE: 1.502.1.1

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	gkodinov
# Host:	magare.gmz
# Root:	/home/kgeorge/mysql/autopush/B26815-5.0-opt/RESYNC

--- 1.203/sql/item_sum.cc	2007-03-29 19:20:02 +03:00
+++ 1.204/sql/item_sum.cc	2007-03-29 19:20:31 +03:00
@@ -149,6 +149,8 @@ bool Item_sum::check_sum_func(THD *thd, 
     if (register_sum_func(thd, ref))
       return TRUE;
     invalid= aggr_level < 0 && !(allow_sum_func & (1 << nest_level));
+    if (!invalid && thd->variables.sql_mode & MODE_ANSI)
+      invalid= aggr_level < 0 && max_arg_level < nest_level;
   }
   if (!invalid && aggr_level < 0)
   {
@@ -164,8 +166,9 @@ bool Item_sum::check_sum_func(THD *thd, 
     Additionally we have to check whether possible nested set functions
     are acceptable here: they are not, if the level of aggregation of
     some of them is less than aggr_level.
-  */ 
-  invalid= aggr_level <= max_sum_func_level;
+  */
+  if (!invalid) 
+    invalid= aggr_level <= max_sum_func_level;
   if (invalid)  
   {
     my_message(ER_INVALID_GROUP_FUNC_USE, ER(ER_INVALID_GROUP_FUNC_USE),

--- 1.504/sql/sql_select.cc	2007-03-29 19:20:02 +03:00
+++ 1.505/sql/sql_select.cc	2007-03-29 19:20:31 +03:00
@@ -8793,12 +8793,12 @@ static Field *create_tmp_field_from_item
   
     enum enum_field_types type;
     /*
-      DATE/TIME fields have STRING_RESULT result type. To preserve
-      type they needed to be handled separately.
+      DATE/TIME and GEOMETRY fields have STRING_RESULT result type. 
+      To preserve type they needed to be handled separately.
     */
     if ((type= item->field_type()) == MYSQL_TYPE_DATETIME ||
         type == MYSQL_TYPE_TIME || type == MYSQL_TYPE_DATE ||
-        type == MYSQL_TYPE_TIMESTAMP)
+        type == MYSQL_TYPE_TIMESTAMP || type == MYSQL_TYPE_GEOMETRY)
       new_field= item->tmp_table_field_from_field_type(table);
     /* 
       Make sure that the blob fits into a Field_varstring which has