diff options
| author | unknown <jimw@rama.(none)> | 2006-09-28 20:17:17 -0700 |
|---|---|---|
| committer | unknown <jimw@rama.(none)> | 2006-09-28 20:17:17 -0700 |
| commit | 39bdf4c41cbc7b42da453049870c7b1e1138e51a (patch) | |
| tree | 21c74922c7fb46d9ca1136416175b9c0fbeadbda /sql/slave.h | |
| parent | 5b571b5b5b641436d431aacd84a87fa6697e10ee (diff) | |
| parent | 00820e2b0aafe2d90b5ba8b56698ada25069af43 (diff) | |
| download | mariadb-git-39bdf4c41cbc7b42da453049870c7b1e1138e51a.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.0-maint
into rama.(none):/home/jimw/my/mysql-5.0-clean
include/my_global.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/slave.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_class.h:
Auto merged
Diffstat (limited to 'sql/slave.h')
| -rw-r--r-- | sql/slave.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/slave.h b/sql/slave.h index c355f7172a9..65adb4564cc 100644 --- a/sql/slave.h +++ b/sql/slave.h @@ -553,7 +553,8 @@ void init_table_rule_array(DYNAMIC_ARRAY* a, bool* a_inited); const char *print_slave_db_safe(const char *db); int check_expected_error(THD* thd, RELAY_LOG_INFO* rli, int error_code); void skip_load_data_infile(NET* net); -void slave_print_error(RELAY_LOG_INFO* rli, int err_code, const char* msg, ...); +void slave_print_error(RELAY_LOG_INFO *rli, int err_code, const char *msg, ...) + ATTRIBUTE_FORMAT(printf, 3, 4); void end_slave(); /* clean up */ void init_master_info_with_options(MASTER_INFO* mi); |