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, except for MDEV-20265

Browse Source 
The MDEV-20265 commit e746f451d5
introduces DBUG_ASSERT(right_op == r_tbl) in
st_select_lex::add_cross_joined_table(), and that assertion would
fail in several tests that exercise joins. That commit was skipped
in this merge, and a separate fix of MDEV-20265 will be necessary in 10.4.
This commit is contained in:
Marko Mäkelä
2019-08-23 08:06:17 +03:00
parent 235cf969d2 b96e4424fb
commit efb8485d85
66 changed files with 689 additions and 317 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/innodb/r/innodb_bug68148.result
View File

@ -18,9 +18,7 @@ Tables_in_test
main
ref_table1
ref_table2
# restart and see if we can still access the main table
# restart
SET FOREIGN_KEY_CHECKS=0;
ALTER TABLE `main` ADD INDEX `idx_1` (`ref_id1`);
SHOW CREATE TABLE `main`;
Table Create Table