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

Merge branch '10.4' into 10.5

This commit is contained in:
Sergei Golubchik
2024-01-31 17:32:53 +01:00
59 changed files with 980 additions and 529 deletions

View File

@ -657,6 +657,22 @@ DROP TEMPORARY TABLE t1;
--echo # End of 10.2 tests
--echo #
--echo #
--echo # MDEV-31523: Using two temporary tables in OPTIMIZE TABLE lead to crash
--echo #
CREATE TEMPORARY TABLE t1 (c INT) ENGINE=MyISAM;
CREATE TEMPORARY TABLE t2 (c INT) ENGINE=MyISAM;
optimize TABLE t1,t2;
SHOW TABLES;
--echo # in 11.2 and above here should be listed above used temporary tables
DROP TEMPORARY TABLE t1, t2;
--echo #
--echo # End of 10.4 tests
--echo #
#
# DROP TEMPORARY TABLE fails in the middle
#
@ -683,4 +699,3 @@ drop temporary table t2;
--echo #
--echo # End of 10.5 tests
--echo #