post-merge fixes

mysql-test/suite/innodb/r/foreign-keys.result

@@ -5,8 +5,8 @@
 CREATE TABLE `department` (`department_id` INT, `department_people_fk` INT,
 PRIMARY KEY (`department_id`)) engine=innodb;
 CREATE TABLE `title` (`title_id` INT, `title_manager_fk` INT,
-`title_reporter_fk` INT, PRIMARY KEY (`title_id`));
-CREATE TABLE `people` (`people_id` INT, PRIMARY KEY (`people_id`));
+`title_reporter_fk` INT, PRIMARY KEY (`title_id`)) engine=innodb;
+CREATE TABLE `people` (`people_id` INT, PRIMARY KEY (`people_id`)) engine=innodb;
 ALTER TABLE `department` ADD FOREIGN KEY (`department_people_fk`) REFERENCES
 `people` (`people_id`);
 ALTER TABLE `title` ADD FOREIGN KEY (`title_manager_fk`) REFERENCES `people`

mysql-test/suite/innodb/t/foreign-keys.test

 --source include/have_innodb.inc
 --source include/have_debug.inc
 
+if (`select plugin_auth_version <= "5.5.39-MariaDB-36.0" from information_schema.plugins where plugin_name='innodb'`)
+{
+  --skip Not fixed in XtraDB as of 5.5.39-MariaDB-36.0 or earlier
+}
+
 --echo #
 --echo # Bug #19471516 SERVER CRASHES WHEN EXECUTING ALTER TABLE
 --echo # ADD FOREIGN KEY
@@ -10,9 +15,9 @@ CREATE TABLE `department` (`department_id` INT, `department_people_fk` INT,
 PRIMARY KEY (`department_id`)) engine=innodb;
 
 CREATE TABLE `title` (`title_id` INT, `title_manager_fk` INT,
-`title_reporter_fk` INT, PRIMARY KEY (`title_id`));
+`title_reporter_fk` INT, PRIMARY KEY (`title_id`)) engine=innodb;
 
-CREATE TABLE `people` (`people_id` INT, PRIMARY KEY (`people_id`));
+CREATE TABLE `people` (`people_id` INT, PRIMARY KEY (`people_id`)) engine=innodb;
 
 ALTER TABLE `department` ADD FOREIGN KEY (`department_people_fk`) REFERENCES
 `people` (`people_id`);

mysql-test/t/log_errchk.test

 #
 --source include/not_windows.inc
---source include/force_restart.inc
 --source include/not_embedded.inc
 
 #