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_derived.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_derived.cc')
-rw-r--r-- | sql/sql_derived.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_derived.cc b/sql/sql_derived.cc index 771d68e8462..fcbb1bcfdeb 100644 --- a/sql/sql_derived.cc +++ b/sql/sql_derived.cc @@ -144,6 +144,9 @@ int mysql_derived(THD *thd, LEX *lex, SELECT_LEX_UNIT *unit, res= -1; goto exit; } + // Item list should be fix_fielded yet another time in JOIN::prepare + unfix_item_list(item_list); + bzero((char*) &tmp_table_param,sizeof(tmp_table_param)); tmp_table_param.field_count= item_list.elements; /* |