mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-09 08:34:28 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge mysql.com:/home/jimw/my/mysql-5.0-8678

Browse source 
into mysql.com:/home/jimw/my/mysql-5.0-clean


sql/item_func.cc:
  Auto merged
This commit is contained in:
unknown 2005-03-01 15:25:18 -08:00
commit 3db5a97430
1 changed files with 25 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

45
sql/item_func.cc
View file

@ -2365,26 +2365,6 @@ longlong Item_func_bit_count::val_int()
#ifdef HAVE_DLOPEN
udf_handler::~udf_handler()
{
if (!not_original)
{
if (initialized)
{
if (u_d->func_deinit != NULL)
{
void (*deinit)(UDF_INIT *) = (void (*)(UDF_INIT*))
u_d->func_deinit;
(*deinit)(&initid);
}
free_udf(u_d);
}
if (buffers) // Because of bug in ecc
delete [] buffers;
}
}
bool
udf_handler::fix_fields(THD *thd, TABLE_LIST *tables, Item_result_field *func,
uint arg_count, Item **arguments)
@ -2774,6 +2754,31 @@ String *Item_func_udf_str::val_str(String *str)
return res;
}
/*
This has to come last in the udf_handler methods, or the compiler for IBM
AIX fails to compile with debugging enabled. (Yes, really.)
*/
udf_handler::~udf_handler()
{
if (!not_original)
{
if (initialized)
{
if (u_d->func_deinit != NULL)
{
void (*deinit)(UDF_INIT *) = (void (*)(UDF_INIT*))
u_d->func_deinit;
(*deinit)(&initid);
}
free_udf(u_d);
}
if (buffers) // Because of bug in ecc
delete [] buffers;
}
}
#else
bool udf_handler::get_arguments() { return 0; }
#endif /* HAVE_DLOPEN */