diff options
| author | Gleb Shchepa <gshchepa@mysql.com> | 2009-04-28 05:27:38 +0500 |
|---|---|---|
| committer | Gleb Shchepa <gshchepa@mysql.com> | 2009-04-28 05:27:38 +0500 |
| commit | 755d312e8456da751f432fd0e9c211dc4aeba131 (patch) | |
| tree | f2c77af7f9404ada69bb2ec0c8133c1b334a62d5 /sql | |
| parent | 26cc84d947ca877f6f5e2551390ec8831e9f317b (diff) | |
| parent | def04705986a9abad6927c0b52aaf63c136b546b (diff) | |
| download | mariadb-git-755d312e8456da751f432fd0e9c211dc4aeba131.tar.gz | |
manual merge 5.0-bugteam --> 5.1-bugteam
Diffstat (limited to 'sql')
| -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 180ce4f4702..d1418b9a137 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -4468,7 +4468,7 @@ Item *Item_field::replace_equal_field(uchar *arg) return const_item; } Item_field *subst= item_equal->get_first(); - if (subst && !field->eq(subst->field)) + if (subst && field->table != subst->field->table && !field->eq(subst->field)) return subst; } return this; |