205 Commits

Author	SHA1	Message	Date
Alexander Barkov	294a426088	Merge remote-tracking branch 'origin/10.2' into 10.3	2018-07-24 18:44:49 +04:00
Alexander Barkov	e61568ee93	Merge remote-tracking branch 'origin/10.3' into 10.4	2018-07-03 14:02:05 +04:00
Sergei Golubchik	36e59752e7	Merge branch '10.2' into 10.3	2018-06-30 16:39:20 +02:00
Alexander Barkov	ffe83e8e7b	MDEV-16351 JSON_OBJECT() treats hybrid functions with boolean arguments as numbers ... Now the boolean data type is preserved in hybrid functions and MIN/MAX, so COALESCE(bool_expr,bool_expr) and MAX(bool_expr) are correctly detected by JSON_OBJECT() as being boolean rather than numeric expressions.	2018-05-31 18:52:32 +04:00
Michael Widenius	a7abddeffa	Create 'main' test directory and move 't' and 'r' there	2018-03-29 13:59:44 +03:00