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

[Tor Didriksen]

 3636 Tor Didriksen	2011-11-01
      Bug#12406055 post-push fix: unused variable 'num_chars' in optimized build.
      Also fixed possibly uninitialized use of need_copy_table_res.

    modified:
      client/sql_string.cc
      sql/sql_table.cc
 3635 Tor Didriksen	2011-10-31
      Bug#12406055 post-push fix: unused variable 'num_chars' in optimized build.

    modified:
      sql/sql_string.cc
=== modified file 'client/sql_string.cc'
--- a/client/sql_string.cc	2011-07-15 12:08:14 +0000
+++ b/client/sql_string.cc	2011-11-01 06:50:54 +0000
@@ -188,7 +188,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

=== modified file 'sql/sql_table.cc'
--- a/sql/sql_table.cc	2011-07-03 15:47:37 +0000
+++ b/sql/sql_table.cc	2011-11-01 06:50:54 +0000
@@ -6985,7 +6985,7 @@ view_err:
     need_copy_table= ALTER_TABLE_DATA_CHANGED;
   else
   {
-    enum_alter_table_change_level need_copy_table_res;
+    enum_alter_table_change_level need_copy_table_res=ALTER_TABLE_METADATA_ONLY;
     /* Check how much the tables differ. */
     if (compare_tables(table, alter_info,
                        create_info, order_num,

No bundle (reason: useless for push emails).