Merge branch 'mysql-5.7' into mysql-trunk

Author: Venkatesh Duggirala

sql/rpl_info_factory.cc

@@ -1229,8 +1229,6 @@ bool Rpl_info_factory::create_slave_info_objects(uint mi_option,
    @param[in]    to_decide_repo   For this channel, check if repositories
                                   are allowed to convert from one type to other.
    @param[in]    pchannel_map     a pointer to channel_map
-   @param[in]    channel_type     If the given channel is a slave channel.
-                                  Default is true.
 
    @return      Pointer         pointer to the created Master_info
    @return      NULL            when creation fails