Commit d5d89bcf authored by jimw@rama.(none)'s avatar jimw@rama.(none)

Fix merge of __attribute__ cleanup.

parent 68eadc8a
...@@ -632,7 +632,7 @@ extern int my_chsize(File fd,my_off_t newlength, int filler, myf MyFlags); ...@@ -632,7 +632,7 @@ extern int my_chsize(File fd,my_off_t newlength, int filler, myf MyFlags);
extern int my_sync(File fd, myf my_flags); extern int my_sync(File fd, myf my_flags);
extern int my_error _VARARGS((int nr,myf MyFlags, ...)); extern int my_error _VARARGS((int nr,myf MyFlags, ...));
extern int my_printf_error _VARARGS((uint my_err, const char *format, extern int my_printf_error _VARARGS((uint my_err, const char *format,
myf MyFlags, ...) 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 int my_error_register(const char **errmsgs, int first, int last);
extern const char **my_error_unregister(int first, int last); extern const char **my_error_unregister(int first, int last);
......
...@@ -1255,8 +1255,8 @@ static void fix_tx_isolation(THD *thd, enum_var_type type) ...@@ -1255,8 +1255,8 @@ static void fix_tx_isolation(THD *thd, enum_var_type type)
thd->variables.tx_isolation); thd->variables.tx_isolation);
} }
static void fix_completion_type(THD *thd __attribute__(unused), static void fix_completion_type(THD *thd __attribute__((unused)),
enum_var_type type __attribute__(unused)) {} enum_var_type type __attribute__((unused))) {}
static int check_completion_type(THD *thd, set_var *var) static int check_completion_type(THD *thd, set_var *var)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment