Merge 5.5 into 10.1

Null merge the MDEV-14383 fix; it affects 5.5 only.
MariaDB · Sep 11, 2019 · d6f0e60 · d6f0e60
2 parents 031c695 + df61c58
commit d6f0e60
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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:

diff --git 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
 ******************************************************************************/