diff options
author | unknown <jimw@rama.(none)> | 2006-09-28 20:17:17 -0700 |
---|---|---|
committer | unknown <jimw@rama.(none)> | 2006-09-28 20:17:17 -0700 |
commit | 39bdf4c41cbc7b42da453049870c7b1e1138e51a (patch) | |
tree | 21c74922c7fb46d9ca1136416175b9c0fbeadbda /sql/mysql_priv.h | |
parent | 5b571b5b5b641436d431aacd84a87fa6697e10ee (diff) | |
parent | 00820e2b0aafe2d90b5ba8b56698ada25069af43 (diff) | |
download | mariadb-git-39bdf4c41cbc7b42da453049870c7b1e1138e51a.tar.gz |
Merge bk-internal:/home/bk/mysql-5.0-maint
into rama.(none):/home/jimw/my/mysql-5.0-clean
include/my_global.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/slave.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_class.h:
Auto merged
Diffstat (limited to 'sql/mysql_priv.h')
-rw-r--r-- | sql/mysql_priv.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index e15466eec9f..790ad8f3140 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -1131,10 +1131,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, |