[Commits] Rev 3168: Merge from 5.1 in http://bazaar.launchpad.net/~maria-captains/maria/5.2

knielsen at knielsen-hq.org knielsen at knielsen-hq.org
Fri Aug 24 20:12:51 EEST 2012


At http://bazaar.launchpad.net/~maria-captains/maria/5.2

------------------------------------------------------------
revno: 3168 [merge]
revision-id: knielsen at knielsen-hq.org-20120824171247-1vlaykehbsob9stg
parent: knielsen at knielsen-hq.org-20120824133739-nredr3lilvcg1at0
parent: knielsen at knielsen-hq.org-20120824171154-1go0al917b6okask
committer: knielsen at knielsen-hq.org
branch nick: mariadb-5.2
timestamp: Fri 2012-08-24 19:12:47 +0200
message:
  Merge from 5.1
modified:
  sql/mysql_priv.h               sp1f-mysql_priv.h-19700101030959-4fl65tqpop5zfgxaxkqotu2fa2ree5ci
=== modified file 'sql/mysql_priv.h'
--- a/sql/mysql_priv.h	2012-08-24 13:37:39 +0000
+++ b/sql/mysql_priv.h	2012-08-24 17:12:47 +0000
@@ -859,7 +859,7 @@ Item *negate_expression(THD *thd, Item *
 
 /* log.cc */
 int vprint_msg_to_log(enum loglevel level, const char *format, va_list args);
-void sql_print_error(const char *format, ...) ATTRIBUTE_FORMAT(printf, 1, 2);
+void sql_print_error(const char *format, ...);
 void sql_print_warning(const char *format, ...) ATTRIBUTE_FORMAT(printf, 1, 2);
 void sql_print_information(const char *format, ...)
   ATTRIBUTE_FORMAT(printf, 1, 2);



More information about the commits mailing list