From ad0f8fef3ddb79d54741fdce04536bf94945b40a Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Sat, 24 Feb 2018 09:18:42 +0100 Subject: [PATCH] fixes for test failures --- mysql-test/suite/innodb/r/instant_alter_debug.result | 2 +- mysql-test/suite/parts/t/print_error.test | 1 + storage/innobase/handler/handler0alter.cc | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/mysql-test/suite/innodb/r/instant_alter_debug.result b/mysql-test/suite/innodb/r/instant_alter_debug.result index 8b483693163..3aec7553ff0 100644 --- 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 index d410cc6856e..79da0d87f4b 100644 --- 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 index e86c74728be..b775bfa40ee 100644 --- 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));