Merge 5.5 into 10.1

Null merge the MDEV-14383 fix; it affects 5.5 only.

Merge 5.5 into 10.1
Null merge the MDEV-14383 fix; it affects 5.5 only.
d6f0e60a · Marko Mäkelä · 031c695b · df61c584 · d6f0e60a · d6f0e60a
Commit d6f0e60a authored Sep 11, 2019 by Marko Mäkelä
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

sql/item.h sql/item.h +1 -1

sql/sql_insert.cc sql/sql_insert.cc +1 -1

No files found.
--- a/sql/item.h
+++ b/sql/item.h
@@ -650,7 +650,7 @@ class Item: public Value_source,
  /* 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:

--- a/sql/sql_insert.cc
+++ b/sql/sql_insert.cc
@@ -1951,7 +1951,7 @@ int write_record(THD *thd, TABLE *table,COPY_INFO *info)
 /******************************************************************************
-  Check that all fields with arn't null_fields are used
+  Check that there aren't any null_fields
 ******************************************************************************/