merge with 4.1 tree

client/mysqltest.c:
  Auto merged
include/mysql.h:
  Auto merged
libmysql/errmsg.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
sql/field.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/share/portuguese/errmsg.txt:
  Auto merged
sql/share/spanish/errmsg.txt:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
tests/client_test.c:
  Auto merged

1 files changed, 18 insertions, 18 deletions

diff --git a/libmysql/errmsg.c b/libmysql/errmsg.c
index d27e981aaab..148625129b5 100644
--- a/libmysql/errmsg.c
+++ b/libmysql/errmsg.c
@@ -26,24 +26,24 @@ const char *client_errors[]=
 {
   "Unbekannter MySQL Fehler",
   "Kann UNIX-Socket nicht anlegen (%d)",
-  "Keine Verbindung zu lokalem MySQL Server, socket: '%-.64s' (%d)",
-  "Keine Verbindung zu MySQL Server auf %-.64s (%d)",
+  "Keine Verbindung zu lokalem MySQL Server, socket: '%-.100s' (%d)",
+  "Keine Verbindung zu MySQL Server auf %-.100s (%d)",
   "Kann TCP/IP-Socket nicht anlegen (%d)",
-  "Unbekannter MySQL Server Host (%-.64s) (%d)",
+  "Unbekannter MySQL Server Host (%-.100s) (%d)",
   "MySQL Server nicht vorhanden",
   "Protokolle ungleich. Server Version = % d Client Version = %d",
   "MySQL client got out of memory",
   "Wrong host info",
   "Localhost via UNIX socket",
-  "%-.64s via TCP/IP",
+  "%-.100s via TCP/IP",
   "Error in server handshake",
   "Lost connection to MySQL server during query",
   "Commands out of sync; You can't run this command now",
-  "Verbindung ueber Named Pipe; Host: %-.64s",
+  "Verbindung ueber Named Pipe; Host: %-.100s",
   "Kann nicht auf Named Pipe warten. Host: %-.64s  pipe: %-.32s (%lu)",
   "Kann Named Pipe nicht oeffnen. Host: %-.64s  pipe: %-.32s (%lu)",
   "Kann den Status der Named Pipe nicht setzen.  Host: %-.64s  pipe: %-.32s (%lu)",
-  "Can't initialize character set %-.64s (path: %-.64s)",
+  "Can't initialize character set %-.32s (path: %-.100s)",
   "Got packet bigger than 'max_allowed_packet'",
   "Embedded server",
   "Error on SHOW SLAVE STATUS:",
@@ -82,24 +82,24 @@ const char *client_errors[]=
 {
   "Erro desconhecido do MySQL",
   "Não pode criar 'UNIX socket' (%d)",
-  "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 se conectar ao servidor MySQL local através do 'socket' '%-.100s' (%d)", 
+  "Não pode se conectar ao servidor MySQL em '%-.100s' (%d)",
   "Não pode criar 'socket TCP/IP' (%d)",
-  "'Host' servidor MySQL '%-.64s' (%d) desconhecido",
+  "'Host' servidor MySQL '%-.100s' (%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",
   "Informação inválida de 'host'",
   "Localhost via 'UNIX socket'",
-  "%-.64s via 'TCP/IP'",
+  "%-.100s via 'TCP/IP'",
   "Erro na negociação de acesso ao servidor",
   "Conexão perdida com servidor MySQL durante 'query'",
   "Comandos fora de sincronismo. Você não pode executar este comando agora",
-  "%-.64s via 'named pipe'",
+  "%-.100s via 'named pipe'",
   "Não pode esperar pelo 'named pipe' para o 'host' %-.64s - 'pipe' %-.32s (%lu)",
   "Não pode abrir 'named pipe' para o 'host' %-.64s - 'pipe' %-.32s (%lu)",
   "Não pode estabelecer o estado do 'named pipe' para o 'host' %-.64s - 'pipe' %-.32s (%lu)",
-  "Não pode inicializar conjunto de caracteres %-.64s (caminho %-.64s)",
+  "Não pode inicializar conjunto de caracteres %-.32s (caminho %-.100s)",
   "Obteve pacote maior do que 'max_allowed_packet'",
   "Embedded server"
   "Error on SHOW SLAVE STATUS:",
@@ -136,24 +136,24 @@ const char *client_errors[]=
 {
   "Unknown MySQL error",
   "Can't create UNIX socket (%d)",
-  "Can't connect to local MySQL server through socket '%-.64s' (%d)",
-  "Can't connect to MySQL server on '%-.64s' (%d)",
+  "Can't connect to local MySQL server through socket '%-.100s' (%d)",
+  "Can't connect to MySQL server on '%-.100s' (%d)",
   "Can't create TCP/IP socket (%d)",
-  "Unknown MySQL Server Host '%-.64s' (%d)",
+  "Unknown MySQL Server Host '%-.100s' (%d)",
   "MySQL server has gone away",
   "Protocol mismatch. Server Version = %d Client Version = %d",
   "MySQL client run out of memory",
   "Wrong host info",
   "Localhost via UNIX socket",
-  "%-.64s via TCP/IP",
+  "%-.100s via TCP/IP",
   "Error in server handshake",
   "Lost connection to MySQL server during query",
   "Commands out of sync;  You can't run this command now",
-  "%-.64s via named pipe",
+  "%-.100s via named pipe",
   "Can't wait for named pipe to host: %-.64s  pipe: %-.32s (%lu)",
   "Can't open named pipe to host: %-.64s  pipe: %-.32s (%lu)",
   "Can't set state of named pipe to host: %-.64s  pipe: %-.32s (%lu)",
-  "Can't initialize character set %-.64s (path: %-.64s)",
+  "Can't initialize character set %-.32s (path: %-.100s)",
   "Got packet bigger than 'max_allowed_packet'",
   "Embedded server",
   "Error on SHOW SLAVE STATUS:",