fixes for test failures

MariaDB · Feb 24, 2018 · ad0f8fe · ad0f8fe
1 parent 8f9c640
commit ad0f8fe
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/mysql-test/suite/innodb/r/instant_alter_debug.result b/mysql-test/suite/innodb/r/instant_alter_debug.result
@@ -35,7 +35,7 @@ ALTER TABLE t4 ADD COLUMN b INT;
 SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS
 LEFT JOIN t4 ON (NUMERIC_SCALE = pk);
 COUNT(*)
-1744
+1748
 SET DEBUG_SYNC='innodb_inplace_alter_table_enter SIGNAL enter WAIT_FOR delete';
 ALTER TABLE t4 ADD COLUMN c INT;
 connect  dml,localhost,root,,;

diff --git a/mysql-test/suite/parts/t/print_error.test b/mysql-test/suite/parts/t/print_error.test
@@ -2,6 +2,7 @@
 # MDEV-15336 Server crashes in handler::print_error / ha_partition::print_error upon query timeout
 #
 --source include/have_innodb.inc
+--source include/not_embedded.inc
 --source include/have_partition.inc
 
 CREATE TABLE t1 (i INT) ENGINE=InnoDB PARTITION BY HASH (i) PARTITIONS 2;

diff --git a/storage/innobase/handler/handler0alter.cc b/storage/innobase/handler/handler0alter.cc
@@ -1395,7 +1395,7 @@ innobase_set_foreign_key_option(
 		foreign->type = DICT_FOREIGN_ON_DELETE_SET_NULL;
 		break;
 	case FK_OPTION_UNDEF:
-		DBUG_ASSERT(0);
+		break;
 	}
 
 	switch (fk_key->update_opt) {
@@ -1411,7 +1411,7 @@ innobase_set_foreign_key_option(
 		foreign->type |= DICT_FOREIGN_ON_UPDATE_SET_NULL;
 		break;
 	case FK_OPTION_UNDEF:
-		DBUG_ASSERT(0);
+		break;
 	}
 
 	return(innobase_check_fk_option(foreign));