Commit 00820e2b authored by unknown's avatar unknown
Browse files

Fix merge of __attribute__ cleanup. 


include/my_sys.h:
  Fix bad merge
sql/set_var.cc:
  Fix bad __attribute__ usage.
parent 44cdd695

include/my_sys.h

+1 −1
Original line number Diff line number Diff line
@@ -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_error _VARARGS((int nr,myf MyFlags, ...));

extern int my_printf_error _VARARGS((uint my_err, const char *format,

				     myf MyFlags, ...)

				     myf MyFlags, ...))

				    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);

sql/set_var.cc

+2 −2
Original line number Diff line number Diff line
@@ -1255,8 +1255,8 @@ static void fix_tx_isolation(THD *thd, enum_var_type type) 
				thd->variables.tx_isolation);

}



static void fix_completion_type(THD *thd __attribute__(unused),

				enum_var_type type __attribute__(unused)) {}

static void fix_completion_type(THD *thd __attribute__((unused)),

				enum_var_type type __attribute__((unused))) {}



static int check_completion_type(THD *thd, set_var *var)

{