diff options
| author | unknown <holyfoot/hf@mysql.com/deer.(none)> | 2006-11-18 21:49:59 +0400 |
|---|---|---|
| committer | unknown <holyfoot/hf@mysql.com/deer.(none)> | 2006-11-18 21:49:59 +0400 |
| commit | 934a231825080f1c7812a67318f0cf83c05854a9 (patch) | |
| tree | c3be7861f03be4b159e10e622be6ad5b08b2dcbc /sql | |
| parent | 092b8f9e9e3aee7af19158fc9eaf3402d9f3ca4e (diff) | |
| download | mariadb-git-934a231825080f1c7812a67318f0cf83c05854a9.tar.gz | |
merging
mysql-test/t/disabled.def:
meging bug
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/item_subselect.cc | 2 | ||||
| -rw-r--r-- | sql/sql_yacc.yy | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc index bd0f4fc56c5..c0fa2c718bc 100644 --- a/sql/item_subselect.cc +++ b/sql/item_subselect.cc @@ -1682,7 +1682,7 @@ void subselect_engine::set_row(List<Item> &item_list, Item_cache **row) res_field_type= sel_item->field_type(); item->decimals= sel_item->decimals; item->unsigned_flag= sel_item->unsigned_flag; - *maybe_null= sel_item->maybe_null; + maybe_null= sel_item->maybe_null; if (!(row[i]= Item_cache::get_cache(res_type))) return; row[i]->setup(sel_item); diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 4014192db02..28230fcf06d 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -798,7 +798,6 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize); %type <item_list> expr_list udf_expr_list udf_expr_list2 when_list ident_list ident_list_arg opt_expr_list - expr_list_opt %type <var_type> option_type opt_var_type opt_var_ident_type @@ -6377,7 +6376,7 @@ function_call_generic: lex->current_select->udf_list.push_front(udf); #endif } - expr_list_opt ')' + opt_expr_list ')' { THD *thd= YYTHD; LEX *lex= Lex; |