1 files changed, 2 insertions, 1 deletions
diff --git a/sql/table.h b/sql/table.h
index c7e7a39b46f..1247840c605 100644
--- a/sql/table.h
+++ b/sql/table.h
@@ -3137,7 +3137,8 @@ inline void mark_as_null_row(TABLE *table)
 {
   table->null_row=1;
   table->status|=STATUS_NULL_ROW;
-  bfill(table->null_flags,table->s->null_bytes,255);
+  if (table->s->null_bytes)
+    bfill(table->null_flags,table->s->null_bytes,255);
 }
 
 bool is_simple_order(ORDER *order);