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
..
client.c	Merge 10.3 into 10.4	2019-06-19 10:49:00 +03:00
client_plugin.c	Merge branch '10.2' into 10.3	2019-07-26 22:42:35 +02:00
conf_to_src.c	Merge 10.1 into 10.2	2019-05-13 17:54:04 +03:00
errmsg.c	Merge 10.1 into 10.2	2019-05-13 17:54:04 +03:00
my_time.c	Merge 10.3 into 10.4, except for MDEV-20265	2019-08-23 08:06:17 +03:00
my_user.c	Merge 10.2 into 10.3	2019-05-14 17:18:46 +03:00
mysql_async.c	MDEV-15091 : Windows, 64bit: reenable and fix warning C4267 (conversion from 'size_t' to 'type', possible loss of data)	2018-02-06 12:55:58 +00:00
pack.c	Merge 10.1 into 10.2	2019-05-13 17:54:04 +03:00