Commit 934a2318 authored by unknown's avatar unknown

merging


mysql-test/t/disabled.def:
  meging bug
parent 092b8f9e
...@@ -32,3 +32,4 @@ rpl_multi_engine : BUG#22583 2006-09-23 lars ...@@ -32,3 +32,4 @@ rpl_multi_engine : BUG#22583 2006-09-23 lars
#ndb_binlog_ddl_multi : BUG#18976 2006-04-10 kent CRBR: multiple binlog, second binlog may miss schema log events #ndb_binlog_ddl_multi : BUG#18976 2006-04-10 kent CRBR: multiple binlog, second binlog may miss schema log events
ndb_binlog_discover : bug#21806 2006-08-24 ndb_binlog_discover : bug#21806 2006-08-24
ndb_autodiscover3 : bug#21806 ndb_autodiscover3 : bug#21806
udf : for GKodinov to fix. Your fix for #21809 stopped working in 5.1 after the merge.
...@@ -1682,7 +1682,7 @@ void subselect_engine::set_row(List<Item> &item_list, Item_cache **row) ...@@ -1682,7 +1682,7 @@ void subselect_engine::set_row(List<Item> &item_list, Item_cache **row)
res_field_type= sel_item->field_type(); res_field_type= sel_item->field_type();
item->decimals= sel_item->decimals; item->decimals= sel_item->decimals;
item->unsigned_flag= sel_item->unsigned_flag; 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))) if (!(row[i]= Item_cache::get_cache(res_type)))
return; return;
row[i]->setup(sel_item); row[i]->setup(sel_item);
......
...@@ -798,7 +798,6 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize); ...@@ -798,7 +798,6 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize);
%type <item_list> %type <item_list>
expr_list udf_expr_list udf_expr_list2 when_list expr_list udf_expr_list udf_expr_list2 when_list
ident_list ident_list_arg opt_expr_list ident_list ident_list_arg opt_expr_list
expr_list_opt
%type <var_type> %type <var_type>
option_type opt_var_type opt_var_ident_type option_type opt_var_type opt_var_ident_type
...@@ -6377,7 +6376,7 @@ function_call_generic: ...@@ -6377,7 +6376,7 @@ function_call_generic:
lex->current_select->udf_list.push_front(udf); lex->current_select->udf_list.push_front(udf);
#endif #endif
} }
expr_list_opt ')' opt_expr_list ')'
{ {
THD *thd= YYTHD; THD *thd= YYTHD;
LEX *lex= Lex; LEX *lex= Lex;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment