7 Commits

Author	SHA1	Message	Date
Oleksandr Byelkin	c07325f932	Merge branch '10.3' into 10.4	2019-05-19 20:55:37 +02:00
Oleksandr Byelkin	c51f85f882	Merge branch '10.2' into 10.3	2019-05-12 17:20:23 +02:00
Marko Mäkelä	ca80e14a88	Merge 10.3 into 10.4	2019-03-22 13:20:44 +02:00
Alexander Barkov	1c60f40868	Merge remote-tracking branch 'origin/10.2' into 10.3	2019-03-22 14:41:36 +04:00
Alexander Barkov	29f77d41f5	MDEV-18205 Assertion `str_length < len' failed in Binary_string::realloc_raw ... Bug was introduced in this commit: commit: a9ca819897 Call alloc() instead of realloc() Use alloc() if we don't need original string (avoid copy) Removed not needed test of str_length in sql_string.cc copy_if_not_alloced() was forgotten when changing realloc()'s to alloc()'s. Changing it now.	2019-01-14 20:51:05 +04:00
Vicențiu Ciorbaru	65eefcdc60	Merge remote-tracking branch '10.2' into 10.3	2018-04-12 12:41:19 +03:00
Michael Widenius	a7abddeffa	Create 'main' test directory and move 't' and 'r' there	2018-03-29 13:59:44 +03:00