summaryrefslogtreecommitdiff
path: root/libmysql
diff options
context:
space:
mode:
authorunknown <paul@kite-hub.kitebird.com>2004-06-30 22:18:41 -0500
committerunknown <paul@kite-hub.kitebird.com>2004-06-30 22:18:41 -0500
commitb694101fce99c317291f9992a9223f7bd16b20f6 (patch)
treeb5e87210992ca89ba17360f197c9ebed0d106588 /libmysql
parent0426c065c15494ea355dd6f65485937c69b74cdb (diff)
downloadmariadb-git-b694101fce99c317291f9992a9223f7bd16b20f6.tar.gz
client.c, libmysql.c:
Symbol spelling change. errmsg.c: Client error message edits. errmsg.h: Two symbol spelling changes. include/errmsg.h: Two symbol spelling changes. libmysql/errmsg.c: Client error message edits. libmysql/libmysql.c: Symbol spelling change. sql-common/client.c: Symbol spelling change.
Diffstat (limited to 'libmysql')
-rw-r--r--libmysql/errmsg.c4
-rw-r--r--libmysql/libmysql.c2
2 files changed, 3 insertions, 3 deletions
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;
}