diff options
| author | unknown <monty@mishka.local> | 2005-06-27 16:47:44 +0300 |
|---|---|---|
| committer | unknown <monty@mishka.local> | 2005-06-27 16:47:44 +0300 |
| commit | 6c46a993d7efe183d931ce2f25287afedf223544 (patch) | |
| tree | bb2d6c7acb2150fe39d8ba532e2d5a484c225e2f /sql/sql_base.cc | |
| parent | e00981bb5ff6d310e411fc58acc1369e0899285b (diff) | |
| parent | d10877ce8ce4f939f88f79e6ad42af251fd51ebe (diff) | |
| download | mariadb-git-6c46a993d7efe183d931ce2f25287afedf223544.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mishka.local:/home/my/mysql-4.1
sql/ha_ndbcluster.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index e5d5e95cb5a..c9861790b06 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -2003,7 +2003,7 @@ find_field_in_tables(THD *thd, Item_ident *item, TABLE_LIST *tables, const char *name=item->field_name; uint length=(uint) strlen(name); char name_buff[NAME_LEN+1]; - + bool allow_rowid; if (item->cached_table) { @@ -2095,9 +2095,8 @@ 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; // Only one table - uint table_idx= 0; - for (; tables ; tables=tables->next, table_idx++) + allow_rowid= tables && !tables->next; // Only one table + for (; tables ; tables=tables->next) { if (!tables->table) { @@ -2126,8 +2125,6 @@ find_field_in_tables(THD *thd, Item_ident *item, TABLE_LIST *tables, return (Field*) 0; } found= field; - if (table_idx == 0 && item->item_flags & MY_ITEM_PREFER_1ST_TABLE) - break; } } if (found) |