bzr push into mysql-5.1 branch (tor.didriksen:3634 to 3635) Bug#12406055

[Tor Didriksen]

 3635 Tor Didriksen	2011-10-31
      Bug#12406055 post-push fix: unused variable 'num_chars' in optimized build.

    modified:
      sql/sql_string.cc
 3634 Marko MäkelOR DDL
      
      row_rename_table_for_mysql(): Return DB_ERROR instead of DB_SUCCESS
      when fil_rename_tablespace() returns an error. This bug was introduced
      in the InnoDB Plugin.
      
      Approved by Sunny Bains over IM.

    modified:
      storage/innodb_plugin/ChangeLog
      storage/innodb_plugin/row/row0mysql.c
=== modified file 'sql/sql_string.cc'
--- a/sql/sql_string.cc	2011-07-15 12:08:14 +0000
+++ b/sql/sql_string.cc	2011-10-31 09:10:04 +0000
@@ -200,7 +200,8 @@ end:
 #else
 #ifdef HAVE_SNPRINTF
   buff[sizeof(buff)-1]=0;			// Safety
-  int num_chars= snprintf(buff, sizeof(buff)-1, "%.*f",(int) decimals, num);
+  IF_DBUG(int num_chars= )
+    snprintf(buff, sizeof(buff)-1, "%.*f",(int) decimals, num);
   DBUG_ASSERT(num_chars > 0);
   DBUG_ASSERT(num_chars < (int) sizeof(buff));
 #else

No bundle (reason: useless for push emails).