diff options
| author | unknown <jimw@rama.(none)> | 2006-09-28 18:09:10 -0700 |
|---|---|---|
| committer | unknown <jimw@rama.(none)> | 2006-09-28 18:09:10 -0700 |
| commit | 44cdd695ab62ce115f1376cc63ee1c46e6f3b4b3 (patch) | |
| tree | f325a06780e46cb928226f1db47f7a001930ff47 /include/my_sys.h | |
| parent | a59f477cde80dc1fbd354c1a0f7a7c722833822f (diff) | |
| parent | 915bdfbea873dd064edc28905945f2f098bb83e2 (diff) | |
| download | mariadb-git-44cdd695ab62ce115f1376cc63ee1c46e6f3b4b3.tar.gz | |
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
Diffstat (limited to 'include/my_sys.h')
| -rw-r--r-- | include/my_sys.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/my_sys.h b/include/my_sys.h index 9b283ace029..1496f0644ab 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -633,7 +633,7 @@ extern int my_sync(File fd, myf my_flags); extern int my_error _VARARGS((int nr,myf MyFlags, ...)); extern int my_printf_error _VARARGS((uint my_err, const char *format, myf MyFlags, ...) - __attribute__ ((format (printf, 2, 4)))); + ATTRIBUTE_FORMAT(printf, 2, 4); extern int my_error_register(const char **errmsgs, int first, int last); extern const char **my_error_unregister(int first, int last); extern int my_message(uint my_err, const char *str,myf MyFlags); |