diff options
| author | unknown <monty@mashka.mysql.fi> | 2002-07-23 22:09:54 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2002-07-23 22:09:54 +0300 |
| commit | c550c1afdfb5df528023ec3c71724b247e868310 (patch) | |
| tree | 286e84552cfe72dd5efa214706b0e6b53d5607b2 /sql | |
| parent | 7b689b7ba0398ff1613e287a0af22104c575c39c (diff) | |
| parent | 78cfc1197d308fc1c73649cdd164fe801135e2dc (diff) | |
| download | mariadb-git-c550c1afdfb5df528023ec3c71724b247e868310.tar.gz | |
Merge work:/home/bk/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0
Docs/manual.texi:
Auto merged
sql/sql_base.cc:
Auto merged
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_base.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 29cc925218f..f4538fefbea 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -1608,7 +1608,7 @@ find_field_in_tables(THD *thd,Item_field *item,TABLE_LIST *tables) for (; tables ; tables=tables->next) { if (!strcmp(tables->name,table_name) && - (!db || !strcmp(db,tables->db))) + (!db || !tables->db || !strcmp(db,tables->db))) { found_table=1; Field *find=find_field_in_table(thd,tables->table,name,length, |