Merge 5.5 into 10.1

Null merge the MDEV-14383 fix; it affects 5.5 only.
6 years ago · d6f0e60a67
2 changed files with 2 additions and 2 deletions
--- 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:
--- 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
 ******************************************************************************/