diff options
author | Michael Widenius <monty@askmonty.org> | 2010-12-08 16:16:32 +0200 |
---|---|---|
committer | Michael Widenius <monty@askmonty.org> | 2010-12-08 16:16:32 +0200 |
commit | eb70e64ceaa7aec6a35580643a3e5fc01b6a0630 (patch) | |
tree | 75139efd5b41fdf1c315bdd0c284e4620cbd987a /sql/item_cmpfunc.cc | |
parent | 2de9a7742a11ad25e1c99fa9c1ba43cec5b1acc9 (diff) | |
download | mariadb-git-eb70e64ceaa7aec6a35580643a3e5fc01b6a0630.tar.gz |
Fixed test results for windows builds
Fixed compiler warning
mysql-test/r/named_pipe.result:
Fixed test results for windows builds
mysql-test/r/shm.result:
Fixed test results for windows builds
sql/item_cmpfunc.cc:
Fixed compiler warning about uninitialized "first"
Diffstat (limited to 'sql/item_cmpfunc.cc')
-rw-r--r-- | sql/item_cmpfunc.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index d87db138a14..0b89adb75e8 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -5894,12 +5894,15 @@ Item_field* Item_equal::get_first(Item_field *field) It's a field from an materialized semi-join. We can substitute it only for a field from the same semi-join. */ - JOIN_TAB *first; + JOIN_TAB *first= field_tab; JOIN *join= field_tab->join; int tab_idx= field_tab - field_tab->join->join_tab; + DBUG_ASSERT(join->join_tab[tab_idx].table->map & + emb_nest->sj_inner_tables); + /* Find the first table of this semi-join nest */ - for (int i= tab_idx; i >= (int)join->const_tables; i--) + for (int i= tab_idx-1; i >= (int)join->const_tables; i--) { if (join->join_tab[i].table->map & emb_nest->sj_inner_tables) first= join->join_tab + i; |