Uploaded image for project: 'MariaDB Server'
  1. MariaDB Server
  2. MDEV-12735

Accidental revert of MDEV-6933

Details

    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).

      Attachments

        Activity

          Ascending order - Click to sort in descending order
          omoraru Octavian Moraru (Inactive) created issue -
          elenst Elena Stepanova made changes -
          Field Original Value New Value
          Fix Version/s 10.2 [ 14601 ]
          Assignee Marko Mäkelä [ marko ]
          elenst Elena Stepanova added a comment -

          ATTN jplindst.

          elenst Elena Stepanova added a comment - ATTN jplindst .
          danblack Daniel Black added a comment - - edited

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

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

          danblack Daniel Black added a comment - - edited also in innodb accidental reverts: https://github.com/MariaDB/server/pull/388 edit: merged https://github.com/MariaDB/server/commit/9a73af0152b4efee235147b0a16f31400e0c1f90
          marko Marko Mäkelä made changes -
          Assignee Marko Mäkelä [ marko ] Jan Lindström [ jplindst ]
          jplindst Jan Lindström (Inactive) made changes -
          Status Open [ 1 ] In Progress [ 3 ]
          jplindst Jan Lindström (Inactive) added a comment -

          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

          jplindst Jan Lindström (Inactive) added a comment - 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
          jplindst Jan Lindström (Inactive) made changes -
          Fix Version/s 10.2.6 [ 22527 ]
          Fix Version/s 10.2 [ 14601 ]
          Resolution Fixed [ 1 ]
          Status In Progress [ 3 ] Closed [ 6 ]
          serg Sergei Golubchik made changes -
          Workflow MariaDB v3 [ 80664 ] MariaDB v4 [ 152114 ]

          People

            jplindst Jan Lindström (Inactive)
            omoraru Octavian Moraru (Inactive)
            Votes:
            0 Vote for this issue
            Watchers:
            5 Start watching this issue

            Dates

              Created:
              Updated:
              Resolved:

              Git Integration

                Error rendering 'com.xiplink.jira.git.jira_git_plugin:git-issue-webpanel'. Please contact your Jira administrators.