diff options
| author | unknown <bell@laptop.sanja.is.com.ua> | 2003-08-23 13:29:38 +0300 |
|---|---|---|
| committer | unknown <bell@laptop.sanja.is.com.ua> | 2003-08-23 13:29:38 +0300 |
| commit | 93afa26ea7c6206aca6d8dc3b25873f4d732b929 (patch) | |
| tree | 53f4829d55971fc556fdf48ef0def5296d1b9f18 /sql/sql_union.cc | |
| parent | b4a45538dfc89868246bdb1bd6ec8a20eba666b1 (diff) | |
| download | mariadb-git-93afa26ea7c6206aca6d8dc3b25873f4d732b929.tar.gz | |
fixed bug of lack of fix_fields call (after merge bugfix (SCRUM))
fixed bug in Item_sum
fixed bug in dependence remover
after merge fix
mysql-test/r/subselect.result:
after merge fix
mysql-test/r/union.result:
new test
mysql-test/t/subselect.test:
after merge fix
mysql-test/t/union.test:
new test
sql/item.cc:
fixed returned value
sql/item.h:
fixed flag dropper
(I was not able to find Item whicj need more to be fix_fielded twice)
sql/item_subselect.h:
fixed initialisation
sql/item_sum.cc:
fixed absence of walk method of Item_sum
sql/item_sum.h:
fixed absence of walk method of Item_sum
sql/mysql_priv.h:
setup_fields reverter
sql/sql_base.cc:
setup_fields reverter
sql/sql_derived.cc:
fixed bug of lack of fix_fields call
sql/sql_union.cc:
fixed bug of lack of fix_fields call
Diffstat (limited to 'sql/sql_union.cc')
| -rw-r--r-- | sql/sql_union.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_union.cc b/sql/sql_union.cc index 5d815bb2ffa..e5fe5b13b02 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -156,6 +156,9 @@ int st_select_lex_unit::prepare(THD *thd, select_result *sel_result, setup_fields(thd, select_cursor->ref_pointer_array, first_table, item_list, 0, 0, 1)) goto err; + // Item list should be fix_fielded yet another time in JOIN::prepare + unfix_item_list(item_list); + t_and_f= 1; while((item=it++)) { |