[MDEV-12269] port Bug#22996442 INNODB: MAKE UNIV_DEBUG DEPEND ON DBUG_OFF, AND REPLACE REFERENCES TO DBUG_OFF Created: 2017-03-15  Updated: 2017-03-16  Resolved: 2017-03-16

Status: Closed
Project: MariaDB Server
Component/s: Storage Engine - InnoDB
Fix Version/s: 10.2.5

Type: Task Priority: Major
Reporter: Rasmus Johansson (Inactive) Assignee: Marko Mäkelä
Resolution: Fixed Votes: 0
Labels: 10.2-ga

Epic Link: InnoDB fixes from MySQL

 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.



 Comments   
Comment by Marko Mäkelä [ 2017-03-15 ]

bb-10.2-marko

Comment by Jan Lindström (Inactive) [ 2017-03-16 ]

ok to push.

Generated at Thu Feb 08 07:56:25 UTC 2024 using Jira 8.20.16#820016-sha1:9d11dbea5f4be3d4cc21f03a88dd11d8c8687422.