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 | af9700ebe9aacf342fc5f237f4e65d7a035f5224 (patch) | |
tree | 49d6dd88d75f1d6a0d8e481cb8ae015f6f2b91f6 /libmysql | |
parent | cb4895d2aa4a0577d6ad27eebbfefc166e76f70b (diff) | |
parent | 1ec639a4c827888eb9ea4dab883c9bbc4847b18e (diff) | |
download | mariadb-git-af9700ebe9aacf342fc5f237f4e65d7a035f5224.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 |