1.) client/mysqlbinlog.cc - MariaDB has enhanced functionality for "process_event" around "use db" statements. 2.) include/my_sys.h - Since we are not patching the above we don't need "my_fprintf". 3.) mysql-test/r/mysqlbinlog-innodb.result - This test captures the above functionality. 4.) mysql-test/r/mysqlbinlog.result - not at all clear about #7 and #8 but looks like a should or can ignore. patching file mysql-test/r/mysqlbinlog2.result^M patching file mysql-test/r/mysqlbinlog_row.result^M patching file mysql-test/r/mysqlbinlog_row_innodb.result^M patching file mysql-test/r/mysqlbinlog_row_myisam.result^M patching file mysql-test/r/mysqlbinlog_row_trans.result^M patching file mysql-test/r/user_var-binlog.result^M 5.) mysql-test/suite/binlog/r/binlog_base64_flag.result - I think this applied cleanly. 6.) mysql-test/suite/binlog/r/binlog_row_mysqlbinlog_options.result - again the above functionality patching file mysql-test/suite/binlog/r/binlog_stm_ctype_ucs.result^M patching file mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result^M 7.) mysql-test/suite/rpl/r/rpl_hrtime.result - copied fromMariaDB source patching file mysql-test/suite/rpl/r/rpl_mdev382.result^M patching file mysql-test/suite/rpl/r/rpl_row_mysqlbinlog.result^M patching file mysql-test/suite/rpl/r/rpl_sp.result^M patching file mysql-test/suite/rpl/t/rpl_mdev382.test^M patching file mysys/mf_iocache2.c^M patching file sql/ha_ndbcluster_binlog.cc^M Hunk #1 succeeded at 1296 (offset 1 line).^M Hunk #2 succeeded at 1307 (offset 1 line).^M 8.) sql/item.cc - manually applied 9.) sql/item.h - manually applied patching file sql/item_func.cc^M Hunk #1 succeeded at 5257 (offset -186 lines).^M patching file sql/item_func.h^M Hunk #1 succeeded at 1574 (offset -96 lines).^M 10.) sql/log.cc - manually applied 11.) sql/log_event.cc - This one is a right mess with methods getting mangled up. Annotate_rows_log_event::pack_info apparently not present in oracle version Had to copy User_var_log_event::pack_info over from MariaDB source. 12.) sql/log_event.h - Had to manually apply one change patching file sql/log_event_old.cc^M Hunk #1 succeeded at 1926 (offset -9 lines).^M patching file sql/log_event_old.h^M patching file sql/repl_failsafe.cc^M Hunk #1 succeeded at 34 (offset -1 lines).^M 13.) sql/rpl_record.cc - seems to be ignorable patching file sql/sql_base.cc^M Hunk #1 succeeded at 3830 (offset -57 lines).^M Hunk #2 succeeded at 3855 (offset -57 lines).^M patching file sql/sql_db.cc^M Hunk #1 succeeded at 542 (offset -2 lines).^M Hunk #2 succeeded at 619 (offset -2 lines).^M Hunk #3 succeeded at 874 (offset -2 lines).^M Hunk #4 succeeded at 922 (offset -2 lines).^M Hunk #5 succeeded at 933 (offset -2 lines).^M Hunk #6 succeeded at 949 (offset -2 lines).^M 14.) sql/sql_load.cc - an even more terrifying reject file Manually applied by comparison with MariaDB code patching file sql/sql_repl.cc^M Hunk #1 succeeded at 1847 with fuzz 2 (offset -153 lines).^M 15.) sql/sql_select.cc - seems not to be relevant patching file sql/sql_show.cc^M Hunk #1 succeeded at 945 (offset -47 lines).^M Hunk #2 succeeded at 959 (offset -47 lines).^M Hunk #3 succeeded at 968 (offset -47 lines).^M Hunk #4 succeeded at 984 (offset -47 lines).^M patching file sql/sql_show.h^M patching file sql/sql_string.cc^M Hunk #1 succeeded at 1120 (offset -1 lines).^M patching file sql/sql_string.h^M Hunk #1 succeeded at 395 (offset -64 lines).^M patching file sql/sql_table.cc^M Hunk #1 succeeded at 2046 (offset -58 lines).^M Hunk #2 succeeded at 2108 (offset -58 lines).^M Hunk #3 succeeded at 2174 (offset -55 lines).^M patching file sql/sql_truncate.cc^M patching file sql/sql_yacc.yy^M Hunk #1 succeeded at 11633 (offset -511 lines).^M 16.) strings/my_vsnprintf.c - Can be safely ignored