diff options
| author | unknown <gkodinov/kgeorge@magare.gmz> | 2007-11-23 14:41:47 +0200 |
|---|---|---|
| committer | unknown <gkodinov/kgeorge@magare.gmz> | 2007-11-23 14:41:47 +0200 |
| commit | 042a58e049bf2fa7705202440cbcb847472f3606 (patch) | |
| tree | 9f0c61f26552c28edf10925cd5dbbde5fdb8557c /sql/item.cc | |
| parent | 339e8f5d6354d350ea6a5eb13ff8faead65dca49 (diff) | |
| parent | 870d46819e517ec9dcd7b0e077147c69dbafa929 (diff) | |
| download | mariadb-git-042a58e049bf2fa7705202440cbcb847472f3606.tar.gz | |
Merge magare.gmz:/home/kgeorge/mysql/work/B32400-5.0-opt
into magare.gmz:/home/kgeorge/mysql/work/B32400-5.1-opt
BitKeeper/deleted/.del-ps_6bdb.result:
Auto merged
mysql-test/r/ps_2myisam.result:
Auto merged
mysql-test/r/ps_3innodb.result:
Auto merged
mysql-test/r/ps_4heap.result:
Auto merged
mysql-test/r/ps_5merge.result:
Auto merged
mysql-test/suite/ndb/r/ps_7ndb.result:
Auto merged
sql/item.cc:
Auto merged
tests/mysql_client_test.c:
Auto merged
mysql-test/t/subselect.test:
merge of bug 32400 to 5.1-opt
Diffstat (limited to 'sql/item.cc')
| -rw-r--r-- | sql/item.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item.cc b/sql/item.cc index c8ec2206f02..108dddc8939 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -3683,7 +3683,7 @@ Item_field::fix_outer_field(THD *thd, Field **from_field, Item **reference) } /* Search in SELECT and GROUP lists of the outer select. */ - if (outer_context->resolve_in_select_list) + if (place != IN_WHERE && place != IN_ON) { if (!(ref= resolve_ref_in_select_and_group(thd, this, select))) return -1; /* Some error occurred (e.g. ambiguous names). */ |