[MDEV-12735] Accidental revert of MDEV-6933 Created: 2017-05-08  Updated: 2017-05-09  Resolved: 2017-05-09

Status: Closed
Project: MariaDB Server
Component/s: Storage Engine - InnoDB
Affects Version/s: 10.2
Fix Version/s: 10.2.6

Type: Bug Priority: Minor
Reporter: Octavian Moraru (Inactive) Assignee: Jan Lindström (Inactive)
Resolution: Fixed Votes: 0
Labels: None


 Description   

Commit 2e814d4 merges InnoDB 5.7 from mysql-5.7.9, along with other fixes. I believe it also accidentally reverts 7371dfa (MDEV-6933). Specifically, it adds back these two lines in storage/innobase/lock/lock0wait.cc:

/* Wake the lock timeout monitor thread, if it is suspended */
 
 
 
os_event_set(lock_sys->timeout_event);

I couldn't find any reference to a ticket that was explicitly resolved by reverting this, so I presume the cause is an incorrect merge (mysql-5.7.9 still has that code in lock0wait.cc).

 Comments   
Comment by Elena Stepanova [ 2017-05-08 ]

ATTN jplindst.

Comment by Daniel Black [ 2017-05-09 ]

also in innodb accidental reverts: https://github.com/MariaDB/server/pull/388

edit: merged https://github.com/MariaDB/server/commit/9a73af0152b4efee235147b0a16f31400e0c1f90

Comment by Jan Lindström (Inactive) [ 2017-05-09 ]

commit d0ce8704665c63005c599579ff86692f23240496
Author: Jan Lindström <jan.lindstrom@mariadb.com>
Date: Tue May 9 10:55:17 2017 +0300

MDEV-12735: Accidental revert of MDEV-6933

Generated at Thu Feb 08 08:00:03 UTC 2024 using Jira 8.20.16#820016-sha1:9d11dbea5f4be3d4cc21f03a88dd11d8c8687422.