bzr commit into mysql-trunk branch (olav.sandstaa:3317) Bug#12359943

[Olav Sandstaa]

#At file:///export/home/tmp/mysql2/compile-error/ based on revid:olav.sandstaa@stripped

 3317 Olav Sandstaa	2011-04-14
      Fix for Bug#12359943 COMPILATION FAILURE WHEN USING SUN STUDIO 12 COMPILER TO PRODUCE OPTIMIZED BUILD
      
      The linking problem was caused by difference in declaration and definition of the 
      following two static member functions:
      
        Rpl_info_factory::change_mi_repository()
        Rpl_info_factory::change_rli_repository()
      
      Fixed by adding "const" the mi_option argument in the declartion.
     @ sql/rpl_info_factory.h
        Add const to the mi_option argument for the Rpl_info_factory::change_mi_repository()
        and Rpl_info_factory::change_rli_repository() member functions in order to make
        them have the same function signature as in the implementation.

    modified:
      sql/rpl_info_factory.h
=== modified file 'sql/rpl_info_factory.h'

=== modified file 'sql/rpl_info_factory.h'
--- a/sql/rpl_info_factory.h	2011-03-23 23:28:49 +0000
+++ b/sql/rpl_info_factory.h	2011-04-14 12:25:14 +0000
@@ -36,10 +36,10 @@
   static bool create(uint mi_option, Master_info **mi,
                      uint rli_option, Relay_log_info **rli);
   static Master_info *create_mi(uint rli_option);
-  static bool change_mi_repository(Master_info *mi, uint mi_option,
+  static bool change_mi_repository(Master_info *mi, const uint mi_option,
                                    const char **msg);
   static Relay_log_info *create_rli(uint rli_option, bool is_slave_recovery);
-  static bool change_rli_repository(Relay_log_info *mi, uint mi_option,
+  static bool change_rli_repository(Relay_log_info *mi, const uint mi_option,
                                     const char **msg);
 private:
   static bool decide_repository(Rpl_info *info,


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