summaryrefslogtreecommitdiff
path: root/libmysql/errmsg.c
diff options
context:
space:
mode:
authorsasha@mysql.sashanet.com <>2001-06-08 19:24:41 -0600
committersasha@mysql.sashanet.com <>2001-06-08 19:24:41 -0600
commit24f89c754ae9d7b8c40c7ae89857ce5d928fad9e (patch)
treef46251fc12dc5ff80de5c799174f04ad0fc2487d /libmysql/errmsg.c
parent3aafd368a4ecf7264fa30fa5d9a3915da4aaa18b (diff)
downloadmariadb-git-24f89c754ae9d7b8c40c7ae89857ce5d928fad9e.tar.gz
auto-magic replication redirection logic support in the client,
compiles, passes test suite, does magic, has bugs, but none that I know at this point. Have not tested everything yet, though. Changed a lot of code in the client, but normal stuff appears to be working.
Diffstat (limited to 'libmysql/errmsg.c')
-rw-r--r--libmysql/errmsg.c16
1 files changed, 14 insertions, 2 deletions
diff --git a/libmysql/errmsg.c b/libmysql/errmsg.c
index 71fc25fd77c..f0a1692453a 100644
--- a/libmysql/errmsg.c
+++ b/libmysql/errmsg.c
@@ -16,7 +16,7 @@
MA 02111-1307, USA */
/* Error messages for MySQL clients */
-/* error messages for the demon is in share/language/errmsg.sys */
+/* error messages for the daemon is in share/language/errmsg.sys */
#include <global.h>
#include <my_sys.h>
@@ -47,6 +47,10 @@ const char *client_errors[]=
"Can't initialize character set %-.64s (path: %-.64s)",
"Got packet bigger than 'max_allowed_packet'",
"Embedded server",
+ "Error on SHOW SLAVE STATUS: %-.64s",
+ "Error on SHOW SLAVE HOSTS: %-.64s",
+ "Error connecting to slave: %-.64s",
+ "Error connecting to master: %-.64s"
};
/* Start of code added by Roberto M. Serqueira - martinsc@uol.com.br - 05.24.2001 */
@@ -76,6 +80,10 @@ const char *client_errors[]=
"Não pode inicializar conjunto de caracteres %-.64s (caminho %-.64s)",
"Obteve pacote maior do que 'max_allowed_packet'",
"Embedded server"
+ "Error on SHOW SLAVE STATUS: %-.64s",
+ "Error on SHOW SLAVE HOSTS: %-.64s",
+ "Error connecting to slave: %-.64s",
+ "Error connecting to master: %-.64s"
};
#else /* ENGLISH */
@@ -102,7 +110,11 @@ const char *client_errors[]=
"Can't set state of named pipe to host: %-.64s pipe: %-.32s (%lu)",
"Can't initialize character set %-.64s (path: %-.64s)",
"Got packet bigger than 'max_allowed_packet'",
- "Embedded server"
+ "Embedded server",
+ "Error on SHOW SLAVE STATUS:",
+ "Error on SHOW SLAVE HOSTS:",
+ "Error connecting to slave:",
+ "Error connecting to master:"
};
#endif