database/mariadb
database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-05-31 08:42:45 +03:00
Code

Merge 5.5 into 10.1

Browse Source 
Null merge the MDEV-14383 fix; it affects 5.5 only.
This commit is contained in:
Marko Mäkelä 2019-09-11 08:06:53 +03:00
commit d6f0e60a67
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sql/item.h
View File

@ -650,7 +650,7 @@ public:
/* Cache of the result of is_expensive(). */ /* Cache of the result of is_expensive(). */
int8 is_expensive_cache; 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; uint rsize;
protected: protected:

2
sql/sql_insert.cc
View File

@ -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
******************************************************************************/ ******************************************************************************/