1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
into mysql.com:/home/wax/mysql/mysql-4.1group_concat
This commit is contained in:
wax@mysql.com 2004-09-09 13:02:15 +06:00
commit da53ad65b0
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libmysql/errmsg.c
View File

@ -42,7 +42,7 @@ const char *client_errors[]=
"Error in server handshake", "Error in server handshake",
"Lost connection to MySQL server during query", "Lost connection to MySQL server during query",
"Commands out of sync; you can't run this command now", "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 nicht auf Named Pipe warten. Host: %-.64s pipe: %-.32s (%lu)",
"Kann Named Pipe nicht oeffnen. 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)", "Kann den Status der Named Pipe nicht setzen. Host: %-.64s pipe: %-.32s (%lu)",
@ -64,7 +64,7 @@ const char *client_errors[]=
"Invalid parameter number", "Invalid parameter number",
"Can't send long data for non-string/non-binary data types (parameter: %d)", "Can't send long data for non-string/non-binary data types (parameter: %d)",
"Using unsupported buffer type: %d (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; client could not create request event (%lu)",
"Can't open shared memory; no answer event received from server (%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)", "Can't open shared memory; server could not allocate file mapping (%lu)",
@ -101,7 +101,7 @@ const char *client_errors[]=
"Erro na negociação de acesso ao servidor", "Erro na negociação de acesso ao servidor",
"Conexão perdida com servidor MySQL durante 'query'", "Conexão perdida com servidor MySQL durante 'query'",
"Comandos fora de sincronismo; você não pode executar este comando agora", "Comandos fora de sincronismo; você não pode executar este comando agora",
"%-.100s via 'named pipe'", "Named pipe: %-.32s",
"Não pode esperar pelo 'named pipe' para o 'host' %-.64s - 'pipe' %-.32s (%lu)", "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 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 estabelecer o estado do 'named pipe' para o 'host' %-.64s - 'pipe' %-.32s (%lu)",
@ -123,7 +123,7 @@ const char *client_errors[]=
"Invalid parameter number", "Invalid parameter number",
"Can't send long data for non-string/non-binary data types (parameter: %d)", "Can't send long data for non-string/non-binary data types (parameter: %d)",
"Using unsupported buffer type: %d (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; client could not create request event (%lu)",
"Can't open shared memory; no answer event received from server (%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)", "Can't open shared memory; server could not allocate file mapping (%lu)",
@ -158,7 +158,7 @@ const char *client_errors[]=
"Error in server handshake", "Error in server handshake",
"Lost connection to MySQL server during query", "Lost connection to MySQL server during query",
"Commands out of sync; you can't run this command now", "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 wait for named pipe to host: %-.64s pipe: %-.32s (%lu)",
"Can't open 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 set state of named pipe to host: %-.64s pipe: %-.32s (%lu)",
@ -180,7 +180,7 @@ const char *client_errors[]=
"Invalid parameter number", "Invalid parameter number",
"Can't send long data for non-string/non-binary data types (parameter: %d)", "Can't send long data for non-string/non-binary data types (parameter: %d)",
"Using unsupported buffer type: %d (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; client could not create request event (%lu)",
"Can't open shared memory; no answer event received from server (%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)", "Can't open shared memory; server could not allocate file mapping (%lu)",

5
sql-common/client.c
View File

@ -1615,7 +1615,7 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,const char *host, const char *user,
sock=0; sock=0;
unix_socket = 0; unix_socket = 0;
host=mysql->options.shared_memory_base_name; 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 */ #endif /* HAVE_SMEM */
@ -1679,8 +1679,7 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,const char *host, const char *user,
else else
{ {
net->vio=vio_new_win32pipe(hPipe); net->vio=vio_new_win32pipe(hPipe);
sprintf(host_info=buff, ER(CR_NAMEDPIPE_CONNECTION), host, sprintf(host_info=buff, ER(CR_NAMEDPIPE_CONNECTION), unix_socket);
unix_socket);
} }
} }
#endif #endif