mysql-test/t/view.test will have a conflict from MDEV-11864 – it's one-liner, but the context is different. Just add --source include/have_partition.inc to the beginning of the test.
mysql-test/suite/sys_vars/t/innodb_buffer_pool_load_now_basic.test will have a conflict from MDEV-14196 . The file was different in 10.0/10.1 vs 10.2 because of a wrong change in 10.2. Use the new version, discard the one that's in 10.2 before the merge.
mysql-test/suite/sys_vars/t/innodb_buffer_pool_dump_pct_basic.test, mysql-test/suite/sys_vars/r/innodb_buffer_pool_dump_pct_basic.result will have a conflict from MDEV-10651. The fix is for a race condition in 10.0/10.1; in 10.2 the test does not contain functionality which is prone to the race condition. It's okay to ignore the change completely and keep 10.2 version intact.
Task
Blocker
Sergei Golubchik
mysql-test/t/view.test will have a conflict from
MDEV-11864– it's one-liner, but the context is different. Just add --source include/have_partition.inc to the beginning of the test.mysql-test/suite/sys_vars/t/innodb_buffer_pool_load_now_basic.test will have a conflict from
MDEV-14196. The file was different in 10.0/10.1 vs 10.2 because of a wrong change in 10.2. Use the new version, discard the one that's in 10.2 before the merge.mysql-test/suite/sys_vars/t/innodb_buffer_pool_dump_pct_basic.test, mysql-test/suite/sys_vars/r/innodb_buffer_pool_dump_pct_basic.result will have a conflict from
MDEV-10651. The fix is for a race condition in 10.0/10.1; in 10.2 the test does not contain functionality which is prone to the race condition. It's okay to ignore the change completely and keep 10.2 version intact.