diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2019-08-30 16:52:43 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2019-08-30 16:52:43 +0200 |
| commit | 14149d6c33630941cfdf92770ca027c974f9208a (patch) | |
| tree | 77daee382956245fb846e9d0be737b7a6394ffde /sql | |
| parent | 1688a22612e1fed02056cdf37574ffa2ef33aa2d (diff) | |
| parent | 6c593cd35868cb47eb9d4a712575668a243f3186 (diff) | |
| download | mariadb-git-14149d6c33630941cfdf92770ca027c974f9208a.tar.gz | |
Merge remote-tracking branch 'connect/10.2' into 10.2
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 77bf2e580a0..2239544dc88 100644 --- a/sql/item.h +++ b/sql/item.h @@ -689,7 +689,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 97aac3a8bb5..3169efbefe6 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -1982,7 +1982,7 @@ before_trg_err: /****************************************************************************** - Check that all fields with arn't null_fields are used + Check that there aren't any null_fields ******************************************************************************/ |