MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:eugene Date:February 14 2006 8:33am
Subject:bk commit into 5.0 tree (evgen:1.2045)
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of evgen. When evgen 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
  1.2045 06/02/14 11:33:46 evgen@stripped +1 -0
  Merge epotemkin@stripped:/home/bk/mysql-5.0
  into moonbone.local:/work/16752-bug-5.0-mysql

  sql/sql_select.cc
    1.394 06/02/14 11:33:44 evgen@stripped +0 -0
    Auto merged

# 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:	evgen
# Host:	moonbone.local
# Root:	/work/16752-bug-5.0-mysql/RESYNC

--- 1.393/sql/sql_select.cc	2006-02-03 10:56:02 +03:00
+++ 1.394/sql/sql_select.cc	2006-02-14 11:33:44 +03:00
@@ -12746,11 +12746,12 @@
     Field *field= group_item->get_tmp_table_field();
     if (field)
     {
-      if (field->type() == FIELD_TYPE_BLOB)
+      enum_field_types type;
+      if ((type= field->type()) == FIELD_TYPE_BLOB)
 	key_length+=MAX_BLOB_WIDTH;		// Can't be used as a key
-      else if (field->type() == MYSQL_TYPE_VARCHAR)
+      else if (type == MYSQL_TYPE_VARCHAR || type == MYSQL_TYPE_VAR_STRING)
         key_length+= field->field_length + HA_KEY_BLOB_LENGTH;
-      else if (field->type() == FIELD_TYPE_BIT)
+      else if (type == FIELD_TYPE_BIT)
       {
         /* Bit is usually stored as a longlong key for group fields */
         key_length+= 8;                         // Big enough
Thread
bk commit into 5.0 tree (evgen:1.2045)eugene14 Feb