database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge remote-tracking branch 'origin/10.3' into 10.4

Browse Source
This commit is contained in:
Alexander Barkov
2018-07-03 14:02:05 +04:00
parent 4b0cedf82d c3289d27ee
commit e61568ee93
448 changed files with 11186 additions and 4451 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/sql_base.cc
View File

@ -1572,6 +1572,12 @@ bool open_table(THD *thd, TABLE_LIST *table_list, Open_table_context *ot_ctx)
DBUG_RETURN(true);
}
if (!table_list->db.str)
{
my_error(ER_NO_DB_ERROR, MYF(0));
DBUG_RETURN(true);
}
key_length= get_table_def_key(table_list, &key);
/*
@ -5585,6 +5591,9 @@ find_field_in_natural_join(THD *thd, TABLE_LIST *table_ref, const char *name, si
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