Merge 10.3 into 10.4

This commit is contained in:
Marko Mäkelä 2021-03-05 10:36:51 +02:00
commit 8bab5bb332
34 changed files with 743 additions and 264 deletions

View file

@ -4941,6 +4941,20 @@ EXECUTE stmt;
EXECUTE stmt;
DROP TABLE t1;
--echo #
--echo # MDEV-25006: Failed assertion on executing EXPLAIN DELETE statement as a prepared statement
--echo #
CREATE TABLE t1(c1 CHAR(255) PRIMARY KEY);
PREPARE stmt FROM 'EXPLAIN DELETE b FROM t1 AS a JOIN t1 AS b';
EXECUTE stmt;
DROP TABLE t1;
CREATE TABLE t1(a INT);
PREPARE stmt FROM 'EXPLAIN DELETE FROM t1.* USING t1';
EXECUTE stmt;
DEALLOCATE PREPARE stmt;
DROP TABLE t1;
--echo #
--echo # End of 10.2 tests
--echo #