database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

fixes for test failures

Browse Source
This commit is contained in:
Sergei Golubchik
2018-02-24 09:18:42 +01:00
parent 8f9c64000e
commit ad0f8fef3d
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/innodb/r/instant_alter_debug.result
View File

@ -35,7 +35,7 @@ ALTER TABLE t4 ADD COLUMN b INT;
SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS
LEFT JOIN t4 ON (NUMERIC_SCALE = pk); LEFT JOIN t4 ON (NUMERIC_SCALE = pk);
COUNT(*) COUNT(*)
1744 1748
SET DEBUG_SYNC='innodb_inplace_alter_table_enter SIGNAL enter WAIT_FOR delete'; SET DEBUG_SYNC='innodb_inplace_alter_table_enter SIGNAL enter WAIT_FOR delete';
ALTER TABLE t4 ADD COLUMN c INT; ALTER TABLE t4 ADD COLUMN c INT;
connect dml,localhost,root,,; connect dml,localhost,root,,;

1
mysql-test/suite/parts/t/print_error.test
View File

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

4
storage/innobase/handler/handler0alter.cc
View File

@ -1395,7 +1395,7 @@ innobase_set_foreign_key_option(
foreign->type = DICT_FOREIGN_ON_DELETE_SET_NULL; foreign->type = DICT_FOREIGN_ON_DELETE_SET_NULL;
break; break;
case FK_OPTION_UNDEF: case FK_OPTION_UNDEF:
DBUG_ASSERT(0); break;
} }
switch (fk_key->update_opt) { switch (fk_key->update_opt) {
@ -1411,7 +1411,7 @@ innobase_set_foreign_key_option(
foreign->type |= DICT_FOREIGN_ON_UPDATE_SET_NULL; foreign->type |= DICT_FOREIGN_ON_UPDATE_SET_NULL;
break; break;
case FK_OPTION_UNDEF: case FK_OPTION_UNDEF:
DBUG_ASSERT(0); break;
} }
return(innobase_check_fk_option(foreign)); return(innobase_check_fk_option(foreign));