diff options
| author | monty@mashka.mysql.fi <> | 2002-11-21 15:56:48 +0200 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2002-11-21 15:56:48 +0200 |
| commit | dac6498f9b5b28d94473baf46c6e6f174943728d (patch) | |
| tree | d3df5d3fc1abf364dcbcc8eb2305a1cf62540192 /libmysql/errmsg.c | |
| parent | 305d16a7cb3955c20ab5d119b3eb0968008683b6 (diff) | |
| parent | e60050c4dd652c7a431aebeb95b7dd944be87bf8 (diff) | |
| download | mariadb-git-dac6498f9b5b28d94473baf46c6e6f174943728d.tar.gz | |
Merge with 4.0
Diffstat (limited to 'libmysql/errmsg.c')
| -rw-r--r-- | libmysql/errmsg.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/libmysql/errmsg.c b/libmysql/errmsg.c index 0945aed6772..84c360ee5dc 100644 --- a/libmysql/errmsg.c +++ b/libmysql/errmsg.c @@ -50,6 +50,7 @@ const char *client_errors[]= "Error on SHOW SLAVE HOSTS:", "Error connecting to slave:", "Error connecting to master:", + "SSL connection error", "Invalid connection handle", "Invalid use of null pointer", "Statement not prepared", @@ -68,8 +69,8 @@ const char *client_errors[]= "Can't open shared memory. Map of memory don't create for client (%lu)", "Can't open shared memory. %s event don't create for client (%lu)", "Can't open shared memory. Server abandoded and don't sent the answer event (%lu)", - "Can't open shared memory. Can't send the request event to server (%lu)" - "Wrong or unknow protocol" + "Can't open shared memory. Can't send the request event to server (%lu)", + "Wrong or unknown protocol" }; /* Start of code added by Roberto M. Serqueira - martinsc@uol.com.br - 05.24.2001 */ @@ -103,6 +104,7 @@ const char *client_errors[]= "Error on SHOW SLAVE HOSTS:", "Error connecting to slave:", "Error connecting to master:", + "SSL connection error", "Invalid connection handle", "Invalid use of null pointer", "Statement not prepared", @@ -121,8 +123,8 @@ const char *client_errors[]= "Can't open shared memory. Map of memory don't create for client (%lu)", "Can't open shared memory. %s event don't create for client (%lu)", "Can't open shared memory. Server abandoded and don't sent the answer event (%lu)", - "Can't open shared memory. Can't send the request event to server (%lu)" - "Wrong or unknow protocol" + "Can't open shared memory. Can't send the request event to server (%lu)", + "Wrong or unknown protocol" }; #else /* ENGLISH */ @@ -154,6 +156,7 @@ const char *client_errors[]= "Error on SHOW SLAVE HOSTS:", "Error connecting to slave:", "Error connecting to master:", + "SSL connection error", "Invalid connection handle", "Invalid use of null pointer", "Statement not prepared", @@ -172,8 +175,8 @@ const char *client_errors[]= "Can't open shared memory. Map of memory don't create for client (%lu)", "Can't open shared memory. %s event don't create for client (%lu)", "Can't open shared memory. Server abandoded and don't sent the answer event (%lu)", - "Can't open shared memory. Can't send the request event to server (%lu)" - "Wrong or unknow protocol" + "Can't open shared memory. Can't send the request event to server (%lu)", + "Wrong or unknown protocol" }; #endif |