bzr commit into mysql-5.1-bugteam branch (mats.kindahl:3511)

[Mats Kindahl]

#At file:///home/bzr/bugs/b58246-5.1-bugteam/ based on revid:mats.kindahl@stripped

 3511 Mats Kindahl	2010-12-02 [merge]
      Merging with mysql-5.1-bugteam

    modified:
      sql/sql_plugin.cc
=== modified file 'sql/sql_plugin.cc'
--- a/sql/sql_plugin.cc	2010-12-01 12:54:50 +0000
+++ b/sql/sql_plugin.cc	2010-12-02 07:14:43 +0000
@@ -374,7 +374,8 @@ static st_plugin_dl *plugin_dl_add(const
   struct st_plugin_dl *tmp, plugin_dl;
   void *sym;
   DBUG_ENTER("plugin_dl_add");
-  DBUG_PRINT("enter", ("dl->str: '%s', dl->length: %d", dl->str, dl->length));
+  DBUG_PRINT("enter", ("dl->str: '%s', dl->length: %d",
+                       dl->str, (int) dl->length));
   plugin_dir_len= strlen(opt_plugin_dir);
   /*
     Ensure that the dll doesn't have a path.


Attachment: [text/bzr-bundle] bzr/[e-mail]