bzr push into mysql-5.6 branch (rohit.kalhans:4163 to 4164) Bug#13389196

[Rohit Kalhans]

 4164 Rohit Kalhans	2012-08-20
      Bug #13389196:BUILD FAILS IF P_S IS DISABLED WITH:
      -DWITH_PERFSCHEMA_STORAGE_ENGINE:BOOL=OFF
      
      Problem: Build failure while building MySQL-5.6 when 
      performance schema is disabled.(i.e. compiling using the
      option -DWITH_PERFSCHEMA_STORAGE_ENGINE=OFF).
      
      Background: A few misplaced comma(',') in the the
      conditionally included code has caused this problem.
      
      Fix: Changed the comma positions so that the conditionally
      included code compiles properly.
      
       

    modified:
      sql/rpl_info_factory.cc
      sql/rpl_mi.cc
      sql/rpl_mi.h
 4163 Marko Mäkelä	2012-08-17
      Bug#14389788 INNODB: NEW WARNINGS ON WINDOWS
      
      row_log_table_delete(), row_log_table_low_redundant(), row_log_table_low():
      Explicitly cast the integers to unsigned 8-bit, before writing to the
      temporary file buffer. There already were debug assertions in place, guarding
      against overflow.
      
      Approved by Inaam Rana on IM.

    modified:
      storage/innobase/row/row0log.cc
=== modified file 'sql/rpl_info_factory.cc'
--- a/sql/rpl_info_factory.cc	2012-08-09 10:05:01 +0000
+++ b/sql/rpl_info_factory.cc	2012-08-20 08:44:27 +0000
@@ -102,9 +102,9 @@ Master_info *Rpl_info_factory::create_mi
                             &key_master_info_data_cond,
                             &key_master_info_start_cond,
                             &key_master_info_stop_cond,
-                            &key_master_info_sleep_cond
+                            &key_master_info_sleep_cond,
 #endif
-                            ,instances
+                            instances
                            )))
     goto err;
 

=== modified file 'sql/rpl_mi.cc'
--- a/sql/rpl_mi.cc	2012-08-09 10:05:01 +0000
+++ b/sql/rpl_mi.cc	2012-08-20 08:44:27 +0000
@@ -99,9 +99,9 @@ Master_info::Master_info(
                          PSI_mutex_key *param_key_info_data_cond,
                          PSI_mutex_key *param_key_info_start_cond,
                          PSI_mutex_key *param_key_info_stop_cond,
-                         PSI_mutex_key *param_key_info_sleep_cond
+                         PSI_mutex_key *param_key_info_sleep_cond,
 #endif
-                         ,uint param_id
+                         uint param_id
                         )
    :Rpl_info("I/O"
 #ifdef HAVE_PSI_INTERFACE

=== modified file 'sql/rpl_mi.h'
--- a/sql/rpl_mi.h	2012-08-09 10:05:01 +0000
+++ b/sql/rpl_mi.h	2012-08-20 08:44:27 +0000
@@ -373,9 +373,9 @@ private:
               PSI_mutex_key *param_key_info_data_cond,
               PSI_mutex_key *param_key_info_start_cond,
               PSI_mutex_key *param_key_info_stop_cond,
-              PSI_mutex_key *param_key_info_sleep_cond
+              PSI_mutex_key *param_key_info_sleep_cond,
 #endif
-              ,uint param_id
+              uint param_id
              );
 
   Master_info(const Master_info& info);

No bundle (reason: useless for push emails).