diff options
| author | unknown <monty@donna.mysql.com> | 2001-01-25 22:38:53 +0200 |
|---|---|---|
| committer | unknown <monty@donna.mysql.com> | 2001-01-25 22:38:53 +0200 |
| commit | 002b51000fcec9ff8c45afe12ddd3728f6035ff0 (patch) | |
| tree | e4dc09a7c816c372ba7388b1bece80f8b7d0e815 /include | |
| parent | c6a67ce9dc3b3ec5b9055d158c7c41d35db4fb50 (diff) | |
| parent | b302ee39bc8e5f26f3fe95b47a3f42ad11cc5f40 (diff) | |
| download | mariadb-git-002b51000fcec9ff8c45afe12ddd3728f6035ff0.tar.gz | |
Merge work:/my/mysql into donna.mysql.com:/home/my/bk/mysql
Docs/manual.texi:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_sys.h | 2 | ||||
| -rw-r--r-- | include/mysqld_error.h | 7 |
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 |