Marko Mäkelä ca40330d1d Fix a deadlock in thd_report_wait_for() ... Unlike commit a54abf0175 claimed, the caller of THD::awake() may actually hold the InnoDB lock_sys->mutex. That commit introduced a deadlock of threads in the replication slave when running the test rpl.rpl_parallel_optimistic_nobinlog. lock_trx_handle_wait(): Expect the callers to acquire and release lock_sys->mutex and trx->mutex. innobase_kill_query(): Restore the logic for conditionally acquiring and releasing the mutexes. THD::awake() can be called from inside InnoDB while holding one or both mutexes, via thd_report_wait_for() and via wsrep_innobase_kill_one_trx().		2018-03-16 08:23:56 +02:00
..
ha_innodb.cc	Fix a deadlock in thd_report_wait_for()	2018-03-16 08:23:56 +02:00
ha_innodb.h	Merge tag 'mariadb-10.0.32' into 10.0-galera	2017-08-09 08:56:11 +03:00
handler0alter.cc	Merge branch 'github/10.0' into 10.1	2018-02-02 10:09:44 +01:00
i_s.cc	Merge branch '10.0' into 10.1	2017-10-22 13:03:41 +02:00
i_s.h	Merge 10.0 into 10.1	2017-05-19 12:29:37 +03:00