6 Commits

Author	SHA1	Message	Date
Oleksandr Byelkin	7f264997dd	Merge branch '10.2' into 10.3	2021-08-02 11:41:00 +02:00
Sergei Golubchik	83bbe36831	fix sporadic failures of main.processlist_notembedded ... the test was doing --replace_result $con_id con_id eval SHOW EXPLAIN FOR $con_id; with the intention of replacing the variable part of the statement in the result log. But actually replace_result replaces everything that matches. In particular, when $con_id is 100, the warning Note 1003 select sleep(100000) becomes Note con_id3 select sleep(con_id000)	2021-01-12 10:25:04 +01:00
Oleksandr Byelkin	794f665139	Merge branch '10.2' into 10.3	2020-10-30 17:23:53 +01:00
Marko Mäkelä	dad7a8ee7d	Merge 10.2 into 10.3	2020-05-27 17:10:39 +03:00
Sergei Golubchik	607467bd63	Merge branch '10.2' into 10.3	2020-05-09 20:20:02 +02:00
Oleksandr Byelkin	55b2281a5d	Merge branch '10.2' into 10.3	2019-10-31 10:58:06 +01:00