Commit graph

2 commits

Author SHA1 Message Date
Sachin Setiya
5077cc0b1a Fix Merge Error 2017-08-23 16:49:42 +05:30
Teemu Ollakka
dd72d66c45 MW-373 Wait for wsrep_ready at startup when provider is loaded
Conflicts:
	mysql-test/include/kill_and_restart_mysqld.inc
2017-08-14 14:41:12 +03:00