bk commit into 5.0 tree (monty:1.1865)

[monty]

Below is the list of changes that have just been committed into a local
5.0 repository of monty. When monty 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.1865 05/06/07 15:15:04 monty@stripped +9 -0
  Merge mysql.com:/my/mysql-4.1 into mysql.com:/my/mysql-5.0

  sql/sql_select.cc
    1.330 05/06/07 15:15:02 monty@stripped +0 -0
    Auto merged

  sql/item_buff.cc
    1.12 05/06/07 15:15:02 monty@stripped +0 -0
    Auto merged

  sql/item.h
    1.135 05/06/07 15:15:02 monty@stripped +0 -0
    Auto merged

  mysql-test/r/group_by.result
    1.50 05/06/07 15:15:02 monty@stripped +0 -0
    Auto merged

  mysql-test/r/ctype_utf8.result
    1.59 05/06/07 15:15:02 monty@stripped +0 -0
    Auto merged

  myisam/mi_rnext_same.c
    1.17 05/06/07 15:15:02 monty@stripped +0 -0
    Auto merged

  myisam/mi_key.c
    1.42 05/06/07 15:15:02 monty@stripped +0 -0
    Auto merged

  BitKeeper/etc/logging_ok
    1.322 05/06/07 15:14:07 monty@stripped +0 -0
    auto-union

  BitKeeper/etc/ignore
    1.201 05/06/07 15:14:07 monty@stripped +10 -10
    auto-union

# 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:	monty
# Host:	hasky.mysql.fi
# Root:	/my/mysql-5.0/RESYNC

--- 1.41/myisam/mi_key.c	2005-05-14 18:19:30 +03:00
+++ 1.42/myisam/mi_key.c	2005-06-07 15:15:02 +03:00
@@ -107,7 +107,7 @@
     }
     if (keyseg->flag & HA_SPACE_PACK)
     {
-      end=pos+length;
+      end= pos + length;
       if (type != HA_KEYTYPE_NUM)
       {
 	while (end > pos && end[-1] == ' ')

--- 1.16/myisam/mi_rnext_same.c	2005-02-18 14:14:26 +02:00
+++ 1.17/myisam/mi_rnext_same.c	2005-06-07 15:15:02 +03:00
@@ -68,8 +68,8 @@
 			       info->lastkey_length,SEARCH_BIGGER,
 			       info->s->state.key_root[inx])))
           break;
-        if (ha_key_cmp(keyinfo->seg,info->lastkey2,info->lastkey,
-		    info->last_rkey_length, SEARCH_FIND, &not_used))
+        if (ha_key_cmp(keyinfo->seg, info->lastkey, info->lastkey2,
+                       info->last_rkey_length, SEARCH_FIND, &not_used))
         {
           error=1;
           my_errno=HA_ERR_END_OF_FILE;

--- 1.134/sql/item.h	2005-06-05 17:08:42 +03:00
+++ 1.135/sql/item.h	2005-06-07 15:15:02 +03:00
@@ -1503,7 +1503,7 @@
   Item *item;
   String value,tmp_value;
 public:
-  Item_str_buff(Item *arg) :item(arg),value(arg->max_length) {}
+  Item_str_buff(THD *thd, Item *arg);
   bool cmp(void);
   ~Item_str_buff();				// Deallocate String:s
 };
@@ -1872,7 +1872,7 @@
                                     Field *found_field, Item *found_item,
                                     Item_ident *resolved_item);
 
-extern Item_buff *new_Item_buff(Item *item);
+extern Item_buff *new_Item_buff(THD *thd, Item *item);
 extern Item_result item_cmp_type(Item_result a,Item_result b);
 extern void resolve_const_item(THD *thd, Item **ref, Item *cmp_item);
 extern bool field_is_equal_to_item(Field *field,Item *item);

--- 1.11/sql/item_buff.cc	2005-02-15 16:44:56 +02:00
+++ 1.12/sql/item_buff.cc	2005-06-07 15:15:02 +03:00
@@ -23,14 +23,14 @@
 ** Create right type of item_buffer for an item
 */
 
-Item_buff *new_Item_buff(Item *item)
+Item_buff *new_Item_buff(THD *thd, Item *item)
 {
   if (item->type() == Item::FIELD_ITEM &&
       !(((Item_field *) item)->field->flags & BLOB_FLAG))
     return new Item_field_buff((Item_field *) item);
   switch (item->result_type()) {
   case STRING_RESULT:
-    return new Item_str_buff((Item_field *) item);
+    return new Item_str_buff(thd, (Item_field *) item);
   case INT_RESULT:
     return new Item_int_buff((Item_field *) item);
   case REAL_RESULT:
@@ -51,12 +51,17 @@
 ** Return true if values have changed
 */
 
+Item_str_buff::Item_str_buff(THD *thd, Item *arg)
+  :item(arg), value(min(arg->max_length, thd->variables.max_sort_length))
+{}
+
 bool Item_str_buff::cmp(void)
 {
   String *res;
   bool tmp;
 
   res=item->val_str(&tmp_value);
+  res->length(min(res->length(), value.alloced_length()));
   if (null_value != item->null_value)
   {
     if ((null_value= item->null_value))

--- 1.329/sql/sql_select.cc	2005-06-07 05:43:55 +03:00
+++ 1.330/sql/sql_select.cc	2005-06-07 15:15:02 +03:00
@@ -12281,7 +12281,7 @@
   {
     for (; group ; group=group->next)
     {
-      Item_buff *tmp=new_Item_buff(*group->item);
+      Item_buff *tmp=new_Item_buff(join->thd, *group->item);
       if (!tmp || join->group_fields.push_front(tmp))
 	return TRUE;
     }

--- 1.58/mysql-test/r/ctype_utf8.result	2005-06-03 07:38:32 +03:00
+++ 1.59/mysql-test/r/ctype_utf8.result	2005-06-07 15:15:02 +03:00
@@ -891,3 +891,17 @@
 create table t1 (a varchar(255)) default character set utf8;
 insert into t1 values (1.0);
 drop table t1;
+create table t1 (
+id int not null,
+city varchar(20) not null,
+key (city(7),id)
+) character set=utf8;
+insert into t1 values (1,'Durban North');
+insert into t1 values (2,'Durban');
+select * from t1 where city = 'Durban';
+id	city
+2	Durban
+select * from t1 where city = 'Durban ';
+id	city
+2	Durban
+drop table t1;

--- 1.321/BitKeeper/etc/logging_ok	2005-06-06 21:20:47 +03:00
+++ 1.322/BitKeeper/etc/logging_ok	2005-06-07 15:14:07 +03:00
@@ -52,6 +52,7 @@
 dlenev@stripped
 dlenev@stripped
 ejonore@stripped
+elliot@stripped
 evgen@moonbone.(none)
 evgen@stripped
 gbichot@stripped

--- 1.49/mysql-test/r/group_by.result	2005-05-05 23:01:34 +03:00
+++ 1.50/mysql-test/r/group_by.result	2005-06-07 15:15:02 +03:00
@@ -711,3 +711,14 @@
 min(b)
 3000000000
 drop table t1;
+CREATE TABLE t1 (id int PRIMARY KEY, user_id int, hostname longtext);
+INSERT INTO t1 VALUES
+(1, 7, 'cache-dtc-af05.proxy.aol.com'),
+(2, 3, 'what.ever.com'),
+(3, 7, 'cache-dtc-af05.proxy.aol.com'),
+(4, 7, 'cache-dtc-af05.proxy.aol.com');
+SELECT hostname, COUNT(DISTINCT user_id) as no FROM t1
+WHERE hostname LIKE '%aol%'
+    GROUP BY hostname;
+hostname	no
+cache-dtc-af05.proxy.aol.com	1

--- 1.200/BitKeeper/etc/ignore	2005-05-18 14:23:14 +03:00
+++ 1.201/BitKeeper/etc/ignore	2005-06-07 15:14:07 +03:00
@@ -102,6 +102,7 @@
 Makefile.in'
 PENDING/*
 TAGS
+VC++Files/client/mysql_amd64.dsp
 ac_available_languages_fragment
 acinclude.m4
 aclocal.m4
@@ -274,6 +275,8 @@
 client/mysqlmanagerc
 client/mysqlshow
 client/mysqltest
+client/mysqltestmanager-pwgen
+client/mysqltestmanagerc
 client/mysys_priv.h
 client/select_test
 client/ssl_test
@@ -284,10 +287,12 @@
 cmd-line-utils/libedit/makelist
 comon.h
 config.cache
+config.guess
 config.h
 config.h.in
 config.log
 config.status
+config.sub
 configure
 configure.lineno
 core
@@ -355,6 +360,7 @@
 innobase/stamp-h1
 insert_test
 install
+install-sh
 isam/isamchk
 isam/isamlog
 isam/pack_isam
@@ -519,7 +525,9 @@
 linked_server_sources
 linked_tools_sources
 locked
+ltmain.sh
 man/*.1
+missing
 mit-pthreads/config.flags
 mit-pthreads/include/bits
 mit-pthreads/include/pthread/machdep.h
@@ -936,6 +944,7 @@
 scripts/mysqld_safe
 scripts/mysqldumpslow
 scripts/mysqlhotcopy
+scripts/mysqlhotcopy.sh.rej
 scripts/safe_mysqld
 select_test
 server-tools/instance-manager/client.c
@@ -1100,18 +1109,10 @@
 tools/my_vsnprintf.c
 tools/mysqlmanager
 tools/mysqlmngd
+tools/mysqltestmanager
 tools/mysys_priv.h
 vi.h
 vio/test-ssl
 vio/test-sslclient
 vio/test-sslserver
 vio/viotest-ssl
-VC++Files/client/mysql_amd64.dsp
-client/mysqltestmanager-pwgen
-client/mysqltestmanagerc
-tools/mysqltestmanager
-config.guess
-config.sub
-install-sh
-ltmain.sh
-missing