summaryrefslogtreecommitdiff
path: root/mysql-test/suite/innodb/r/foreign_key.result
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2020-08-26 11:30:20 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2020-08-26 11:30:20 +0300
commit1e08e08ccb8896c1f0d2f673c16f5b92cdf7dc46 (patch)
tree2bcef1f1398c85a665743208ec0a856f884b6a84 /mysql-test/suite/innodb/r/foreign_key.result
parent88e70f4caea34e0d7677b1fa646151b8b87dd3ab (diff)
parent6a042281bdbfe91cc39e1f6e02295bfe7eaa9d43 (diff)
downloadmariadb-git-1e08e08ccb8896c1f0d2f673c16f5b92cdf7dc46.tar.gz
Merge 10.3 into 10.4
Diffstat (limited to 'mysql-test/suite/innodb/r/foreign_key.result')
-rw-r--r--mysql-test/suite/innodb/r/foreign_key.result1
1 files changed, 0 insertions, 1 deletions
diff --git a/mysql-test/suite/innodb/r/foreign_key.result b/mysql-test/suite/innodb/r/foreign_key.result
index c2ec14e3bfe..901008753f6 100644
--- a/mysql-test/suite/innodb/r/foreign_key.result
+++ b/mysql-test/suite/innodb/r/foreign_key.result
@@ -168,7 +168,6 @@ PRIMARY KEY (store_id),
UNIQUE KEY idx_unique_manager (manager_staff_id),
CONSTRAINT fk_store_staff FOREIGN KEY (manager_staff_id) REFERENCES staff (staff_id) ON DELETE RESTRICT ON UPDATE CASCADE
) ENGINE=InnoDB;
-SET FOREIGN_KEY_CHECKS=DEFAULT;
LOCK TABLE staff WRITE;
UNLOCK TABLES;
DROP TABLES staff, store;