summaryrefslogtreecommitdiff
path: root/sql/share/english/errmsg.txt
diff options
context:
space:
mode:
Diffstat (limited to 'sql/share/english/errmsg.txt')
-rw-r--r--sql/share/english/errmsg.txt7
1 files changed, 6 insertions, 1 deletions
diff --git a/sql/share/english/errmsg.txt b/sql/share/english/errmsg.txt
index 4900e4bd7ad..e11a182c6b7 100644
--- a/sql/share/english/errmsg.txt
+++ b/sql/share/english/errmsg.txt
@@ -187,7 +187,7 @@
"Got error %d during CHECKPOINT",
"Aborted connection %ld to db: '%-.64s' user: '%-.32s' host: `%-.64s' (%-.64s)",
"The handler for the table does not support binary table dump",
-"Binlog closed while trying to FLUSH MASTER",
+"Binlog closed, cannot RESET MASTER",
"Failed rebuilding the index of dumped table '%-.64s'",
"Error from master: '%-.64s'",
"Net error reading from master",
@@ -199,3 +199,8 @@
"Table '%-.64s' is marked as crashed and last (automatic?) repair failed",
"Warning: Some non-transactional changed tables couldn't be rolled back",
"Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage. Increase this mysqld variable and try again',
+"This operation cannot be performed with a running slave, run SLAVE STOP first",
+"This operation requires a running slave, configure slave and do SLAVE START",
+"The server is not configured as slave, fix in config file or with CHANGE MASTER TO",
+"Could not initialize master info structure, check permisions on master.info",
+"Could not create slave thread, check system resources",