diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2019-09-02 09:01:54 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2019-09-02 09:01:54 +0200 |
| commit | b0ff5a6a7393c057cd201aff63279e45d3e0cc49 (patch) | |
| tree | ea34655cbaaf8e196535205028343ae5d88b2a42 /sql | |
| parent | 597b070f8254439aa5f555c6868f3d9b8d518238 (diff) | |
| parent | d5a11a1f0208df87ee9885f5eb7a7427ee9a6f4a (diff) | |
| download | mariadb-git-b0ff5a6a7393c057cd201aff63279e45d3e0cc49.tar.gz | |
Merge branch '10.2' into 10.3
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/item.h | 2 | ||||
| -rw-r--r-- | sql/sql_insert.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sql/item.h b/sql/item.h index d472c0d358e..db3fba15000 100644 --- a/sql/item.h +++ b/sql/item.h @@ -670,7 +670,7 @@ public: /* Cache of the result of is_expensive(). */ int8 is_expensive_cache; - /* Reuse size, only used by SP local variable assignment, otherwize 0 */ + /* Reuse size, only used by SP local variable assignment, otherwise 0 */ uint rsize; protected: diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index 709f3ad87a0..5604270ce8f 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -2072,7 +2072,7 @@ before_trg_err: /****************************************************************************** - Check that all fields with arn't null_fields are used + Check that there aren't any null_fields ******************************************************************************/ |