diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-04-03 17:23:41 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-04-03 17:23:41 +0300 |
| commit | e65aed9cbd61f5fc3c7cd396d60a9d6cb1d9b218 (patch) | |
| tree | 6163656b379dd488426db41dac6ba4c258b7e218 /sql | |
| parent | d7c25fe28ec29154e136cac651fffe8b7338ca84 (diff) | |
| download | mariadb-git-e65aed9cbd61f5fc3c7cd396d60a9d6cb1d9b218.tar.gz | |
for Item_param we have to have value set instead of fave item fixed (BUG#3353)
fixed outer joins
test of different joins included
sql/item.cc:
for Item_param we have to have value set instead of fave item fixed
sql/sql_base.cc:
fixed PS with outer joins
tests/client_test.c:
test of different types of joins
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/item.cc | 8 | ||||
| -rw-r--r-- | sql/sql_base.cc | 3 |
2 files changed, 7 insertions, 4 deletions
diff --git a/sql/item.cc b/sql/item.cc index 8da4990942c..1efed78799a 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -713,7 +713,7 @@ bool Item_param::get_time(TIME *res) double Item_param::val() { - DBUG_ASSERT(fixed == 1); + DBUG_ASSERT(value_is_set == 1); int err; switch (item_result_type) { case STRING_RESULT: @@ -729,7 +729,7 @@ double Item_param::val() longlong Item_param::val_int() { - DBUG_ASSERT(fixed == 1); + DBUG_ASSERT(value_is_set == 1); int err; switch (item_result_type) { case STRING_RESULT: @@ -746,7 +746,7 @@ longlong Item_param::val_int() String *Item_param::val_str(String* str) { - DBUG_ASSERT(fixed == 1); + DBUG_ASSERT(value_is_set == 1); switch (item_result_type) { case INT_RESULT: str->set(int_value, &my_charset_bin); @@ -766,7 +766,7 @@ String *Item_param::val_str(String* str) String *Item_param::query_val_str(String* str) { - DBUG_ASSERT(fixed == 1); + DBUG_ASSERT(value_is_set == 1); switch (item_result_type) { case INT_RESULT: case REAL_RESULT: diff --git a/sql/sql_base.cc b/sql/sql_base.cc index bea77c72bc0..48ba810c1a3 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -2469,6 +2469,9 @@ int setup_conds(THD *thd,TABLE_LIST *tables,COND **conds) } thd->lex->current_select->cond_count+= cond_and->list.elements; + // to prevent natural join processing during PS re-execution + table->natural_join= 0; + if (!table->outer_join) // Not left join { *conds= and_conds(*conds, cond_and); |