diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2018-09-03 10:57:02 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2018-09-03 10:57:02 +0200 |
| commit | b9bc3c24630980b260b91fc856689dbad336064e (patch) | |
| tree | 63c6339feb795a0419540f6c63c41ff58a0ffd2d /mysql-test/suite/maria | |
| parent | b3c320bb0b93e516cda4db277cfa3efeef48c988 (diff) | |
| parent | 43c393ff4732e9ea8719864abeb73cefd5b528a9 (diff) | |
| download | mariadb-git-b9bc3c24630980b260b91fc856689dbad336064e.tar.gz | |
Merge branch '5.5' into 10.0bb-10.0-merge-sanja
Diffstat (limited to 'mysql-test/suite/maria')
| -rw-r--r-- | mysql-test/suite/maria/maria.result | 4 | ||||
| -rw-r--r-- | mysql-test/suite/maria/maria.test | 10 |
2 files changed, 14 insertions, 0 deletions
diff --git a/mysql-test/suite/maria/maria.result b/mysql-test/suite/maria/maria.result index 2618327c716..9c8565d0f03 100644 --- a/mysql-test/suite/maria/maria.result +++ b/mysql-test/suite/maria/maria.result @@ -2732,6 +2732,10 @@ id name -1 dog 2 cat DROP TABLE t1; +CREATE TABLE t1 (pk int, i2 int) ENGINE=Aria; +INSERT INTO t1 VALUES (1,2), (2,3),(3,4); +DELETE FROM tt.*, t1.* USING t1 AS tt LEFT JOIN t1 ON (tt.i2 = t1.pk); +DROP TABLE t1; # # End of 5.5 tests # diff --git a/mysql-test/suite/maria/maria.test b/mysql-test/suite/maria/maria.test index 6c080e484ce..9616933e363 100644 --- a/mysql-test/suite/maria/maria.test +++ b/mysql-test/suite/maria/maria.test @@ -2002,6 +2002,16 @@ INSERT INTO t1 (name) VALUES ('cat'); SELECT * FROM t1; DROP TABLE t1; +# +# MDEV-16682 +# Assertion `(buff[7] & 7) == HEAD_PAGE' failed. +# + +CREATE TABLE t1 (pk int, i2 int) ENGINE=Aria; +INSERT INTO t1 VALUES (1,2), (2,3),(3,4); +DELETE FROM tt.*, t1.* USING t1 AS tt LEFT JOIN t1 ON (tt.i2 = t1.pk); +DROP TABLE t1; + --echo # --echo # End of 5.5 tests --echo # |