diff options
author | unknown <monty@nosik.monty.fi> | 2006-11-27 01:51:50 +0200 |
---|---|---|
committer | unknown <monty@nosik.monty.fi> | 2006-11-27 01:51:50 +0200 |
commit | f700408717ea7d51132c150a9afaddcb73071b49 (patch) | |
tree | 49d6dd88d75f1d6a0d8e481cb8ae015f6f2b91f6 /libmysql | |
parent | 788ad30f081bc55ff97ceed78ec7ff545e25ed99 (diff) | |
parent | 52fc261bcab0becc9d23f8d1e511760413a6d85d (diff) | |
download | mariadb-git-f700408717ea7d51132c150a9afaddcb73071b49.tar.gz |
Merge mysql.com:/home/my/mysql-5.0
into mysql.com:/home/my/mysql-5.1
client/mysqldump.c:
Auto merged
include/errmsg.h:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
sql-common/client.c:
Auto merged
mysql-test/mysql-test-run-shell.sh:
SCCS merged
Diffstat (limited to 'libmysql')
-rw-r--r-- | libmysql/errmsg.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libmysql/errmsg.c b/libmysql/errmsg.c index 9e1d70a47df..59089d5ec18 100644 --- a/libmysql/errmsg.c +++ b/libmysql/errmsg.c @@ -82,6 +82,7 @@ const char *client_errors[]= "Prepared statement contains no metadata", "Attempt to read a row while there is no result set associated with the statement", "This feature is not implemented yet", + "Lost connection to MySQL server at '%s', system error: %d", "" }; @@ -145,6 +146,7 @@ const char *client_errors[]= "Prepared statement contains no metadata", "Attempt to read a row while there is no result set associated with the statement", "This feature is not implemented yet", + "Lost connection to MySQL server at '%s', system error: %d", "" }; @@ -206,6 +208,7 @@ const char *client_errors[]= "Prepared statement contains no metadata", "Attempt to read a row while there is no result set associated with the statement", "This feature is not implemented yet", + "Lost connection to MySQL server at '%s', system error: %d", "" }; #endif |