diff options
| author | jimw@rama.(none) <> | 2006-08-17 12:25:40 -0700 |
|---|---|---|
| committer | jimw@rama.(none) <> | 2006-08-17 12:25:40 -0700 |
| commit | cb6a084076d4688c11936bfa91b03a83570f69e0 (patch) | |
| tree | 049d464ebbe02c19d780b0f231fb2b7b2789b6af /sql/slave.h | |
| parent | 34c83fba8d108526d481f2844b8d97fce57b5966 (diff) | |
| download | mariadb-git-cb6a084076d4688c11936bfa91b03a83570f69e0.tar.gz | |
Bug #2717: include/my_global.h mis-defines __attribute__
Fix when __attribute__() is stubbed out, add ATTRIBUTE_FORMAT() for specifying
__attribute__((format(...))) safely, make more use of the format attribute,
and fix some of the warnings that this turns up (plus a bonus unrelated one).
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 f780b7c8473..dccfcf01a8f 100644 --- a/sql/slave.h +++ b/sql/slave.h @@ -551,7 +551,8 @@ const char *rewrite_db(const char* db, uint32 *new_db_len); 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); |