Replace DBUG_ASSERTs guarded with safety checks with no assume variation

Author: UltraGreed

sql/handler.cc

@@ -1768,7 +1768,7 @@ int ha_commit_trans(THD *thd, bool all)
   DBUG_ASSERT(thd->transaction->stmt.ha_list == NULL ||
               trans == &thd->transaction->stmt);
 
-  DBUG_ASSERT(!thd->in_sub_stmt);
+  DBUG_ASSERT_NO_ASSUME(!thd->in_sub_stmt);
 
   if (thd->in_sub_stmt)
   {

sql/handler.h

@@ -5475,8 +5475,8 @@ class handler :public Sql_alloc
   { return HA_ERR_WRONG_COMMAND; }
   virtual bool set_ha_share_ref(Handler_share **arg_ha_share)
   {
-    DBUG_ASSERT(!ha_share);
-    DBUG_ASSERT(arg_ha_share);
+    DBUG_ASSERT_NO_ASSUME(!ha_share);
+    DBUG_ASSERT_NO_ASSUME(arg_ha_share);
     if (ha_share || !arg_ha_share)
       return true;
     ha_share= arg_ha_share;

sql/lex_charset.cc

@@ -218,7 +218,7 @@ bool Lex_exact_charset_opt_extended_collate::
   if (cl.is_contextually_typed_collate_default())
   {
     CHARSET_INFO *ci= find_mapped_default_collation(used, map);
-    DBUG_ASSERT(ci);
+    DBUG_ASSERT_NO_ASSUME(ci);
     if (!ci)
       return true;
     m_ci= ci;
@@ -446,7 +446,7 @@ Lex_exact_charset_opt_extended_collate::find_compiled_default_collation() const
     The above should never fail, as we have default collations for
     all character sets.
   */
-  DBUG_ASSERT(cs);
+  DBUG_ASSERT_NO_ASSUME(cs);
   return cs;
 }
 

sql/service_wsrep.cc

@@ -195,9 +195,9 @@ extern "C" void wsrep_handle_SR_rollback(THD *bf_thd __attribute__((unused)),
     We should always be in victim_thd context, either client session is
     rolling back or rollbacker thread should be in control.
   */
-  DBUG_ASSERT(victim_thd);
-  DBUG_ASSERT(current_thd == victim_thd);
-  DBUG_ASSERT(wsrep_thd_is_SR(victim_thd));
+  DBUG_ASSERT_NO_ASSUME(victim_thd);
+  DBUG_ASSERT_NO_ASSUME(current_thd == victim_thd);
+  DBUG_ASSERT_NO_ASSUME(wsrep_thd_is_SR(victim_thd));
 
   /* Defensive measure to avoid crash in production. */
   if (!victim_thd) return;

sql/wsrep_mysqld.cc

@@ -447,7 +447,7 @@ void wsrep_init_sidno(const wsrep::id& uuid)
 
 void wsrep_init_schema()
 {
-  DBUG_ASSERT(!wsrep_schema);
+  DBUG_ASSERT_NO_ASSUME(!wsrep_schema);
 
   WSREP_INFO("wsrep_init_schema_and_SR %p", wsrep_schema);
   if (!wsrep_schema)

storage/maria/ma_blockrec.c

@@ -3028,7 +3028,7 @@ static my_bool write_block_record(MARIA_HA *info,
           cur_block++;
         }
 #ifdef SANITY_CHECKS
-        DBUG_ASSERT(!(cur_block >= end_block));
+        DBUG_ASSERT_NO_ASSUME(!(cur_block >= end_block));
         if ((cur_block >= end_block))
           goto crashed;
 #endif

storage/maria/ma_delete.c

@@ -130,7 +130,7 @@ int maria_delete(MARIA_HA *info,const uchar *record)
 
 err:
   save_errno= my_errno;
-  DBUG_ASSERT(save_errno);
+  DBUG_ASSERT_NO_ASSUME(save_errno);
   if (!save_errno)
     save_errno= HA_ERR_INTERNAL_ERROR;          /* Should never happen */
 

storage/maria/ma_update.c

@@ -199,7 +199,7 @@ int maria_update(register MARIA_HA *info, const uchar *oldrec,
 err:
   DBUG_PRINT("error",("key: %d  errno: %d",i,my_errno));
   save_errno= my_errno;
-  DBUG_ASSERT(save_errno);
+  DBUG_ASSERT_NO_ASSUME(save_errno);
   if (!save_errno)
     save_errno= HA_ERR_INTERNAL_ERROR;          /* Should never happen */
 

storage/maria/ma_write.c

@@ -415,7 +415,7 @@ int maria_write(MARIA_HA *info, const uchar *record)
   my_errno=save_errno;
 err2:
   save_errno=my_errno;
-  DBUG_ASSERT(save_errno);
+  DBUG_ASSERT_NO_ASSUME(save_errno);
   if (!save_errno)
     save_errno= HA_ERR_INTERNAL_ERROR;          /* Should never happen */
   DBUG_PRINT("error", ("got error: %d", save_errno));