diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-11 08:06:53 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-11 08:11:46 +0300 |
| commit | d6f0e60a67a5e81dc6fd90a117db2aa5fb658664 (patch) | |
| tree | faef27ab096235b533735084dcad1d0bbda1e096 | |
| parent | 031c695b8c865e5eb6c4c09ced404ae08f98430f (diff) | |
| parent | df61c5849987267f5daac671e0af8550ae613621 (diff) | |
| download | mariadb-git-d6f0e60a67a5e81dc6fd90a117db2aa5fb658664.tar.gz | |
Merge 5.5 into 10.1
Null merge the MDEV-14383 fix; it affects 5.5 only.
| -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 a182d99f701..7f6236269bd 100644 --- a/sql/item.h +++ b/sql/item.h @@ -650,7 +650,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 f67897bb9c5..11ed2c67bb7 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -1951,7 +1951,7 @@ before_trg_err: /****************************************************************************** - Check that all fields with arn't null_fields are used + Check that there aren't any null_fields ******************************************************************************/ |