bk commit into 5.1 tree (gkodinov:1.2477)

[kgeorge]

Below is the list of changes that have just been committed into a local
5.1 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-11 10:17:09+02:00, gkodinov@stripped +2 -0
  Merge gkodinov@stripped:/home/bk/mysql-5.1-opt
  into  magare.gmz:/home/kgeorge/mysql/autopush/WL3527-5.1-opt
  MERGE: 1.2475.1.1

  sql/item.cc@stripped, 2007-03-11 10:17:06+02:00, gkodinov@stripped +0 -0
    Auto merged
    MERGE: 1.251.1.1

  sql/opt_range.cc@stripped, 2007-03-11 10:17:07+02:00, gkodinov@stripped +0 -0
    Auto merged
    MERGE: 1.264.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/WL3527-5.1-opt/RESYNC

--- 1.252/sql/item.cc	2007-03-09 16:55:55 +02:00
+++ 1.253/sql/item.cc	2007-03-11 10:17:06 +02:00
@@ -1791,9 +1791,10 @@ void Item_ident::print(String *str)
     }
   }
 
-  if (!table_name || !field_name)
+  if (!table_name || !field_name || !field_name[0])
   {
-    const char *nm= field_name ? field_name : name ? name : "tmp_field";
+    const char *nm= (field_name && field_name[0]) ?
+                      field_name : name ? name : "tmp_field";
     append_identifier(thd, str, nm, (uint) strlen(nm));
     return;
   }
@@ -4999,6 +5000,22 @@ Item *Item_field::update_value_transform
     return ref;
   }
   return this;
+}
+
+
+void Item_field::print(String *str)
+{
+  if (field && field->table->const_table)
+  {
+    char buff[MAX_FIELD_WIDTH];
+    String tmp(buff,sizeof(buff),str->charset());
+    field->val_str(&tmp);
+    str->append('\'');
+    str->append(tmp);
+    str->append('\'');
+    return;
+  }
+  Item_ident::print(str);
 }
 
 

--- 1.265/sql/opt_range.cc	2007-03-09 16:55:57 +02:00
+++ 1.266/sql/opt_range.cc	2007-03-11 10:17:07 +02:00
@@ -8924,7 +8924,7 @@ get_best_group_min_max(PARAM *param, SEL
   if ((join->tables != 1) ||  /* The query must reference one table. */
       ((!join->group_list) && /* Neither GROUP BY nor a DISTINCT query. */
        (!join->select_distinct)) ||
-      (thd->lex->select_lex.olap == ROLLUP_TYPE)) /* Check (B3) for ROLLUP */
+      (join->select_lex->olap == ROLLUP_TYPE)) /* Check (B3) for ROLLUP */
     DBUG_RETURN(NULL);
   if (table->s->keys == 0)        /* There are no indexes to use. */
     DBUG_RETURN(NULL);