mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
many, many changes
mysql-test/r/subselect.result: Auto merged sql/sql_base.cc: Auto merged sql/sql_lex.cc: Auto merged sql/sql_parse.cc: Auto merged include/mysqld_error.h: Merging changes ... mysql-test/t/subselect.test: Merging changes ... sql/share/czech/errmsg.txt: Merging changes ... sql/share/danish/errmsg.txt: Merging changes ... sql/share/dutch/errmsg.txt: Merging changes ... sql/share/english/errmsg.txt: Merging changes ... sql/share/estonian/errmsg.txt: Merging changes ... sql/share/french/errmsg.txt: Merging changes ... sql/share/german/errmsg.txt: Merging changes ... sql/share/greek/errmsg.txt: Merging changes ... sql/share/hungarian/errmsg.txt: Merging changes ... sql/share/italian/errmsg.txt: Merging changes ... sql/share/japanese/errmsg.txt: Merging changes ... sql/share/korean/errmsg.txt: Merging changes ... sql/share/norwegian-ny/errmsg.txt: Merging changes ... sql/share/norwegian/errmsg.txt: Merging changes ... sql/share/polish/errmsg.txt: Merging changes ... sql/share/portuguese/errmsg.txt: Merging changes ... sql/share/romanian/errmsg.txt: Merging changes ... sql/share/russian/errmsg.txt: Merging changes ... sql/share/serbian/errmsg.txt: Merging changes ... sql/share/slovak/errmsg.txt: Merging changes ... sql/share/spanish/errmsg.txt: Merging changes ... sql/share/swedish/errmsg.txt: Merging changes ... sql/share/ukrainian/errmsg.txt: Merging changes ...
This commit is contained in:
@ -1894,13 +1894,13 @@ find_field_in_tables(THD *thd, Item_ident *item, TABLE_LIST *tables,
|
||||
const char *name=item->field_name;
|
||||
uint length=(uint) strlen(name);
|
||||
|
||||
if (table_name)
|
||||
if (table_name && table_name[0])
|
||||
{ /* Qualified field */
|
||||
bool found_table=0;
|
||||
for (; tables ; tables=tables->next)
|
||||
{
|
||||
if (!strcmp(tables->alias,table_name) &&
|
||||
(!db || !strcmp(db,tables->db)))
|
||||
(!db || !tables->db || !tables->db[0] || !strcmp(db,tables->db)))
|
||||
{
|
||||
found_table=1;
|
||||
Field *find=find_field_in_table(thd,tables->table,name,length,
|
||||
|
Reference in New Issue
Block a user