On 19/09/12 19:07, Nicholas Bamber wrote: > I am looking at this bug. However the patch involves 45 files. 17 of > these are test files. From what I have seen so far they do not apply > cleanly. Presumably they are meant for 5.5.27 rather than 5.5.24. I have > yet to form a judgement on quite how intractable adapting the patch is > going to be.
The results of a dry run are attached.
Script started on Wed 19 Sep 2012 19:27:43 BST ]0;nicholas@beaumont: ~/debian/svn/pkg-mysql/mysql-5.5/branches/wheezynicholas@beaumont:~/debian/svn/pkg-mysql/mysql-5.5/branches/wheezy$ patch --dry-run -p0 < ~/debian/notes/MySQL/mariadb_patch.diff patching file client/mysqlbinlog.cc Hunk #1 FAILED at 743. 1 out of 1 hunk FAILED -- saving rejects to file client/mysqlbinlog.cc.rej patching file include/my_sys.h Hunk #1 FAILED at 627. Hunk #2 succeeded at 744 (offset -7 lines). 1 out of 2 hunks FAILED -- saving rejects to file include/my_sys.h.rej can't find file to patch at input line 38 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- | |=== modified file 'mysql-test/r/mysqlbinlog-innodb.result' |--- mysql-test/r/mysqlbinlog-innodb.result 2011-10-19 19:45:18 +0000 |+++ mysql-test/r/mysqlbinlog-innodb.result 2012-08-24 13:29:01 +0000 -------------------------- File to patch: Skip this patch? [y] Skipping patch. 2 out of 2 hunks ignored patching file mysql-test/r/mysqlbinlog.result Hunk #7 FAILED at 427. Hunk #8 FAILED at 445. Hunk #12 succeeded at 826 (offset 1 line). 2 out of 12 hunks FAILED -- saving rejects to file mysql-test/r/mysqlbinlog.result.rej patching file mysql-test/r/mysqlbinlog2.result patching file mysql-test/r/mysqlbinlog_row.result patching file mysql-test/r/mysqlbinlog_row_innodb.result patching file mysql-test/r/mysqlbinlog_row_myisam.result patching file mysql-test/r/mysqlbinlog_row_trans.result patching file mysql-test/r/user_var-binlog.result patching file mysql-test/suite/binlog/r/binlog_base64_flag.result can't find file to patch at input line 623 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- | |=== modified file 'mysql-test/suite/binlog/r/binlog_row_mysqlbinlog_options.result' |--- mysql-test/suite/binlog/r/binlog_row_mysqlbinlog_options.result 2011-10-19 19:45:18 +0000 |+++ mysql-test/suite/binlog/r/binlog_row_mysqlbinlog_options.result 2012-08-24 13:29:01 +0000 -------------------------- File to patch: Skip this patch? [y] Skipping patch. 6 out of 6 hunks ignored patching file mysql-test/suite/binlog/r/binlog_stm_ctype_ucs.result patching file mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result can't find file to patch at input line 716 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- | |=== modified file 'mysql-test/suite/rpl/r/rpl_hrtime.result' |--- mysql-test/suite/rpl/r/rpl_hrtime.result 2011-10-19 19:45:18 +0000 |+++ mysql-test/suite/rpl/r/rpl_hrtime.result 2012-08-24 13:29:01 +0000 -------------------------- File to patch: Skip this patch? [y] Skipping patch. 1 out of 1 hunk ignored patching file mysql-test/suite/rpl/r/rpl_mdev382.result patching file mysql-test/suite/rpl/r/rpl_row_mysqlbinlog.result patching file mysql-test/suite/rpl/r/rpl_sp.result patching file mysql-test/suite/rpl/t/rpl_mdev382.test patching file mysys/mf_iocache2.c patching file sql/ha_ndbcluster_binlog.cc Hunk #1 succeeded at 1296 (offset 1 line). Hunk #2 succeeded at 1307 (offset 1 line). patching file sql/item.cc Hunk #1 FAILED at 992. 1 out of 1 hunk FAILED -- saving rejects to file sql/item.cc.rej patching file sql/item.h Hunk #1 FAILED at 656. 1 out of 1 hunk FAILED -- saving rejects to file sql/item.h.rej patching file sql/item_func.cc Hunk #1 succeeded at 5257 (offset -186 lines). patching file sql/item_func.h Hunk #1 succeeded at 1574 (offset -96 lines). patching file sql/log.cc Hunk #1 FAILED at 52. Hunk #2 succeeded at 2020 with fuzz 2 (offset -53 lines). Hunk #3 succeeded at 2043 with fuzz 2 (offset -53 lines). 1 out of 3 hunks FAILED -- saving rejects to file sql/log.cc.rej patching file sql/log_event.cc Hunk #1 succeeded at 45 (offset -1 lines). Hunk #2 succeeded at 427 (offset -45 lines). Hunk #3 succeeded at 879 (offset -47 lines). Hunk #4 succeeded at 888 (offset -47 lines). Hunk #5 succeeded at 903 (offset -47 lines). Hunk #6 succeeded at 2158 (offset -291 lines). Hunk #7 succeeded at 2995 (offset -335 lines). Hunk #8 succeeded at 3637 (offset -368 lines). Hunk #9 succeeded at 4286 (offset -495 lines). Hunk #10 succeeded at 4848 (offset -497 lines). Hunk #11 succeeded at 4870 (offset -497 lines). Hunk #12 succeeded at 5048 (offset -497 lines). Hunk #13 succeeded at 5263 (offset -500 lines). Hunk #14 succeeded at 5412 (offset -505 lines). Hunk #15 succeeded at 5510 (offset -532 lines). Hunk #16 FAILED at 6139. Hunk #17 succeeded at 5824 (offset -550 lines). Hunk #18 succeeded at 6038 (offset -560 lines). Hunk #19 succeeded at 6413 with fuzz 2 (offset -567 lines). Hunk #20 succeeded at 6598 with fuzz 1 (offset -568 lines). Hunk #21 succeeded at 6755 with fuzz 1 (offset -568 lines). Hunk #22 succeeded at 6853 with fuzz 1 (offset -569 lines). Hunk #23 succeeded at 7107 (offset -577 lines). Hunk #24 succeeded at 8085 (offset -579 lines). Hunk #25 FAILED at 8768. Hunk #26 succeeded at 8688 (offset -824 lines). Hunk #27 succeeded at 8709 (offset -824 lines). Hunk #28 succeeded at 9979 (offset -887 lines). 2 out of 28 hunks FAILED -- saving rejects to file sql/log_event.cc.rej patching file sql/log_event.h Hunk #1 succeeded at 999 (offset -66 lines). Hunk #2 succeeded at 1713 (offset -97 lines). Hunk #3 succeeded at 1843 (offset -97 lines). Hunk #4 succeeded at 2076 (offset -97 lines). Hunk #5 succeeded at 2139 (offset -97 lines). Hunk #6 succeeded at 2238 (offset -95 lines). Hunk #7 succeeded at 2390 with fuzz 2 (offset -107 lines). Hunk #8 succeeded at 2466 with fuzz 2 (offset -111 lines). Hunk #9 succeeded at 2510 with fuzz 2 (offset -116 lines). Hunk #10 FAILED at 2688. Hunk #11 succeeded at 2696 (offset -130 lines). Hunk #12 succeeded at 2757 (offset -130 lines). Hunk #13 succeeded at 2829 (offset -130 lines). Hunk #14 succeeded at 2870 (offset -130 lines). Hunk #15 succeeded at 2911 (offset -130 lines). Hunk #16 succeeded at 3007 (offset -130 lines). Hunk #17 FAILED at 3223. Hunk #18 succeeded at 3452 (offset -185 lines). Hunk #19 succeeded at 3564 (offset -185 lines). Hunk #20 succeeded at 4003 (offset -193 lines). 2 out of 20 hunks FAILED -- saving rejects to file sql/log_event.h.rej patching file sql/log_event_old.cc Hunk #1 succeeded at 1926 (offset -9 lines). patching file sql/log_event_old.h patching file sql/repl_failsafe.cc Hunk #1 succeeded at 34 (offset -1 lines). patching file sql/rpl_record.cc Hunk #1 FAILED at 314. 1 out of 1 hunk FAILED -- saving rejects to file sql/rpl_record.cc.rej patching file sql/sql_base.cc Hunk #1 succeeded at 3830 (offset -57 lines). Hunk #2 succeeded at 3855 (offset -57 lines). patching file sql/sql_db.cc Hunk #1 succeeded at 542 (offset -2 lines). Hunk #2 succeeded at 619 (offset -2 lines). Hunk #3 succeeded at 874 (offset -2 lines). Hunk #4 succeeded at 922 (offset -2 lines). Hunk #5 succeeded at 933 (offset -2 lines). Hunk #6 succeeded at 949 (offset -2 lines). patching file sql/sql_load.cc Hunk #1 FAILED at 39. Hunk #2 FAILED at 675. Hunk #3 FAILED at 700. Hunk #4 FAILED at 750. 4 out of 4 hunks FAILED -- saving rejects to file sql/sql_load.cc.rej patching file sql/sql_repl.cc Hunk #1 succeeded at 1847 with fuzz 2 (offset -153 lines). patching file sql/sql_select.cc Hunk #1 FAILED at 16481. 1 out of 1 hunk FAILED -- saving rejects to file sql/sql_select.cc.rej patching file sql/sql_show.cc Hunk #1 succeeded at 945 (offset -47 lines). Hunk #2 succeeded at 959 (offset -47 lines). Hunk #3 succeeded at 968 (offset -47 lines). Hunk #4 succeeded at 984 (offset -47 lines). patching file sql/sql_show.h patching file sql/sql_string.cc Hunk #1 succeeded at 1120 (offset -1 lines). patching file sql/sql_string.h Hunk #1 succeeded at 395 (offset -64 lines). patching file sql/sql_table.cc Hunk #1 succeeded at 2046 (offset -58 lines). Hunk #2 succeeded at 2108 (offset -58 lines). Hunk #3 succeeded at 2174 (offset -55 lines). patching file sql/sql_truncate.cc patching file sql/sql_yacc.yy Hunk #1 succeeded at 11633 (offset -511 lines). patching file strings/my_vsnprintf.c Hunk #1 FAILED at 694. 1 out of 1 hunk FAILED -- saving rejects to file strings/my_vsnprintf.c.rej ]0;nicholas@beaumont: ~/debian/svn/pkg-mysql/mysql-5.5/branches/wheezynicholas@beaumont:~/debian/svn/pkg-mysql/mysql-5.5/branches/wheezy$ exit Script done on Wed 19 Sep 2012 19:28:15 BST
