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

Merge 10.1 into 10.2

Browse Source
This commit is contained in:
Marko Mäkelä
2019-05-16 11:55:18 +03:00
parent 56976e60f5 70a5fb49a7
commit c41407210c
8 changed files with 146 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
mysql-test/r/mysqldump.result
View File

@ -5629,6 +5629,24 @@ DROP FUNCTION f;
DROP VIEW v1;
DROP FUNCTION f;
#
# MDEV-788 New option to ignore foreign key contraints in mysqlimport
#
create table t1 (
id int primary key
) engine=InnoDB;
create table t2 (
t1_id int,
CONSTRAINT fk
FOREIGN KEY (t1_id) REFERENCES t1 (id)
) ENGINE = InnoDB;
select count(*) from t2;
count(*)
1
select count(*) from t2;
count(*)
2
drop tables t2, t1;
#
# Test for --add-drop-trigger
#
use test;