diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-03-18 15:46:28 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-03-18 15:46:28 +0200 |
| commit | ccfbeafc45f98bdf01513b00d9f0c82f029cdbf4 (patch) | |
| tree | 88a88af3e2e08d5f19158998c9cc2575f09302bf /mysql-test/main | |
| parent | 7887d45352ca86b2328ceedc40f07e941c5cb10a (diff) | |
| parent | 190a8312f598fc4892331225104297f6288f23ac (diff) | |
| download | mariadb-git-ccfbeafc45f98bdf01513b00d9f0c82f029cdbf4.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'mysql-test/main')
| -rw-r--r-- | mysql-test/main/range_notembedded.result | 9 | ||||
| -rw-r--r-- | mysql-test/main/range_notembedded.test | 10 |
2 files changed, 19 insertions, 0 deletions
diff --git a/mysql-test/main/range_notembedded.result b/mysql-test/main/range_notembedded.result index 0ecf47c892e..eeab230e72f 100644 --- a/mysql-test/main/range_notembedded.result +++ b/mysql-test/main/range_notembedded.result @@ -239,3 +239,12 @@ insert into t1 values (1,1,1,1), (2,2,2,2), (3,3,3,3); id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t1 range PRIMARY PRIMARY 2 NULL 3 Using where drop table t1; +# +# MDEV-25069: Assertion `root->weight >= ...' failed in SEL_ARG::tree_delete #2 +# +SELECT * +FROM mysql.help_relation +WHERE +(help_topic_id < '2' OR help_topic_id != 8 OR help_topic_id < 1) AND +help_keyword_id = help_topic_id; +help_topic_id help_keyword_id diff --git a/mysql-test/main/range_notembedded.test b/mysql-test/main/range_notembedded.test index 5f6a05e8d91..4e77d6a4810 100644 --- a/mysql-test/main/range_notembedded.test +++ b/mysql-test/main/range_notembedded.test @@ -140,3 +140,13 @@ WHERE --enable_query_log drop table t1; + +--echo # +--echo # MDEV-25069: Assertion `root->weight >= ...' failed in SEL_ARG::tree_delete #2 +--echo # + +SELECT * +FROM mysql.help_relation +WHERE + (help_topic_id < '2' OR help_topic_id != 8 OR help_topic_id < 1) AND + help_keyword_id = help_topic_id; |