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

port Bug#22996442 INNODB: MAKE UNIV_DEBUG DEPEND ON DBUG_OFF, AND REPLACE REFERENCES TO DBUG_OFF

    XMLWordPrintable

    Details

      Description

      Port my bug fix from MySQL 8.0.0:

      commit 29a427db00846c70d1eee2b8e5727886c0af911d
      Author: Marko Mäkelä <marko.makela@oracle.com>
      Date:   Tue Mar 29 13:20:32 2016 +0300
       
          Bug#22996442 INNODB: MAKE UNIV_DEBUG DEPEND ON DBUG_OFF, AND
          REPLACE REFERENCES TO DBUG_OFF
          
          InnoDB used two independent compile-time flags that distinguish
          debug and non-debug builds, which is confusing.
          
          We replace all DBUG_OFF references in InnoDB with UNIV_DEBUG.
          Also, make ut_ad() and alias of DBUG_ASSERT().
          
          RB: 12244
          Reviewed-by: Jimmy Yang <jimmy.yang@oracle.com>
      

      During the review of the above work, I was requested to replace all occurrences of #ifndef DBUG_OFF with #ifdef UNIV_DEBUG.
      I would not want to do that, because DBUG_OFF is the MySQL/MariaDB native symbol, and UNIV_DEBUG is derived from that.
      Also, avoiding those changes reduces the size of the commit and makes future merges from MySQL 5.7 to 10.2 easier.

        Attachments

          Activity

            People

            Assignee:
            marko Marko Mäkelä
            Reporter:
            ratzpo Rasmus Johansson
            Votes:
            0 Vote for this issue
            Watchers:
            3 Start watching this issue

              Dates

              Created:
              Updated:
              Resolved: