diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-05-05 15:03:48 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-05-05 15:06:44 +0300 |
| commit | d3dcec5d657b83ca08b32f5a64b5dff01edfb13e (patch) | |
| tree | 5fd801aa0daf5e74689b17ed50a086a8acd7d6e7 /sql/sql_trigger.h | |
| parent | b132b8895e2e59df457e063451f186b53576b034 (diff) | |
| parent | e8dd18a474ee6b48eb7f92e3831f9e359b0bdc6e (diff) | |
| download | mariadb-git-d3dcec5d657b83ca08b32f5a64b5dff01edfb13e.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/sql_trigger.h')
| -rw-r--r-- | sql/sql_trigger.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_trigger.h b/sql/sql_trigger.h index 9cd6c61891a..210e52887f1 100644 --- a/sql/sql_trigger.h +++ b/sql/sql_trigger.h @@ -278,7 +278,7 @@ public: Field **nullable_fields() { return record0_field; } void reset_extra_null_bitmap() { - size_t null_bytes= (trigger_table->s->stored_fields - + size_t null_bytes= (trigger_table->s->fields - trigger_table->s->null_fields + 7)/8; bzero(extra_null_bitmap, null_bytes); } |