summaryrefslogtreecommitdiff
path: root/sql/slave.h
diff options
context:
space:
mode:
authorjimw@rama.(none) <>2006-09-28 20:17:17 -0700
committerjimw@rama.(none) <>2006-09-28 20:17:17 -0700
commit2961966b3badf38e4a0ae3ac46cb6bddfa2fe925 (patch)
tree21c74922c7fb46d9ca1136416175b9c0fbeadbda /sql/slave.h
parentf53e014f7518d58a147383e5efcd8c810b5be10c (diff)
parentd5d89bcf63be07fc74e90237d201da310722ea80 (diff)
downloadmariadb-git-2961966b3badf38e4a0ae3ac46cb6bddfa2fe925.tar.gz
Merge bk-internal:/home/bk/mysql-5.0-maint
into rama.(none):/home/jimw/my/mysql-5.0-clean
Diffstat (limited to 'sql/slave.h')
-rw-r--r--sql/slave.h3
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);