diff options
| -rw-r--r-- | include/errmsg.h | 8 | ||||
| -rw-r--r-- | libmysql/errmsg.c | 4 | ||||
| -rw-r--r-- | libmysql/libmysql.c | 2 | ||||
| -rw-r--r-- | sql-common/client.c | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/include/errmsg.h b/include/errmsg.h index 140ff531248..6115b24a3d8 100644 --- a/include/errmsg.h +++ b/include/errmsg.h @@ -14,8 +14,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* Error messages for mysql clients */ -/* error messages for the demon is in share/language/errmsg.sys */ +/* Error messages for MySQL clients */ +/* (Error messages for the daemon are in share/language/errmsg.sys) */ #ifdef __cplusplus extern "C" { @@ -83,10 +83,10 @@ extern const char *client_errors[]; /* Error messages */ #define CR_SHARED_MEMORY_FILE_MAP_ERROR 2042 #define CR_SHARED_MEMORY_MAP_ERROR 2043 #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_CONN_UNKNOW_PROTOCOL 2047 #define CR_INVALID_CONN_HANDLE 2048 #define CR_SECURE_AUTH 2049 -#define CR_FETCH_CANCELLED 2050 +#define CR_FETCH_CANCELED 2050 #define CR_NO_DATA 2051 diff --git a/libmysql/errmsg.c b/libmysql/errmsg.c index 3e1872f7e93..2b941470fc3 100644 --- a/libmysql/errmsg.c +++ b/libmysql/errmsg.c @@ -29,9 +29,9 @@ const char *client_errors[]= "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 (%-.100s) (%d)", + "Unbekannter MySQL Server Host (%-.100s) (%d)", "MySQL Server nicht vorhanden", - "Protokolle ungleich; Server version = %d, client version = %d", + "Protokolle ungleich; Server Version = %d, Client Version = %d", "MySQL client ran out of memory", "Wrong host info", "Localhost via UNIX socket", diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index fd0c5024f8c..fc7728c98e0 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -2522,7 +2522,7 @@ static int stmt_read_row_unbuffered(MYSQL_STMT *stmt, unsigned char **row) if (mysql->status != MYSQL_STATUS_GET_RESULT) { 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); goto error; } diff --git a/sql-common/client.c b/sql-common/client.c index e6c36965f97..738904657cc 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -448,7 +448,7 @@ HANDLE create_shared_memory(MYSQL *mysql,NET *net, uint connect_timeout) if (WaitForSingleObject(event_connect_answer,connect_timeout*1000) != WAIT_OBJECT_0) { - error_allow = CR_SHARED_MEMORY_CONNECT_ABANDODED_ERROR; + error_allow = CR_SHARED_MEMORY_CONNECT_ABANDONED_ERROR; goto err; } @@ -2528,7 +2528,7 @@ mysql_fetch_row(MYSQL_RES *res) { set_mysql_error(mysql, res->unbuffered_fetch_cancelled ? - CR_FETCH_CANCELLED : CR_COMMANDS_OUT_OF_SYNC, + CR_FETCH_CANCELED : CR_COMMANDS_OUT_OF_SYNC, unknown_sqlstate); } else if (!(read_one_row(mysql, res->field_count, res->row, res->lengths))) |