diff options
| author | Igor Babaev <igor@askmonty.org> | 2011-05-19 17:02:47 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2011-05-19 17:02:47 -0700 |
| commit | 2feb13cdb4b75eb09bf1cdbecb752a1e40d77b26 (patch) | |
| tree | 2074fef79b8595d47fee2381f4f31b4c82e3229e /sql/item.cc | |
| parent | 579f644360768f3318faf0ccfed4578f7190c2c3 (diff) | |
| parent | 98f2be086807f2ee601ee4f2fdd17a44798c3627 (diff) | |
| download | mariadb-git-2feb13cdb4b75eb09bf1cdbecb752a1e40d77b26.tar.gz | |
Merge
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 2c562fc9a2e..6e315a54275 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -8866,7 +8866,7 @@ inline st_select_lex *Item_ident::get_depended_from() const { st_select_lex *dep; if ((dep= depended_from)) - for ( ; dep->merged_into; dep= dep->merged_into); + for ( ; dep->merged_into; dep= dep->merged_into) ; return dep; } |