Text conflict in mysql-test/suite/rpl/r/rpl_mixed_binlog_max_cache_size.result
Text conflict in mysql-test/suite/rpl/r/rpl_row_binlog_max_cache_size.result
Text conflict in mysql-test/suite/rpl/r/rpl_stm_binlog_max_cache_size.result
Contents conflict in mysql-test/suite/rpl/t/rpl_mixed_binlog_max_cache_size-master.opt
Contents conflict in mysql-test/suite/rpl/t/rpl_row_binlog_max_cache_size-master.opt
Contents conflict in mysql-test/suite/rpl/t/rpl_stm_binlog_max_cache_size-master.opt
Text conflict in sql/share/errmsg-utf8.txt
Text conflict in sql/sql_partition_admin.cc
Text conflict in sql/sql_partition_admin.h
Text conflict in sql/sql_truncate.cc
Text conflict in sql/sql_truncate.h
Text conflict in storage/innobase/row/row0sel.c
12 conflicts encountered.

  Adapted incoming changes to new class hierarchy in next-mr
  Added missing warnings to result files.
  Added this to the ### CLEAN ### section of rpl_binlog_max_cache_size.test
  --disable_query_log
  --eval SET GLOBAL max_binlog_cache_size= $old_max_binlog_cache_size
  --eval SET GLOBAL binlog_cache_size= $old_binlog_cache_size
  --enable_query_log

Fixed some compile warnings:
handler/ha_innodb.cc
                        if (do_idx_cond_push
                            && ((need_second_pass && !index_covers_field)
                                ||
                                  (!need_second_pass && index_covers_field))) {
  
  storage/innobase/row/row0sel.c
                res = row_sel_store_mysql_rec(buf, prebuilt, rec, offsets,
                                              0, prebuilt->n_index_fields);
  
  sql/sql_insert.cc
    delayed_row(LEX_STRING const query_arg, enum_duplicates dup_arg,
                bool ignore_arg, bool log_query_arg)
      : record(0), dup(dup_arg), ignore(ignore_arg), log_query(log_query_arg),
        binlog_rows_query_log_events(FALSE),
        forced_insert_id(0), query(query_arg), time_zone(0)
      {}