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 branch 'github/10.1' into 10.2

Browse Source
This commit is contained in:
Sergei Golubchik
2018-02-06 14:50:50 +01:00
parent 60f51af755 0c25e58db6
commit 4771ae4b22
466 changed files with 9366 additions and 3618 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
mysql-test/suite/innodb/t/innodb-on-duplicate-update.test
View File

@ -61,26 +61,3 @@ INSERT into t2 VALUES (1, 1, 100);
INSERT INTO t2 (i,m) VALUES (1, 2) ON DUPLICATE KEY UPDATE m=3;
SELECT * FROM t2;
DROP TABLE t2, t1;
#
# MDEV-15042: INSERT ON DUPLICATE KEY UPDATE produces error 1032 (Can't find record)
#
CREATE TABLE parent (
id INT PRIMARY KEY AUTO_INCREMENT
) ENGINE=INNODB;
CREATE TABLE child (
parent_id INT NOT NULL PRIMARY KEY,
id INT NOT NULL,
CONSTRAINT fk_c_parent FOREIGN KEY (parent_id) REFERENCES parent (id) ON UPDATE CASCADE ON DELETE CASCADE
) ENGINE=INNODB;
--error ER_NO_REFERENCED_ROW_2
INSERT INTO child (id, parent_id) VALUES (1, 1);
--error ER_NO_REFERENCED_ROW_2
INSERT INTO child (id, parent_id) VALUES (1, 1) ON DUPLICATE KEY UPDATE id = VALUES(id);
select * from parent;
select * from child;
drop table child, parent;