diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-05-02 21:43:24 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-05-02 21:43:24 +0300 |
| commit | 158247d3bdd5cc36dd37568c76e7db081b19eb5a (patch) | |
| tree | 88c62e896b0758847a9eea2311dc1a7d587708f4 /sql/sql_trigger.h | |
| parent | 0d6fb43e6d6ca1eb9060d7369efcbabcda324f1e (diff) | |
| parent | 2370eeb028b269243633b18f7661dca999089a41 (diff) | |
| download | mariadb-git-158247d3bdd5cc36dd37568c76e7db081b19eb5a.tar.gz | |
Merge 10.2 into 10.3
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); } |