Merge cluster-7.4 -> cluster-7.5

blaudden · blaudden · commit 7f616edd836b · 2021-05-12T13:12:07.000+02:00
diff --git a/sql/ndb_repl_tab.cc b/sql/ndb_repl_tab.cc
@@ -307,20 +307,16 @@ Ndb_rep_tab_reader::scan_candidates(Ndb* ndb,
       /* Compare row to searchkey to get quality of match */
       int match_quality= Ndb_rep_tab_key::get_match_quality(&searchkey,
                                                             &row.key);
-#ifndef NDEBUG
-      {
-        row.null_terminate_strings();
+      row.null_terminate_strings();
 
-        DBUG_PRINT("info", ("Candidate : %s.%s %u : %u %s"
+      DBUG_PRINT("info", ("Candidate : %s.%s %u : %u %s"
                             " Match quality : %u.",
                             row.key.get_db(),
                             row.key.get_table_name(),
                             row.key.server_id,
                             row.binlog_type,
                             row.get_conflict_fn_spec(),
                             match_quality));
-      }
-#endif
 
       if (match_quality > 0)
       {
