Marko Mäkelä efb8485d85 Merge 10.3 into 10.4, except for MDEV-20265 ...

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.

2019-08-23 08:06:17 +03:00

70 KiB

Raw Blame History

View Raw