database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge 10.3 into 10.4

Browse Source 
In main.index_merge_myisam we remove the test that was added in
commit a2d24def8c because
it duplicates the test case that was added in
commit 5af12e4635.
This commit is contained in:
Marko Mäkelä
2020-04-16 12:12:26 +03:00
parent 5679a2b6b3 6577a7a8f2
commit af91266498
140 changed files with 2531 additions and 1372 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/main/func_debug.result
View File

@ -1681,7 +1681,7 @@ a
2
9
Warnings:
Note 1105 DBUG: Item_subselect::exec (select max(`test`.`t1`.`a`) from `test`.`t1`)
Note 1105 DBUG: Item_subselect::exec (select max(`test`.`t1`.`a`) from `test`.`t...
DROP TABLE t1;
SET SESSION debug_dbug="-d,Item_subselect";
#