database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Bug #9728 fix merge

Browse Source
This commit is contained in:
evgen@moonbone.local
2005-06-23 01:02:43 +04:00
parent bafab2dd6f 54d3b00184
commit 5c8e3341d3
7 changed files with 74 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sql_base.cc
View File

@@ -2756,9 +2756,9 @@ find_field_in_tables(THD *thd, Item_ident *item, TABLE_LIST *tables,
return (Field*) not_found_field;
return (Field*) 0;
}
bool allow_rowid= tables && !tables->next_local; // Only one table
for (; tables ; tables= tables->next_local)
uint table_idx= 0;
for (; tables ; tables= tables->next_local, table_idx++)
{
if (!tables->table && !tables->ancestor)
{
@@ -2793,7 +2793,9 @@ find_field_in_tables(THD *thd, Item_ident *item, TABLE_LIST *tables,
my_error(ER_NON_UNIQ_ERROR, MYF(0), name, thd->where);
return (Field*) 0;
}
found=field;
found= field;
if (table_idx == 0 && item->item_flags & MY_ITEM_PREFER_1ST_TABLE)
break;
}
}
if (found)