diff options
| author | unknown <msvensson@neptunus.(none)> | 2005-06-22 20:59:34 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2005-06-22 20:59:34 +0200 |
| commit | 6a8945e33293b1091da9fd6b0232ca5a8af3a338 (patch) | |
| tree | c494d9d92a94978236e21ab8bf4aa570bf161119 /sql/sql_base.cc | |
| parent | 406673b0b320d66562e2778323c59034c22be225 (diff) | |
| parent | 31d07866873631f79177fb1277bacfec62062c80 (diff) | |
| download | mariadb-git-6a8945e33293b1091da9fd6b0232ca5a8af3a338.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
sql/sql_base.cc:
Auto merged
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index b4c212afb3f..e5d5e95cb5a 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -2096,7 +2096,8 @@ find_field_in_tables(THD *thd, Item_ident *item, TABLE_LIST *tables, return (Field*) 0; } bool allow_rowid= tables && !tables->next; // Only one table - for (; tables ; tables=tables->next) + uint table_idx= 0; + for (; tables ; tables=tables->next, table_idx++) { if (!tables->table) { @@ -2124,7 +2125,9 @@ find_field_in_tables(THD *thd, Item_ident *item, TABLE_LIST *tables, 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) |