summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorsasha@mysql.sashanet.com <>2001-01-24 09:15:34 -0700
committersasha@mysql.sashanet.com <>2001-01-24 09:15:34 -0700
commite8ffda53975f826c4c048dceae86d2076dbd0781 (patch)
tree389b1cade6be60d713c322e9f923adb3578a60d6 /include
parent343c121e6ca1303c0d4ebca46e5367c02d7fbebe (diff)
downloadmariadb-git-e8ffda53975f826c4c048dceae86d2076dbd0781.tar.gz
Added last_errno and last_error to show slave status
slave will skip the first SQL_SLAVE_SKIP_COUNTER events on start - this is needed to recover from broken replication when the next log event(s) should just be skipped. Rotate binlogs when max_binlog_size is reached
Diffstat (limited to 'include')
-rw-r--r--include/my_sys.h2
-rw-r--r--include/mysqld_error.h7
2 files changed, 7 insertions, 2 deletions
diff --git a/include/my_sys.h b/include/my_sys.h
index 0f010fc71af..a3c2a631ddf 100644
--- a/include/my_sys.h
+++ b/include/my_sys.h
@@ -425,7 +425,7 @@ extern int my_printf_error _VARARGS((uint my_err, const char *format,
__attribute__ ((format (printf, 2, 4))));
extern int my_vsnprintf( char *str, size_t n,
const char *format, va_list ap );
-
+extern int my_snprintf(char* to, size_t n, const char* fmt, ...);
extern int my_message(uint my_err, const char *str,myf MyFlags);
extern int my_message_no_curses(uint my_err, const char *str,myf MyFlags);
extern int my_message_curses(uint my_err, const char *str,myf MyFlags);
diff --git a/include/mysqld_error.h b/include/mysqld_error.h
index 0391c3e6c4e..c84b0c08c77 100644
--- a/include/mysqld_error.h
+++ b/include/mysqld_error.h
@@ -198,4 +198,9 @@
#define ER_CRASHED_ON_REPAIR 1195
#define ER_WARNING_NOT_COMPLETE_ROLLBACK 1196
#define ER_TRANS_CACHE_FULL 1197
-#define ER_ERROR_MESSAGES 198
+#define ER_SLAVE_MUST_STOP 1198
+#define ER_SLAVE_NOT_RUNNING 1199
+#define ER_BAD_SLAVE 1200
+#define ER_MASTER_INFO 1201
+#define ER_SLAVE_THREAD 1202
+#define ER_ERROR_MESSAGES 203