diff options
| author | unknown <tsmith/tim@siva.hindu.god> | 2006-09-29 17:01:16 -0600 |
|---|---|---|
| committer | unknown <tsmith/tim@siva.hindu.god> | 2006-09-29 17:01:16 -0600 |
| commit | d678c6139a00f6e55eb747e57bef0ee30aa12c18 (patch) | |
| tree | f204ee1a61703645f984b3feb6bcf588e16a6876 /sql/slave.h | |
| parent | 16a066141bcaecf948f4ab12a0bd9113a86a8eed (diff) | |
| parent | efd91571fbf97809b32db5f715deddeae8c1c501 (diff) | |
| download | mariadb-git-d678c6139a00f6e55eb747e57bef0ee30aa12c18.tar.gz | |
Merge siva.hindu.god:/usr/home/tim/m/bk/g51
into siva.hindu.god:/usr/home/tim/m/bk/mrg/51
include/mysql_com.h:
Auto merged
mysql-test/r/func_time.result:
Auto merged
mysql-test/t/func_time.test:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/slave.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
storage/innobase/handler/ha_innodb.cc:
Auto merged
storage/innobase/handler/ha_innodb.h:
Auto merged
mysql-test/r/ctype_utf8.result:
Manual merge (use local)
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 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); |