Merge with 4.0.6

BitKeeper/etc/ignore:
  auto-union
acinclude.m4:
  Auto merged
configure.in:
  Auto merged
heap/hp_delete.c:
  Auto merged
heap/hp_scan.c:
  Auto merged
include/my_base.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/mi_rnext_same.c:
  Auto merged
myisam/sort.c:
  Auto merged
mysql-test/r/alter_table.result:
  Auto merged
mysql-test/r/distinct.result:
  Auto merged
mysql-test/r/func_math.result:
  Auto merged
mysql-test/r/group_by.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/t/group_by.test:
  Auto merged
mysql-test/t/select.test:
  Auto merged
mysys/hash.c:
  Auto merged
sql/field.h:
  Auto merged
sql/field_conv.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_sum.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_analyse.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_udf.cc:
  Auto merged
sql/structs.h:
  Auto merged
sql/uniques.cc:
  Auto merged
strings/strto.c:
  Auto merged
vio/vio.c:
  Auto merged
BitKeeper/triggers/post-commit:
  Add changeset to commit messages
sql-bench/crash-me.sh:
  Use version from 4.0
sql-bench/server-cfg.sh:
  Use version from 4.0

1 files changed, 10 insertions, 7 deletions

diff --git a/libmysql/errmsg.c b/libmysql/errmsg.c
index bfd253728ce..2eecb5c2afd 100644
--- a/libmysql/errmsg.c
+++ b/libmysql/errmsg.c
@@ -51,7 +51,7 @@ const char *client_errors[]=
   "Error connecting to slave:",
   "Error connecting to master:",
   "SSL connection error",
-  "Invalid connection handle",
+  "Malformed packet",
   "Invalid use of null pointer",
   "Statement not prepared",
   "Not all parameters data supplied",
@@ -70,7 +70,8 @@ const char *client_errors[]=
   "Can't open shared memory. %s event don't create for client (%lu)",
   "Can't open shared memory. Server abandoded and don't sent the answer event (%lu)",
   "Can't open shared memory. Can't send the request event to server (%lu)",
-  "Wrong or unknown protocol"
+  "Wrong or unknown protocol",
+  "Invalid connection handle"
 };
 
 /* Start of code added by Roberto M. Serqueira - martinsc@uol.com.br - 05.24.2001 */
@@ -83,7 +84,7 @@ const char *client_errors[]=
   "Não pode se conectar ao servidor MySQL local através do 'socket' '%-.64s' (%d)", 
   "Não pode se conectar ao servidor MySQL em '%-.64s' (%d)",
   "Não pode criar 'socket TCP/IP' (%d)",
-  "'Host' servidor MySQL '%-.64s' (%d) desconhecido", 
+  "'Host' servidor MySQL '%-.64s' (%d) desconhecido",
   "Servidor MySQL desapareceu",
   "Incompatibilidade de protocolos. Versão do Servidor: %d - Versão do Cliente: %d",
   "Cliente do MySQL com falta de memória",
@@ -105,7 +106,7 @@ const char *client_errors[]=
   "Error connecting to slave:",
   "Error connecting to master:",
   "SSL connection error",
-  "Invalid connection handle",
+  "Malformed packet",
   "Invalid use of null pointer",
   "Statement not prepared",
   "Not all parameters data supplied",
@@ -124,7 +125,8 @@ const char *client_errors[]=
   "Can't open shared memory. %s event don't create for client (%lu)",
   "Can't open shared memory. Server abandoded and don't sent the answer event (%lu)",
   "Can't open shared memory. Can't send the request event to server (%lu)",
-  "Wrong or unknown protocol"
+  "Wrong or unknown protocol",
+  "Invalid connection handle"
 };
 
 #else /* ENGLISH */
@@ -157,7 +159,7 @@ const char *client_errors[]=
   "Error connecting to slave:",
   "Error connecting to master:",
   "SSL connection error",
-  "Invalid connection handle",
+  "Malformed packet",
   "Invalid use of null pointer",
   "Statement not prepared",
   "Not all parameters data supplied",
@@ -176,7 +178,8 @@ const char *client_errors[]=
   "Can't open shared memory. %s event don't create for client (%lu)",
   "Can't open shared memory. Server abandoded and don't sent the answer event (%lu)",
   "Can't open shared memory. Can't send the request event to server (%lu)",
-  "Wrong or unknown protocol"
+  "Wrong or unknown protocol",
+  "Invalid connection handle"
 };
 #endif