Merge work:/home/bk/mysql-4.0

into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0


BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
sql/slave.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged

.bzrignore

@@ -119,6 +119,7 @@ bdb/include/gen_server_ext.h
 bdb/include/hash_auto.h
 bdb/include/log_auto.h
 bdb/include/qam_auto.h
+bdb/include/rpc_server_ext.h
 bdb/include/txn_auto.h
 bdb/java/src/com/sleepycat/db/DbConstants.java
 bdb/log/log_auto.c
@@ -183,6 +184,7 @@ libmysql_r/acconfig.h
 libmysql_r/conf_to_src
 libmysql_r/my_static.h
 libmysql_r/mysys_priv.h
+libmysqld/backup_dir
 libmysqld/convert.cc
 libmysqld/derror.cc
 libmysqld/errmsg.c
@@ -222,12 +224,14 @@ libmysqld/opt_sum.cc
 libmysqld/password.c
 libmysqld/procedure.cc
 libmysqld/records.cc
+libmysqld/simple-test
 libmysqld/slave.cc
 libmysqld/sql_acl.cc
 libmysqld/sql_analyse.cc
 libmysqld/sql_base.cc
 libmysqld/sql_cache.cc
 libmysqld/sql_class.cc
+libmysqld/sql_command
 libmysqld/sql_crypt.cc
 libmysqld/sql_db.cc
 libmysqld/sql_delete.cc
@@ -355,6 +359,3 @@ support-files/mysql.server
 support-files/mysql.spec
 tags
 tmp/*
-libmysqld/sql_command
-libmysqld/backup_dir
-libmysqld/simple-test

sql/item_sum.cc

@@ -811,7 +811,7 @@ int composite_key_cmp(void* arg, byte* key1, byte* key2)
     {
       int res;
       Field* f = *field;
-      int len = f->field_length;
+      int len = f->pack_length();
       switch((*field)->type())
 	{
 	case FIELD_TYPE_STRING:
@@ -921,7 +921,7 @@ bool Item_sum_count_distinct::setup(THD *thd)
 	      compare_key = (qsort_cmp2)simple_raw_key_cmp;
 	      break;
 	    }
-	  cmp_arg = (void*)(key_len = field->field_length);
+	  cmp_arg = (void*)(key_len = field->pack_length());
 	  rec_offset = 1;
 	}
       else // too bad, cannot cheat - there is more than one field
@@ -931,7 +931,7 @@ bool Item_sum_count_distinct::setup(THD *thd)
 	  field_end = (field = table->field) + table->fields;
 	  for(key_len = 0; field < field_end; ++field)
 	    {
-	      key_len += (*field)->field_length;
+	      key_len += (*field)->pack_length();
 	      if(!(*field)->binary())
 		all_binary = 0;
 	    }