diff options
| author | unknown <wax@mysql.com> | 2004-08-19 19:41:30 +0600 |
|---|---|---|
| committer | unknown <wax@mysql.com> | 2004-08-19 19:41:30 +0600 |
| commit | c325b0478d5611f395dd0d528bd33fed4485fb78 (patch) | |
| tree | 32b574fcb5aafa1a18184edf5e7a563ba81b3a1e /libmysql/errmsg.c | |
| parent | e3c56fd4d7f85b16adb7c929061fefee6895ba55 (diff) | |
| parent | 3381fae281ba7caaa9aaf04effe0ca2ab985ef4f (diff) | |
| download | mariadb-git-c325b0478d5611f395dd0d528bd33fed4485fb78.tar.gz | |
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
Diffstat (limited to 'libmysql/errmsg.c')
| -rw-r--r-- | libmysql/errmsg.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libmysql/errmsg.c b/libmysql/errmsg.c index 82040100ded..710bf4ccd8d 100644 --- a/libmysql/errmsg.c +++ b/libmysql/errmsg.c @@ -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 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", - "%-.100s via 'named pipe'", + "Named pipe: %-.32s", "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)", @@ -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)", |