From: Tor Didriksen
Date: December 2 2010 7:22am
Subject: bzr push into mysql-5.5-bugteam branch (tor.didriksen:3160 to 3161)
List-Archive: http://lists.mysql.com/commits/125746
Message-Id: <20101202072202.AFD671646@atum07.norway.sun.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3161 Tor Didriksen	2010-12-02 [merge]
      merge from 5.1-bugteam

    modified:
      sql/sql_plugin.cc
 3160 Mats Kindahl	2010-12-01 [merge]
      Merging patch for BUG#58246 into mysql-5.5-bugteam.

    modified:
      include/m_ctype.h
      include/my_global.h
      mysql-test/r/plugin_not_embedded.result
      mysql-test/t/plugin_not_embedded.test
      sql/sql_plugin.cc
      sql/sql_plugin.h
      sql/sql_udf.cc
      strings/my_strchr.c
=== modified file 'sql/sql_plugin.cc'
--- a/sql/sql_plugin.cc	2010-12-01 22:15:14 +0000
+++ b/sql/sql_plugin.cc	2010-12-02 07:16:26 +0000
@@ -428,7 +428,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.

No bundle (reason: useless for push emails).