|
mysql-test/include/check-testcase.test will have a conflict due to MDEV-14029
let $datadir=`select @@datadir`;
|
<<<<<<< HEAD
|
list_files $datadir mysql_upgrade_info;
|
=======
|
list_files $datadir/test #sql*;
|
list_files $datadir/mysql #sql*;
|
>>>>>>> e691bef... MDEV-14029 Server does not remove #sql*.frm files after crash during ALTER TABLE
|
To resolve, add all three list_files lines.
let $datadir=`select @@datadir`;
|
list_files $datadir mysql_upgrade_info;
|
list_files $datadir/test #sql*;
|
list_files $datadir/mysql #sql*;
|
| 