database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-03 20:43:11 +03:00
Code Activity

fix innodb-get-fk test

Browse Source 
incorrect option name and doing ALTER TABLE under read-only:
the test "passed" in 10.0 only because $restart_parameters
was first implemented in 10.1
This commit is contained in:
Sergei Golubchik
2015-12-20 12:31:49 +01:00
parent 752349d8af
commit ab64d674e8
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/suite/innodb/r/innodb-get-fk.result
View File

@@ -26,7 +26,7 @@ KEY `fk_crewRoleAssigned_roleCode` (`role_code`),
CONSTRAINT `fk_crewRoleAssigned_crewId` FOREIGN KEY (`crew_id`) REFERENCES `repro`.`crew` (`id`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `fk_crewRoleAssigned_crewId` FOREIGN KEY (`crew_id`) REFERENCES `repro`.`crew` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
CONSTRAINT `fk_crewRoleAssigned_pilotId` FOREIGN KEY (`crew_id`) REFERENCES `repro`.`pilot` (`id`) ON DELETE CASCADE ON UPDATE CASCADE CONSTRAINT `fk_crewRoleAssigned_pilotId` FOREIGN KEY (`crew_id`) REFERENCES `repro`.`pilot` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
) ENGINE=InnoDB COMMENT="This is a comment about tables"; ) ENGINE=InnoDB COMMENT="This is a comment about tables";
# Restart mysqld --innodb_read_only_mode=1 # Restart mysqld --innodb_read_only=1
SHOW CREATE TABLE `repro`.`crew_role_assigned`; SHOW CREATE TABLE `repro`.`crew_role_assigned`;
Table Create Table Table Create Table
crew_role_assigned CREATE TABLE `crew_role_assigned` ( crew_role_assigned CREATE TABLE `crew_role_assigned` (
@@ -52,7 +52,7 @@ crew_role_assigned CREATE TABLE `crew_role_assigned` (
CONSTRAINT `fk_crewRoleAssigned_crewId` FOREIGN KEY (`crew_id`) REFERENCES `crew` (`id`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `fk_crewRoleAssigned_crewId` FOREIGN KEY (`crew_id`) REFERENCES `crew` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
CONSTRAINT `fk_crewRoleAssigned_pilotId` FOREIGN KEY (`crew_id`) REFERENCES `pilot` (`id`) ON DELETE CASCADE ON UPDATE CASCADE CONSTRAINT `fk_crewRoleAssigned_pilotId` FOREIGN KEY (`crew_id`) REFERENCES `pilot` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMMENT='This is a new comment about tables' ) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMMENT='This is a new comment about tables'
# Restart mysqld --innodb_read_only_mode=1 # Restart mysqld --innodb_read_only=1
SHOW CREATE TABLE `repro`.`crew_role_assigned`; SHOW CREATE TABLE `repro`.`crew_role_assigned`;
Table Create Table Table Create Table
crew_role_assigned CREATE TABLE `crew_role_assigned` ( crew_role_assigned CREATE TABLE `crew_role_assigned` (

10
mysql-test/suite/innodb/t/innodb-get-fk.test
View File

@@ -33,19 +33,20 @@ CONSTRAINT `fk_crewRoleAssigned_crewId` FOREIGN KEY (`crew_id`) REFERENCES `repr
CONSTRAINT `fk_crewRoleAssigned_pilotId` FOREIGN KEY (`crew_id`) REFERENCES `repro`.`pilot` (`id`) ON DELETE CASCADE ON UPDATE CASCADE CONSTRAINT `fk_crewRoleAssigned_pilotId` FOREIGN KEY (`crew_id`) REFERENCES `repro`.`pilot` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
) ENGINE=InnoDB COMMENT="This is a comment about tables"; ) ENGINE=InnoDB COMMENT="This is a comment about tables";
--echo # Restart mysqld --innodb_read_only_mode=1 --echo # Restart mysqld --innodb_read_only=1
-- let $restart_parameters=--innodb-read-only-mode=1 -- let $restart_parameters=--innodb-read-only=1
-- source include/restart_mysqld.inc -- source include/restart_mysqld.inc
SHOW CREATE TABLE `repro`.`crew_role_assigned`; SHOW CREATE TABLE `repro`.`crew_role_assigned`;
-- let $restart_parameters=
-- source include/restart_mysqld.inc -- source include/restart_mysqld.inc
ALTER TABLE `repro`.`crew_role_assigned` COMMENT = "This is a new comment about tables"; ALTER TABLE `repro`.`crew_role_assigned` COMMENT = "This is a new comment about tables";
SHOW CREATE TABLE `repro`.`crew_role_assigned`; SHOW CREATE TABLE `repro`.`crew_role_assigned`;
--echo # Restart mysqld --innodb_read_only_mode=1 --echo # Restart mysqld --innodb_read_only=1
-- let $restart_parameters=--innodb-read-only-mode=1 -- let $restart_parameters=--innodb-read-only=1
-- source include/restart_mysqld.inc -- source include/restart_mysqld.inc
# #
@@ -53,6 +54,7 @@ SHOW CREATE TABLE `repro`.`crew_role_assigned`;
# #
SHOW CREATE TABLE `repro`.`crew_role_assigned`; SHOW CREATE TABLE `repro`.`crew_role_assigned`;
-- let $restart_parameters=
-- source include/restart_mysqld.inc -- source include/restart_mysqld.inc
DROP TABLE `repro`.`crew_role_assigned`; DROP TABLE `repro`.`crew_role_assigned`;