Fix merge of __attribute__ cleanup.

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

1 files changed, 1 insertions, 1 deletions

diff --git a/include/my_sys.h b/include/my_sys.h
index 1496f0644ab..2c0ef955477 100644
--- a/include/my_sys.h
+++ b/include/my_sys.h
@@ -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);