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

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


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

1 files changed, 4 insertions, 4 deletions

diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h
index d73b1f1aac0..a8bef1fcdca 100644
--- a/sql/mysql_priv.h
+++ b/sql/mysql_priv.h
@@ -1119,10 +1119,10 @@ bool init_errmessage(void);
 void sql_perror(const char *message);
 
 void vprint_msg_to_log(enum loglevel level, const char *format, va_list args);
-void sql_print_error(const char *format, ...);
-void sql_print_warning(const char *format, ...);
-void sql_print_information(const char *format, ...);
-
+void sql_print_error(const char *format, ...) ATTRIBUTE_FORMAT(printf, 1, 2);
+void sql_print_warning(const char *format, ...) ATTRIBUTE_FORMAT(printf, 1, 2);
+void sql_print_information(const char *format, ...)
+  ATTRIBUTE_FORMAT(printf, 1, 2);
 
 
 bool fn_format_relative_to_data_home(my_string to, const char *name,