Merge rama.(none):/home/jimw/my/mysql-5.0-clean

into  rama.(none):/home/jimw/my/mysql-5.1-clean


include/m_ctype.h:
  Auto merged
include/m_string.h:
  Auto merged
include/my_global.h:
  Auto merged
include/my_sys.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/mysql_priv.h:
  Resolve conflict
sql/mysqld.cc:
  Resolve conflict
sql/set_var.cc:
  Resolve conflict
sql/slave.h:
  Resolve conflict
sql/sql_class.h:
  Resolve conflict

1 files changed, 2 insertions, 1 deletions

diff --git a/sql/slave.h b/sql/slave.h
index 9d76277da0d..fd1d77bb6b1 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);