Skip to content

M
mariadb
Commit 18ee3ae4 authored by unknown's avatar unknown
Browse files
Options

Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 

into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
parents f22e1c5b b694101f
Show whitespace changes
Inline Side-by-side
Showing with 62 additions and 62 deletions
include/errmsg.h
View file @ 18ee3ae4
...@@ -14,8 +14,8 @@ ...@@ -14,8 +14,8 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
/* Error messages for mysql clients */ /* Error messages for MySQL clients */
/* error messages for the demon is in share/language/errmsg.sys */ /* (Error messages for the daemon are in share/language/errmsg.sys) */
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
...@@ -83,10 +83,10 @@ extern const char *client_errors[]; /* Error messages */ ...@@ -83,10 +83,10 @@ extern const char *client_errors[]; /* Error messages */
#define CR_SHARED_MEMORY_FILE_MAP_ERROR 2042 #define CR_SHARED_MEMORY_FILE_MAP_ERROR 2042
#define CR_SHARED_MEMORY_MAP_ERROR 2043 #define CR_SHARED_MEMORY_MAP_ERROR 2043
#define CR_SHARED_MEMORY_EVENT_ERROR 2044 #define CR_SHARED_MEMORY_EVENT_ERROR 2044
#define CR_SHARED_MEMORY_CONNECT_ABANDODED_ERROR 2045 #define CR_SHARED_MEMORY_CONNECT_ABANDONED_ERROR 2045
#define CR_SHARED_MEMORY_CONNECT_SET_ERROR 2046 #define CR_SHARED_MEMORY_CONNECT_SET_ERROR 2046
#define CR_CONN_UNKNOW_PROTOCOL 2047 #define CR_CONN_UNKNOW_PROTOCOL 2047
#define CR_INVALID_CONN_HANDLE 2048 #define CR_INVALID_CONN_HANDLE 2048
#define CR_SECURE_AUTH 2049 #define CR_SECURE_AUTH 2049
#define CR_FETCH_CANCELLED 2050 #define CR_FETCH_CANCELED 2050
#define CR_NO_DATA 2051 #define CR_NO_DATA 2051
libmysql/errmsg.c
View file @ 18ee3ae4
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
/* Error messages for MySQL clients */ /* Error messages for MySQL clients */
/* error messages for the daemon is in share/language/errmsg.sys */ /* (Error messages for the daemon are in share/language/errmsg.sys) */
#include <my_global.h> #include <my_global.h>
#include <my_sys.h> #include <my_sys.h>
...@@ -31,20 +31,20 @@ const char *client_errors[]= ...@@ -31,20 +31,20 @@ const char *client_errors[]=
"Kann TCP/IP-Socket nicht anlegen (%d)", "Kann TCP/IP-Socket nicht anlegen (%d)",
"Unbekannter MySQL Server Host (%-.100s) (%d)", "Unbekannter MySQL Server Host (%-.100s) (%d)",
"MySQL Server nicht vorhanden", "MySQL Server nicht vorhanden",
"Protokolle ungleich. Server Version = % d Client Version = %d", "Protokolle ungleich; Server Version = %d, Client Version = %d",
"MySQL client got out of memory", "MySQL client ran out of memory",
"Wrong host info", "Wrong host info",
"Localhost via UNIX socket", "Localhost via UNIX socket",
"%-.100s via TCP/IP", "%-.100s via TCP/IP",
"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; Host: %-.100s",
"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)",
"Can't initialize character set %-.32s (path: %-.100s)", "Can't initialize character set %-.32s (path: %-.100s)",
"Got packet bigger than 'max_allowed_packet'", "Got packet bigger than 'max_allowed_packet' bytes",
"Embedded server", "Embedded server",
"Error on SHOW SLAVE STATUS:", "Error on SHOW SLAVE STATUS:",
"Error on SHOW SLAVE HOSTS:", "Error on SHOW SLAVE HOSTS:",
...@@ -55,26 +55,26 @@ const char *client_errors[]= ...@@ -55,26 +55,26 @@ const char *client_errors[]=
"This client library is licensed only for use with MySQL servers having '%s' license", "This client library is licensed only for use with MySQL servers having '%s' license",
"Invalid use of null pointer", "Invalid use of null pointer",
"Statement not prepared", "Statement not prepared",
"Parameters data was not supplied", "No data supplied for parameters in prepared statement",
"Data truncated", "Data truncated",
"No parameters exists in the statement", "No parameters exist in the statement",
"Invalid parameter number", "Invalid parameter number",
"Can't send long data for non string or 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 (%lu)",
"Can't open shared memory. Request event don't create (%lu)", "Can't open shared memory; client could not create request event (%lu)",
"Can't open shared memory. Answer event don't create (%lu)", "Can't open shared memory; no answer event received from server (%lu)",
"Can't open shared memory. File mapping don't create (%lu)", "Can't open shared memory; server could not allocate file mapping (%lu)",
"Can't open shared memory. Map of memory don't create (%lu)", "Can't open shared memory; server could not get pointer to file mapping (%lu)",
"Can't open shared memory. File mapping don't create for client (%lu)", "Can't open shared memory; client could not allocate file mapping (%lu)",
"Can't open shared memory. Map of memory don't create for client (%lu)", "Can't open shared memory; client could not get pointer to file mapping (%lu)",
"Can't open shared memory. %s event don't create for client (%lu)", "Can't open shared memory; client could not create %s event (%lu)",
"Can't open shared memory. Server abandoded and don't sent the answer event (%lu)", "Can't open shared memory; no answer from server (%lu)",
"Can't open shared memory. Can't send the request event to server (%lu)", "Can't open shared memory; cannot send request event to server (%lu)",
"Wrong or unknown protocol", "Wrong or unknown protocol",
"Invalid connection handle", "Invalid connection handle",
"Connection using old (pre 4.1.1) authentication protocol refused (client option 'secure_auth' enabled)", "Connection using old (pre-4.1.1) authentication protocol refused (client option 'secure_auth' enabled)",
"Row retrieval was cancelled by mysql_stmt_close() call", "Row retrieval was canceled by mysql_stmt_close() call",
"Attempt to read column without prior row fetch" "Attempt to read column without prior row fetch"
}; };
...@@ -90,20 +90,20 @@ const char *client_errors[]= ...@@ -90,20 +90,20 @@ const char *client_errors[]=
"No pode criar 'socket TCP/IP' (%d)", "No pode criar 'socket TCP/IP' (%d)",
"'Host' servidor MySQL '%-.100s' (%d) desconhecido", "'Host' servidor MySQL '%-.100s' (%d) desconhecido",
"Servidor MySQL desapareceu", "Servidor MySQL desapareceu",
"Incompatibilidade de protocolos. Verso do Servidor: %d - Verso do Cliente: %d", "Incompatibilidade de protocolos; verso do servidor = %d, verso do cliente = %d",
"Cliente do MySQL com falta de memria", "Cliente do MySQL com falta de memria",
"Informao invlida de 'host'", "Informao invlida de 'host'",
"Localhost via 'UNIX socket'", "Localhost via 'UNIX socket'",
"%-.100s via 'TCP/IP'", "%-.100s via 'TCP/IP'",
"Erro na negociao de acesso ao servidor", "Erro na negociao de acesso ao servidor",
"Conexo perdida com servidor MySQL durante 'query'", "Conexo perdida com servidor MySQL durante 'query'",
"Comandos fora de sincronismo. Voc no pode executar este comando agora", "Comandos fora de sincronismo; voc no pode executar este comando agora",
"%-.100s via 'named pipe'", "%-.100s via 'named pipe'",
"No pode esperar pelo 'named pipe' para o 'host' %-.64s - 'pipe' %-.32s (%lu)", "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 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)", "No pode estabelecer o estado do 'named pipe' para o 'host' %-.64s - 'pipe' %-.32s (%lu)",
"No pode inicializar conjunto de caracteres %-.32s (caminho %-.100s)", "No pode inicializar conjunto de caracteres %-.32s (caminho %-.100s)",
"Obteve pacote maior do que 'max_allowed_packet'", "Obteve pacote maior do que 'max_allowed_packet' bytes",
"Embedded server" "Embedded server"
"Error on SHOW SLAVE STATUS:", "Error on SHOW SLAVE STATUS:",
"Error on SHOW SLAVE HOSTS:", "Error on SHOW SLAVE HOSTS:",
...@@ -114,26 +114,26 @@ const char *client_errors[]= ...@@ -114,26 +114,26 @@ const char *client_errors[]=
"This client library is licensed only for use with MySQL servers having '%s' license", "This client library is licensed only for use with MySQL servers having '%s' license",
"Invalid use of null pointer", "Invalid use of null pointer",
"Statement not prepared", "Statement not prepared",
"Parameters data was not supplied", "No data supplied for parameters in prepared statement",
"Data truncated", "Data truncated",
"No parameters exists in the statement", "No parameters exist in the statement",
"Invalid parameter number", "Invalid parameter number",
"Can't send long data for non string or 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 (%lu)",
"Can't open shared memory. Request event don't create (%lu)", "Can't open shared memory; client could not create request event (%lu)",
"Can't open shared memory. Answer event don't create (%lu)", "Can't open shared memory; no answer event received from server (%lu)",
"Can't open shared memory. File mapping don't create (%lu)", "Can't open shared memory; server could not allocate file mapping (%lu)",
"Can't open shared memory. Map of memory don't create (%lu)", "Can't open shared memory; server could not get pointer to file mapping (%lu)",
"Can't open shared memory. File mapping don't create for client (%lu)", "Can't open shared memory; client could not allocate file mapping (%lu)",
"Can't open shared memory. Map of memory don't create for client (%lu)", "Can't open shared memory; client could not get pointer to file mapping (%lu)",
"Can't open shared memory. %s event don't create for client (%lu)", "Can't open shared memory; client could not create %s event (%lu)",
"Can't open shared memory. Server abandoded and don't sent the answer event (%lu)", "Can't open shared memory; no answer from server (%lu)",
"Can't open shared memory. Can't send the request event to server (%lu)", "Can't open shared memory; cannot send request event to server (%lu)",
"Wrong or unknown protocol", "Wrong or unknown protocol",
"Invalid connection handle", "Invalid connection handle",
"Connection using old (pre 4.1.1) authentication protocol refused (client option 'secure_auth' enabled)", "Connection using old (pre-4.1.1) authentication protocol refused (client option 'secure_auth' enabled)",
"Row retrieval was cancelled by mysql_stmt_close() call", "Row retrieval was canceled by mysql_stmt_close() call",
"Attempt to read column without prior row fetch" "Attempt to read column without prior row fetch"
}; };
...@@ -145,22 +145,22 @@ const char *client_errors[]= ...@@ -145,22 +145,22 @@ const char *client_errors[]=
"Can't connect to local MySQL server through socket '%-.100s' (%d)", "Can't connect to local MySQL server through socket '%-.100s' (%d)",
"Can't connect to MySQL server on '%-.100s' (%d)", "Can't connect to MySQL server on '%-.100s' (%d)",
"Can't create TCP/IP socket (%d)", "Can't create TCP/IP socket (%d)",
"Unknown MySQL Server Host '%-.100s' (%d)", "Unknown MySQL server host '%-.100s' (%d)",
"MySQL server has gone away", "MySQL server has gone away",
"Protocol mismatch. Server Version = %d Client Version = %d", "Protocol mismatch; server version = %d, client version = %d",
"MySQL client run out of memory", "MySQL client ran out of memory",
"Wrong host info", "Wrong host info",
"Localhost via UNIX socket", "Localhost via UNIX socket",
"%-.100s via TCP/IP", "%-.100s via TCP/IP",
"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", "%-.100s via named pipe",
"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)",
"Can't initialize character set %-.32s (path: %-.100s)", "Can't initialize character set %-.32s (path: %-.100s)",
"Got packet bigger than 'max_allowed_packet'", "Got packet bigger than 'max_allowed_packet' bytes",
"Embedded server", "Embedded server",
"Error on SHOW SLAVE STATUS:", "Error on SHOW SLAVE STATUS:",
"Error on SHOW SLAVE HOSTS:", "Error on SHOW SLAVE HOSTS:",
...@@ -171,26 +171,26 @@ const char *client_errors[]= ...@@ -171,26 +171,26 @@ const char *client_errors[]=
"This client library is licensed only for use with MySQL servers having '%s' license", "This client library is licensed only for use with MySQL servers having '%s' license",
"Invalid use of null pointer", "Invalid use of null pointer",
"Statement not prepared", "Statement not prepared",
"Not all parameters data supplied", "No data supplied for parameters in prepared statement",
"Data truncated", "Data truncated",
"No parameters exists in the statement", "No parameters exist in the statement",
"Invalid parameter number", "Invalid parameter number",
"Can't send long data for non string or 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 (%lu)",
"Can't open shared memory. Request event don't create (%lu)", "Can't open shared memory; client could not create request event (%lu)",
"Can't open shared memory. Answer event don't create (%lu)", "Can't open shared memory; no answer event received from server (%lu)",
"Can't open shared memory. File mapping don't create (%lu)", "Can't open shared memory; server could not allocate file mapping (%lu)",
"Can't open shared memory. Map of memory don't create (%lu)", "Can't open shared memory; server could not get pointer to file mapping (%lu)",
"Can't open shared memory. File mapping don't create for client (%lu)", "Can't open shared memory; client could not allocate file mapping (%lu)",
"Can't open shared memory. Map of memory don't create for client (%lu)", "Can't open shared memory; client could not get pointer to file mapping (%lu)",
"Can't open shared memory. %s event don't create for client (%lu)", "Can't open shared memory; client could not create %s event (%lu)",
"Can't open shared memory. Server abandoded and don't sent the answer event (%lu)", "Can't open shared memory; no answer from server (%lu)",
"Can't open shared memory. Can't send the request event to server (%lu)", "Can't open shared memory; cannot send request event to server (%lu)",
"Wrong or unknown protocol", "Wrong or unknown protocol",
"Invalid connection handle", "Invalid connection handle",
"Connection using old (pre 4.1.1) authentication protocol refused (client option 'secure_auth' enabled)", "Connection using old (pre-4.1.1) authentication protocol refused (client option 'secure_auth' enabled)",
"Row retrieval was cancelled by mysql_stmt_close() call", "Row retrieval was canceled by mysql_stmt_close() call",
"Attempt to read column without prior row fetch" "Attempt to read column without prior row fetch"
}; };
#endif #endif
......
libmysql/libmysql.c
View file @ 18ee3ae4
...@@ -2522,7 +2522,7 @@ static int stmt_read_row_unbuffered(MYSQL_STMT *stmt, unsigned char **row) ...@@ -2522,7 +2522,7 @@ static int stmt_read_row_unbuffered(MYSQL_STMT *stmt, unsigned char **row)
if (mysql->status != MYSQL_STATUS_GET_RESULT) if (mysql->status != MYSQL_STATUS_GET_RESULT)
{ {
set_stmt_error(stmt, stmt->unbuffered_fetch_cancelled ? set_stmt_error(stmt, stmt->unbuffered_fetch_cancelled ?
CR_FETCH_CANCELLED : CR_COMMANDS_OUT_OF_SYNC, CR_FETCH_CANCELED : CR_COMMANDS_OUT_OF_SYNC,
unknown_sqlstate); unknown_sqlstate);
goto error; goto error;
} }
......
sql-common/client.c
View file @ 18ee3ae4
...@@ -448,7 +448,7 @@ HANDLE create_shared_memory(MYSQL *mysql,NET *net, uint connect_timeout) ...@@ -448,7 +448,7 @@ HANDLE create_shared_memory(MYSQL *mysql,NET *net, uint connect_timeout)
if (WaitForSingleObject(event_connect_answer,connect_timeout*1000) != if (WaitForSingleObject(event_connect_answer,connect_timeout*1000) !=
WAIT_OBJECT_0) WAIT_OBJECT_0)
{ {
error_allow = CR_SHARED_MEMORY_CONNECT_ABANDODED_ERROR; error_allow = CR_SHARED_MEMORY_CONNECT_ABANDONED_ERROR;
goto err; goto err;
} }
...@@ -2528,7 +2528,7 @@ mysql_fetch_row(MYSQL_RES *res) ...@@ -2528,7 +2528,7 @@ mysql_fetch_row(MYSQL_RES *res)
{ {
set_mysql_error(mysql, set_mysql_error(mysql,
res->unbuffered_fetch_cancelled ? res->unbuffered_fetch_cancelled ?
CR_FETCH_CANCELLED : CR_COMMANDS_OUT_OF_SYNC, CR_FETCH_CANCELED : CR_COMMANDS_OUT_OF_SYNC,
unknown_sqlstate); unknown_sqlstate);
} }
else if (!(read_one_row(mysql, res->field_count, res->row, res->lengths))) else if (!(read_one_row(mysql, res->field_count, res->row, res->lengths)))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7