diff options
| author | Aleksey Midenkov <midenok@gmail.com> | 2017-11-07 00:37:49 +0300 |
|---|---|---|
| committer | Aleksey Midenkov <midenok@gmail.com> | 2017-11-07 00:37:49 +0300 |
| commit | d8d725101992d50b00edf149e7ccd7f720b850dc (patch) | |
| tree | 5797a3c9af2d2db487ec77093608f89b7dabe62f /sql/sql_trigger.h | |
| parent | 835cbbcc7b797188a89671019f2b2844e1a14e0c (diff) | |
| parent | ce66d5b2a53d76d286e8443807c4ebd7743cc354 (diff) | |
| download | mariadb-git-d8d725101992d50b00edf149e7ccd7f720b850dc.tar.gz | |
System Versioning pre0.12
Merge remote-tracking branch 'origin/archive/2017-10-17' 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 8847680c7b2..8cbb6c44c66 100644 --- a/sql/sql_trigger.h +++ b/sql/sql_trigger.h @@ -310,7 +310,7 @@ private: inline Field **TABLE::field_to_fill() { return triggers && triggers->nullable_fields() ? triggers->nullable_fields() - : field; + : non_generated_field ? non_generated_field : field; } |