MDEV-19252 Problem with DBUG_ASSERT_AS_PRINTF and marked_for_write()

Problem was that DBUG_FIX_WRITE_SET was not enabled when using
DBUG_ASSERT_AS_PRINTF

1 files changed, 10 insertions, 5 deletions

diff --git a/sql/field.cc b/sql/field.cc
index 72dc52143a0..e899a1ec4d6 100644
--- a/sql/field.cc
+++ b/sql/field.cc
@@ -67,14 +67,19 @@ inline bool Field::marked_for_read() const
           ptr < table->record[0] + table->s->reclength)));
 }
 
+/*
+  The name of this function is a bit missleading as in 10.4 we don't
+  have to test anymore if the field is computed. Instead we mark
+  changed fields with DBUG_FIX_WRITE_SET() in table.cc
+*/
 
 inline bool Field::marked_for_write_or_computed() const
 {
-  return is_stat_field || !table ||
-         (!table->write_set ||
-          bitmap_is_set(table->write_set, field_index) ||
-          (!(ptr >= table->record[0] &&
-          ptr < table->record[0] + table->s->reclength)));
+  return (is_stat_field || !table ||
+          (!table->write_set ||
+           bitmap_is_set(table->write_set, field_index) ||
+           (!(ptr >= table->record[0] &&
+              ptr < table->record[0] + table->s->reclength))));
 }