diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-06-10 17:16:27 +0300 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-06-10 17:16:27 +0300 |
| commit | 3ead95118098340f7fe36e34e1690839d183db1e (patch) | |
| tree | 90dcbcf7f6793609af78220fd45bf7337f00ff62 /sql/sql_base.cc | |
| parent | 7053e26e1869962ef473043686996f40ac0fb88c (diff) | |
| parent | 1d43f71c7b4c39a6fd196c104b5ebafb65376199 (diff) | |
| download | mariadb-git-3ead95118098340f7fe36e34e1690839d183db1e.tar.gz | |
Merge branch '5.5' into 10.0
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index dc61f396605..0b14e5777c3 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -6160,6 +6160,9 @@ find_field_in_natural_join(THD *thd, TABLE_LIST *table_ref, const char *name, column reference. See create_view_field() for details. */ item= nj_col->create_item(thd); + if (!item) + DBUG_RETURN(NULL); + /* *ref != NULL means that *ref contains the item that we need to replace. If the item was aliased by the user, set the alias to |