diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-11-03 19:11:36 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-11-03 19:11:36 +0200 |
| commit | c498250888ec126fddda2867d1239b2a7734482f (patch) | |
| tree | e308174c977c0981d8e36f6f9b791b1b266d0cb0 /sql/table.h | |
| parent | 09a1f0075a8d5752dd7b2940a20d86a040af1741 (diff) | |
| parent | 1418439d3823fe059b41092af72ab32d5e7cd7ab (diff) | |
| download | mariadb-git-c498250888ec126fddda2867d1239b2a7734482f.tar.gz | |
Merge 10.5 into 10.6mariadb-10.5.7bb-10.6-georg10.6-vatu
Diffstat (limited to 'sql/table.h')
| -rw-r--r-- | sql/table.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/table.h b/sql/table.h index 71884c919ad..48a08c24de5 100644 --- a/sql/table.h +++ b/sql/table.h @@ -3195,7 +3195,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); |