diff options
| author | unknown <bell@sanja.is.com.ua> | 2002-11-29 10:44:30 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2002-11-29 10:44:30 +0200 |
| commit | 5b62dfcdf51a695ebc724cb453919eb909ca274f (patch) | |
| tree | f5b26feb2914ecd10b0bde1eb6e509b1da74c311 /sql/item_subselect.cc | |
| parent | 781a5bc81ad3fdd6111986a895e6025d6910773e (diff) | |
| download | mariadb-git-5b62dfcdf51a695ebc724cb453919eb909ca274f.tar.gz | |
fixed error handling bug
fixed naming bug
fixed bug of subselect excluding
mysql-test/r/subselect.result:
test of error handling bug
test of naming bug
test bug of subselect excluding
mysql-test/t/subselect.test:
test of error handling bug
test of naming bug
test bug of subselect excluding
sql/item_subselect.cc:
fixed naming bug
fixed error handling bug
sql/sql_lex.cc:
fixed subselect excluding bug
Diffstat (limited to 'sql/item_subselect.cc')
| -rw-r--r-- | sql/item_subselect.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc index 6d55f7399c1..e087664e060 100644 --- a/sql/item_subselect.cc +++ b/sql/item_subselect.cc @@ -92,6 +92,7 @@ bool Item_subselect::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref) if (substitution) { (*ref)= substitution; + substitution->name= name; engine->exclude(); return substitution->fix_fields(thd, tables, ref); } @@ -293,7 +294,7 @@ void Item_in_subselect::single_value_transformer(st_select_lex *select_lex, if (sl->item_list.elements > 1) { my_error(ER_CARDINALITY_COL, MYF(0), 1); - item= 0; // Item_asterisk_remover must fail + DBUG_VOID_RETURN; } else item= (Item*) sl->item_list.pop(); |