Commit ec75ead6 authored by unknown's avatar unknown

Merge bk-internal:/home/bk/mysql-5.0

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


sql/item_func.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
parents 5a9efeed 968af1f3
......@@ -2364,26 +2364,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)
......@@ -2773,6 +2753,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 */
......
......@@ -3147,13 +3147,11 @@ we force server id to 2, but this MySQL server will not act as a slave.");
create_shutdown_thread();
create_maintenance_thread();
printf(ER(ER_READY),my_progname,server_version,
((unix_sock == INVALID_SOCKET) ? (char*) "" : mysqld_unix_port),
mysqld_port);
if (MYSQL_COMPILATION_COMMENT[0] != '\0')
fputs(" " MYSQL_COMPILATION_COMMENT, stdout);
putchar('\n');
fflush(stdout);
sql_print_information(ER(ER_READY),my_progname,server_version,
((unix_sock == INVALID_SOCKET) ? (char*) ""
: mysqld_unix_port),
mysqld_port,
MYSQL_COMPILATION_COMMENT);
#if defined(__NT__) || defined(HAVE_SMEM)
handle_connections_methods();
......
......@@ -1824,7 +1824,7 @@ ER_READY
cze "%s: p-Bipraven na spojen"
dan "%s: klar til tilslutninger"
nla "%s: klaar voor verbindingen"
eng "%s: ready for connections.\nVersion: '%s' socket: '%s' port: %d"
eng "%s: ready for connections.\nVersion: '%s' socket: '%s' port: %d %s"
jps "%s: ",
est "%s: ootab hendusi"
fre "%s: Prt pour des connections"
......@@ -1839,7 +1839,7 @@ ER_READY
pol "%s: gotowe do po?czenia"
por "%s: Pronto para conexes"
rum "%s: sint gata pentru conectii"
rus "%s: .\n: '%s' : '%s' : %d"
rus "%s: .\n: '%s' : '%s' : %d %s"
serbian "%s: Spreman za konekcije\n"
slo "%s: pripraven na spojenie"
spa "%s: preparado para conexiones"
......
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