diff options
| author | Sinisa@sinisa.nasamreza.org <> | 2002-11-29 17:06:26 +0200 |
|---|---|---|
| committer | Sinisa@sinisa.nasamreza.org <> | 2002-11-29 17:06:26 +0200 |
| commit | 959b30672e5a84775be9cb7fdf9c47ec8159f857 (patch) | |
| tree | 5c8bf57b12db47384654bd4f4bfe1539401a8503 /sql/sql_base.cc | |
| parent | fd11c8040030b3d7449e5309a4bae06ce4f03fd4 (diff) | |
| parent | 5b7a2f56ee8b33ec00a6601030e0d261ee4f15f7 (diff) | |
| download | mariadb-git-959b30672e5a84775be9cb7fdf9c47ec8159f857.tar.gz | |
Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 8f74903027e..18ff2bf38db 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -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, |