Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dlenev/src/mysql-4.1-bg9913 sql/item_func.cc: Auto merged sql/item_func.h: Auto merged
This commit is contained in:
commit
dad8efdf6b
@ -1691,6 +1691,13 @@ longlong Item_func_bit_count::val_int()
|
||||
#ifdef HAVE_DLOPEN
|
||||
|
||||
udf_handler::~udf_handler()
|
||||
{
|
||||
/* Everything should be properly cleaned up by this moment. */
|
||||
DBUG_ASSERT(not_original || !(initialized || buffers));
|
||||
}
|
||||
|
||||
|
||||
void udf_handler::cleanup()
|
||||
{
|
||||
if (!not_original)
|
||||
{
|
||||
@ -1703,9 +1710,11 @@ udf_handler::~udf_handler()
|
||||
(*deinit)(&initid);
|
||||
}
|
||||
free_udf(u_d);
|
||||
initialized= FALSE;
|
||||
}
|
||||
if (buffers) // Because of bug in ecc
|
||||
delete [] buffers;
|
||||
buffers= 0;
|
||||
}
|
||||
}
|
||||
|
||||
@ -1945,6 +1954,12 @@ String *udf_handler::val_str(String *str,String *save_str)
|
||||
}
|
||||
|
||||
|
||||
void Item_udf_func::cleanup()
|
||||
{
|
||||
udf.cleanup();
|
||||
Item_func::cleanup();
|
||||
}
|
||||
|
||||
|
||||
double Item_func_udf_float::val()
|
||||
{
|
||||
|
@ -783,6 +783,7 @@ public:
|
||||
fixed= 1;
|
||||
return res;
|
||||
}
|
||||
void cleanup();
|
||||
Item_result result_type () const { return udf.result_type(); }
|
||||
table_map not_null_tables() const { return 0; }
|
||||
};
|
||||
|
@ -1449,6 +1449,17 @@ bool Item_udf_sum::add()
|
||||
DBUG_RETURN(0);
|
||||
}
|
||||
|
||||
void Item_udf_sum::cleanup()
|
||||
{
|
||||
/*
|
||||
udf_handler::cleanup() nicely handles case when we have not
|
||||
original item but one created by copy_or_same() method.
|
||||
*/
|
||||
udf.cleanup();
|
||||
Item_sum::cleanup();
|
||||
}
|
||||
|
||||
|
||||
Item *Item_sum_udf_float::copy_or_same(THD* thd)
|
||||
{
|
||||
return new (thd->mem_root) Item_sum_udf_float(thd, this);
|
||||
|
@ -550,6 +550,7 @@ public:
|
||||
bool add();
|
||||
void reset_field() {};
|
||||
void update_field() {};
|
||||
void cleanup();
|
||||
};
|
||||
|
||||
|
||||
|
@ -67,6 +67,7 @@ class udf_handler :public Sql_alloc
|
||||
bool get_arguments();
|
||||
bool fix_fields(THD *thd,struct st_table_list *tlist,Item_result_field *item,
|
||||
uint arg_count,Item **args);
|
||||
void cleanup();
|
||||
double val(my_bool *null_value)
|
||||
{
|
||||
if (get_arguments())
|
||||
|
Loading…
x
Reference in New Issue
Block a user