summaryrefslogtreecommitdiff
path: root/sql/slave.h
diff options
context:
space:
mode:
authortsmith/tim@siva.hindu.god <>2006-09-29 17:01:16 -0600
committertsmith/tim@siva.hindu.god <>2006-09-29 17:01:16 -0600
commitca1f99bdb89b8de5b0cf98f873fc801823700a66 (patch)
treef204ee1a61703645f984b3feb6bcf588e16a6876 /sql/slave.h
parent802292ae373268979d668086ca1190742bc9cb9c (diff)
parentfa438d86cc6b3979a33a73ab5e5fd0c6a54915bc (diff)
downloadmariadb-git-ca1f99bdb89b8de5b0cf98f873fc801823700a66.tar.gz
Merge siva.hindu.god:/usr/home/tim/m/bk/g51
into siva.hindu.god:/usr/home/tim/m/bk/mrg/51
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 053358dc686..e70b2e4b326 100644
--- a/sql/slave.h
+++ b/sql/slave.h
@@ -272,7 +272,8 @@ 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_msg(enum loglevel level, RELAY_LOG_INFO* rli,
- int err_code, const char* msg, ...);
+ int err_code, const char* msg, ...)
+ ATTRIBUTE_FORMAT(printf, 4, 5);
void end_slave(); /* clean up */
void init_master_info_with_options(MASTER_INFO* mi);