Commit c325b047 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/wax/mysql/mysql-4.1 

into mysql.com:/home/wax/mysql/mysql-4.1group_concat


libmysql/errmsg.c:
  Auto merged
sql-common/client.c:
  Auto merged
parents e3c56fd4 3381fae2

libmysql/errmsg.c

+6 −6
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ const char *client_errors[]= 
  "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: %-.100s",

  "Verbindung ueber Named Pipe: %-.32s",

  "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)",
@@ -64,7 +64,7 @@ const char *client_errors[]= 
  "Invalid parameter number",

  "Can't send long data for non-string/non-binary data types (parameter: %d)",

  "Using unsupported buffer type: %d  (parameter: %d)",

  "Shared memory (%lu)",

  "Shared memory: %-.100s",

  "Can't open shared memory; client could not create request event (%lu)",

  "Can't open shared memory; no answer event received from server (%lu)",

  "Can't open shared memory; server could not allocate file mapping (%lu)",
@@ -101,7 +101,7 @@ const char *client_errors[]= 
  "Erro na negociao de acesso ao servidor",

  "Conexo perdida com servidor MySQL durante 'query'",

  "Comandos fora de sincronismo; voc no pode executar este comando agora",

  "%-.100s via 'named pipe'",

  "Named pipe: %-.32s",

  "No pode esperar pelo 'named pipe' para o 'host' %-.64s - 'pipe' %-.32s (%lu)",

  "No pode abrir 'named pipe' para o 'host' %-.64s - 'pipe' %-.32s (%lu)",

  "No pode estabelecer o estado do 'named pipe' para o 'host' %-.64s - 'pipe' %-.32s (%lu)",
@@ -123,7 +123,7 @@ const char *client_errors[]= 
  "Invalid parameter number",

  "Can't send long data for non-string/non-binary data types (parameter: %d)",

  "Using unsupported buffer type: %d  (parameter: %d)",

  "Shared memory (%lu)",

  "Shared memory: %-.100s",

  "Can't open shared memory; client could not create request event (%lu)",

  "Can't open shared memory; no answer event received from server (%lu)",

  "Can't open shared memory; server could not allocate file mapping (%lu)",
@@ -158,7 +158,7 @@ const char *client_errors[]= 
  "Error in server handshake",

  "Lost connection to MySQL server during query",

  "Commands out of sync; you can't run this command now",

  "%-.100s via named pipe",

  "Named pipe: %-.32s",

  "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)",
@@ -180,7 +180,7 @@ const char *client_errors[]= 
  "Invalid parameter number",

  "Can't send long data for non-string/non-binary data types (parameter: %d)",

  "Using unsupported buffer type: %d  (parameter: %d)",

  "Shared memory (%lu)",

  "Shared memory: %-.100s",

  "Can't open shared memory; client could not create request event (%lu)",

  "Can't open shared memory; no answer event received from server (%lu)",

  "Can't open shared memory; server could not allocate file mapping (%lu)",

sql-common/client.c

+2 −3
Original line number Diff line number Diff line
@@ -1613,7 +1613,7 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,const char *host, const char *user, 
      sock=0;

      unix_socket = 0;

      host=mysql->options.shared_memory_base_name;

      host_info=(char*) ER(CR_SHARED_MEMORY_CONNECTION);

      sprintf(host_info=buff, ER(CR_SHARED_MEMORY_CONNECTION), host);

    }

  }

#endif /* HAVE_SMEM */
@@ -1677,8 +1677,7 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,const char *host, const char *user, 
    else

    {

      net->vio=vio_new_win32pipe(hPipe);

      sprintf(host_info=buff, ER(CR_NAMEDPIPE_CONNECTION), host,

	      unix_socket);

      sprintf(host_info=buff, ER(CR_NAMEDPIPE_CONNECTION), unix_socket);

    }

  }

#endif