← Back to team overview

maria-developers team mailing list archive

Rev 2734: auto-merge in file:///home/bell/maria/bzr/work-maria-5.2-merge-5.1-merge/

 

At file:///home/bell/maria/bzr/work-maria-5.2-merge-5.1-merge/

------------------------------------------------------------
revno: 2734 [merge]
revision-id: sanja@xxxxxxxxxxxx-20091209091419-1vf3iqokr4opvp4k
parent: sanja@xxxxxxxxxxxx-20091208214754-6567fbf56f2aif7v
parent: psergey@xxxxxxxxxxxx-20091202142609-18bp41q8mejxl47t
committer: sanja@xxxxxxxxxxxx
branch nick: work-maria-5.2-merge-5.1-merge
timestamp: Wed 2009-12-09 11:14:19 +0200
message:
  auto-merge
modified:
  sql/item.h                     sp1f-item.h-19700101030959-rrkb43htudd62batmoteashkebcwykpa
=== modified file 'sql/item.h'
--- a/sql/item.h	2009-12-08 21:47:54 +0000
+++ b/sql/item.h	2009-12-09 09:14:19 +0000
@@ -25,7 +25,7 @@
   sprintf(buff, "%s::%s", where, processor_name);
   DBUG_ENTER(buff);
   sprintf(buff, "%s returns TRUE: unsupported function", processor_name);
-  DBUG_PRINT("info", (buff));
+  DBUG_PRINT("info", ("%s", buff));
   DBUG_RETURN(TRUE);
 }