mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 04:22:27 +01:00
5a28c2caca
Warning handling and initial prepared statement handling (last not complete yet) Changed a lot of functions that returned 0/1 to my_bool type. GRANT handling now uses read/write locks instead of mutex Change basic net functions to use THD instead of NET (needed for 4.1 protocol) Use my_sprintf instead of sprintf() + strlen() Added alloc_query() to be able to chare query initialization code with prepared statements. Cleanup handling of SHOW COUNT(*) WARNINGS and SELECT LAST_INSERT_ID() Note that the following test fails (will be fixed ASAP): sub_select, union, rpl_rotate_logs and rpl_mystery22 BitKeeper/deleted/.del-README~3449730baf983117: Delete: mysql-test/t/README BitKeeper/deleted/.del-sql_error.cc~2f1caca8d2485dbe: Delete: libmysqld/sql_error.cc BitKeeper/deleted/.del-sql_prepare.cc~f703729793935ed6: Delete: libmysqld/sql_prepare.cc Docs/manual.texi: Updated variable list client/mysql.cc: Show warning count to user. client/mysqltest.c: Add warnings to test results configure.in: New shared library version number include/errmsg.h: Indentation cleanup include/mysql.h: Removed MYSQL_ERROR Indentaion cleanups include/mysql_com.h: Changed functions to returns true/false to my_bool. include/mysqld_error.h: New error messages isam/pack_isam.c: Indentation change libmysql/Makefile.am: Fix of wrong merge libmysql/Makefile.shared: Indentation cleanup libmysql/errmsg.c: Removed not used errors libmysql/libmysql.c: Change functions to return 1 on error (not -1) Change type of functions that returns 0/1 to my_bool Lot of code optimizations. Lot of changes for prepared statements. This now handles sending of binary data to server. Receving of binary data is not yet done (will have to wait until server code for this is ready) mysql_warning_count and mysql_warnings() implemented. libmysql/libmysql.def: Added mysql_warnings and mysql_warning_count libmysql/manager.c: Fixed wrong testing of result from my_connect() libmysqld/lib_sql.cc: Removed global variable THR_NET Change basic net functions to use THD instead of NET GRANT handling now uses read/write locks instead of mutex libmysqld/libmysqld.c: Changed functions to be my_bool myisam/ft_boolean_search.c: Trivial code cleanup myisam/ft_stopwords.c: Trivial code cleanup myisam/mi_check.c: Update to 4.1 structures myisam/myisampack.c: Trivial code cleanup myisam/rt_key.c: Code cleanup myisam/rt_test.c: Code cleanup Removed compiler warnings myisam/sp_key.c: Indentation changes myisam/sp_test.c: Removed compiler warnings mysql-test/README: Updated to reflect the new --external flag. mysql-test/mysql-test-run.sh: --local (start new server) is now default. Use --external to test against external server. mysql-test/r/rollback.result: Updated for 4.1 warnings mysql-test/r/rpl_log.result: Update for 4.1 mysql-test/t/rollback.test: Updated for 4.1 warnings mysql-test/t/rpl_log_pos.test: Portability fix mysys/hash.c: Indentation change mysys/my_error.c: Indentation change mysys/tree.c: Updated file description sql/field.cc: Fixed bugs introduced by merge Use my_sprintf instead of sprintf() + strlen() sql/field.h: Add CHARSET_INFO to field structure sql/gstream.h: Indentation changes. Added GPL copyright header sql/ha_innodb.cc: Updated parameters for net functions. sql/item.cc: Updates of Item_param Indentation changes sql/item.h: Removed size_of() function from item. sql/item_func.cc: Update function usage for 4.1 Added get_system_var() sql/item_func.h: Indentation change sql/item_strfunc.cc: Removed not needed inclusion of gstream.h Update to use system variables (from 4.0) sql/item_sum.h: Removed size_of() functions from item. sql/item_timefunc.cc: Change sprintf() + strlen() -> my_sprintf() Added length parameter to ->append() sql/item_timefunc.h: Removed size_of() functions from item. sql/item_uniq.h: Removed size_of() functions from item. sql/lex.h: Removed SQL_ERROR_COUNT variable sql/log.cc: Change sprintf() + strlen() -> my_sprintf() sql/log_event.cc: Change sprintf() + strlen() -> my_sprintf() sql/mini_client.cc: Added check that one always specifies a length to mc_mysql_query() sql/mysql_priv.h: New prototypes Change of NET -> THD parameter for net functions. sql/mysqld.cc: New startup options: 'max_prepared_statements', 'max_error_count' Updated usage of net functions. sql/net_pkg.cc: Change basic net functions to use THD instead of NET (needed to be able to handle 4.0 and 4.1 protocols) Lots of function comments sql/net_serv.cc: Change int return values -> my_bool Updated net_write_command() to take an extra header block to be added to the packet. (This made the prepared statement code much nicer and more efficient) sql/repl_failsafe.cc: Update net functions to use THD instead of NET sql/set_var.cc: Added @@error_count and @@warning_count variables. Updated to 4.1 function usage sql/set_var.h: Added @@error_count and @@warning_count variables. sql/share/czech/errmsg.txt: Removed Warning: from warning error messages. sql/share/english/errmsg.txt: Removed Warning: from warning error messages. sql/share/greek/errmsg.txt: Removed Warning: from warning error messages. sql/share/hungarian/errmsg.txt: Removed Warning: from warning error messages. sql/share/japanese/errmsg.txt: Removed Warning: from warning error messages. sql/share/korean/errmsg.txt: Removed Warning: from warning error messages. sql/share/norwegian-ny/errmsg.txt: Removed Warning: from warning error messages. sql/share/norwegian/errmsg.txt: Removed Warning: from warning error messages. sql/share/polish/errmsg.txt: Removed Warning: from warning error messages. sql/share/romanian/errmsg.txt: Removed Warning: from warning error messages. sql/share/slovak/errmsg.txt: Removed Warning: from warning error messages. sql/share/swedish/errmsg.txt: Removed Warning: from warning error messages. sql/slave.cc: Change basic net functions to use THD instead of NET skip_load_data_file recoded to fit new client/server protocol sql/spatial.h: Added copyright header Indentation cleanups sql/sql_acl.cc: Change basic net functions to use THD instead of NET GRANT handling now uses read/write locks instead of mutex sql/sql_analyse.cc: Change basic net functions to use THD instead of NET sprintf() + strlen() -> my_sprintf() sql/sql_base.cc: More DBUG statements sql/sql_class.cc: Change basic net functions to use THD instead of NET warning and prepared statement handling sql/sql_class.h: Change basic net functions to use THD instead of NET warning and prepared statement handling sql/sql_db.cc: Code cleanup & optimization. sql/sql_delete.cc: Change basic net functions to use THD instead of NET sql/sql_derived.cc: Change basic net functions to use THD instead of NET sql/sql_do.cc: Change basic net functions to use THD instead of NET sql/sql_error.cc: Big rewrite of error handling. sql/sql_handler.cc: Change basic net functions to use THD instead of NET sql/sql_insert.cc: Change basic net functions to use THD instead of NET sql/sql_lex.cc: Change basic net functions to use THD instead of NET sql/sql_lex.h: Added param_count to st_select_lex_node sql/sql_list.h: Removed not needed error list. sql/sql_load.cc: Change basic net functions to use THD instead of NET sql/sql_parse.cc: Change basic net functions to use THD instead of NET Added alloc_query() to be able to chare query initialization code with prepared statements. Update of warning handling. Added create_select_for_variable() (for SHOW COUNT(*) WARNINGS) sql/sql_prepare.cc: Initial prepared statement handling sql/sql_rename.cc: Change basic net functions to use THD instead of NET sql/sql_repl.cc: Change basic net functions to use THD instead of NET sql/sql_select.cc: Small code cleanups Added missing initialization of error that caused some queries that returned an empty result set to fail sql/sql_select.h: Ensure that JOIN.error is properly initialized sql/sql_show.cc: Change basic net functions to use THD instead of NET A lot of optimization sql/sql_table.cc: Change basic net functions to use THD instead of NET Indentaion cleanup sql/sql_udf.cc: Change basic net functions to use THD instead of NET sql/sql_union.cc: Change basic net functions to use THD instead of NET sql/sql_update.cc: Change basic net functions to use THD instead of NET sql/sql_yacc.yy: Change basic net functions to use THD instead of NET Cleanup handling of SHOW COUNT(*) WARNINGS and SELECT LAST_INSERT_ID() sql/structs.h: Moved structures to files where they was used sql/table.cc: Don't accept empty database names sql/uniques.cc: Indentation cleanup sql/unireg.cc: Change basic net functions to use THD instead of NET sql/unireg.h: Added defaults for warnings and prepared statements strings/ctype-simple.c: optimization tests/client_test.c: Fixed wrong paramaters to printf()
490 lines
12 KiB
C++
490 lines
12 KiB
C++
/* Copyright (C) 2000 MySQL AB
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
/* This implements 'user defined functions' */
|
|
|
|
/*
|
|
** Known bugs:
|
|
**
|
|
** Memory for functions are never freed!
|
|
** Shared libraries are not closed before mysqld exists;
|
|
** - This is because we can't be sure if some threads is using
|
|
** a functions.
|
|
**
|
|
** The buggs only affects applications that creates and frees a lot of
|
|
** dynamic functions, so this shouldn't be a real problem.
|
|
*/
|
|
|
|
#ifdef __GNUC__
|
|
#pragma implementation // gcc: implement sql_udf.h
|
|
#endif
|
|
|
|
#include "mysql_priv.h"
|
|
|
|
#ifdef HAVE_DLOPEN
|
|
extern "C"
|
|
{
|
|
#if defined(__WIN__)
|
|
void* dlsym(void* lib,const char* name)
|
|
{
|
|
return GetProcAddress((HMODULE)lib,name);
|
|
}
|
|
void* dlopen(const char* libname,int unused)
|
|
{
|
|
return LoadLibraryEx(libname,NULL,0);
|
|
}
|
|
void dlclose(void* lib)
|
|
{
|
|
FreeLibrary((HMODULE)lib);
|
|
}
|
|
|
|
#elif !defined(OS2)
|
|
#include <dlfcn.h>
|
|
#endif
|
|
|
|
#include <stdarg.h>
|
|
#include <hash.h>
|
|
}
|
|
|
|
#ifndef RTLD_NOW
|
|
#define RTLD_NOW 1 // For FreeBSD 2.2.2
|
|
#endif
|
|
|
|
#ifndef HAVE_DLERROR
|
|
#define dlerror() ""
|
|
#endif
|
|
|
|
static bool initialized = 0;
|
|
static MEM_ROOT mem;
|
|
static HASH udf_hash;
|
|
static pthread_mutex_t THR_LOCK_udf;
|
|
|
|
|
|
static udf_func *add_udf(char *name, Item_result ret, char *dl,
|
|
Item_udftype typ);
|
|
static void del_udf(udf_func *udf);
|
|
static void *find_udf_dl(const char *dl);
|
|
|
|
|
|
static void init_syms(udf_func *tmp)
|
|
{
|
|
char nm[MAX_FIELD_NAME+16],*end;
|
|
|
|
tmp->func = dlsym(tmp->dlhandle, tmp->name);
|
|
end=strmov(nm,tmp->name);
|
|
(void) strmov(end,"_init");
|
|
tmp->func_init = dlsym(tmp->dlhandle, nm);
|
|
(void) strmov(end,"_deinit");
|
|
tmp->func_deinit = dlsym(tmp->dlhandle, nm);
|
|
if (tmp->type == UDFTYPE_AGGREGATE)
|
|
{
|
|
(void)strmov( end, "_reset" );
|
|
tmp->func_reset = dlsym( tmp->dlhandle, nm );
|
|
(void)strmov( end, "_add" );
|
|
tmp->func_add = dlsym( tmp->dlhandle, nm );
|
|
}
|
|
}
|
|
|
|
static byte* get_hash_key(const byte *buff,uint *length,
|
|
my_bool not_used __attribute__((unused)))
|
|
{
|
|
udf_func *udf=(udf_func*) buff;
|
|
*length=(uint) udf->name_length;
|
|
return (byte*) udf->name;
|
|
}
|
|
|
|
/*
|
|
** Read all predeclared functions from func@mysql and accept all that
|
|
** can be used.
|
|
*/
|
|
|
|
void udf_init()
|
|
{
|
|
udf_func *tmp;
|
|
TABLE_LIST tables;
|
|
READ_RECORD read_record_info;
|
|
int error;
|
|
DBUG_ENTER("ufd_init");
|
|
|
|
if (initialized)
|
|
DBUG_VOID_RETURN;
|
|
|
|
pthread_mutex_init(&THR_LOCK_udf,MY_MUTEX_INIT_SLOW);
|
|
|
|
init_sql_alloc(&mem, 1024,0);
|
|
THD *new_thd = new THD;
|
|
if (!new_thd ||
|
|
hash_init(&udf_hash,system_charset_info,
|
|
32,0,0,get_hash_key, NULL, HASH_CASE_INSENSITIVE))
|
|
{
|
|
sql_print_error("Can't allocate memory for udf structures");
|
|
hash_free(&udf_hash);
|
|
free_root(&mem,MYF(0));
|
|
DBUG_VOID_RETURN;
|
|
}
|
|
initialized = 1;
|
|
new_thd->mysys_var=my_thread_var;
|
|
new_thd->version = refresh_version; //current_thd->version;
|
|
new_thd->current_tablenr = 0;
|
|
new_thd->open_tables = 0;
|
|
new_thd->db= my_strdup("mysql", MYF(0));
|
|
new_thd->db_length=5;
|
|
|
|
bzero((gptr) &tables,sizeof(tables));
|
|
tables.name = tables.real_name = (char*) "func";
|
|
tables.lock_type = TL_READ;
|
|
tables.db=new_thd->db;
|
|
|
|
if (open_tables(new_thd, &tables))
|
|
{
|
|
DBUG_PRINT("error",("Can't open udf table"));
|
|
sql_print_error("Can't open mysql/func table");
|
|
close_thread_tables(new_thd);
|
|
delete new_thd;
|
|
DBUG_VOID_RETURN;
|
|
}
|
|
|
|
TABLE *table = tables.table;
|
|
init_read_record(&read_record_info, new_thd, table, NULL,1,0);
|
|
while (!(error = read_record_info.read_record(&read_record_info)))
|
|
{
|
|
DBUG_PRINT("info",("init udf record"));
|
|
char *name=get_field(&mem, table, 0);
|
|
char *dl_name= get_field(&mem, table, 2);
|
|
bool new_dl=0;
|
|
Item_udftype udftype=UDFTYPE_FUNCTION;
|
|
if (table->fields >= 4) // New func table
|
|
udftype=(Item_udftype) table->field[3]->val_int();
|
|
|
|
if (!(tmp = add_udf(name,(Item_result) table->field[1]->val_int(),
|
|
dl_name, udftype)))
|
|
{
|
|
sql_print_error("Can't alloc memory for udf function: name");
|
|
continue;
|
|
}
|
|
|
|
void *dl = find_udf_dl(tmp->dl);
|
|
if (dl == NULL)
|
|
{
|
|
if (!(dl = dlopen(tmp->dl, RTLD_NOW)))
|
|
{
|
|
sql_print_error(ER(ER_CANT_OPEN_LIBRARY),
|
|
tmp->dl,errno,dlerror());
|
|
del_udf(tmp);
|
|
continue;
|
|
}
|
|
new_dl=1;
|
|
}
|
|
tmp->dlhandle = dl;
|
|
init_syms(tmp);
|
|
if (!tmp->func)
|
|
{
|
|
sql_print_error(ER(ER_CANT_FIND_DL_ENTRY), name);
|
|
del_udf(tmp);
|
|
if (new_dl)
|
|
dlclose(dl);
|
|
}
|
|
}
|
|
if (error > 0)
|
|
sql_print_error(ER(ER_GET_ERRNO), my_errno);
|
|
end_read_record(&read_record_info);
|
|
new_thd->version--; // Force close to free memory
|
|
close_thread_tables(new_thd);
|
|
delete new_thd;
|
|
DBUG_VOID_RETURN;
|
|
}
|
|
|
|
|
|
void udf_free()
|
|
{
|
|
/* close all shared libraries */
|
|
DBUG_ENTER("udf_free");
|
|
for (uint idx=0 ; idx < udf_hash.records ; idx++)
|
|
{
|
|
udf_func *udf=(udf_func*) hash_element(&udf_hash,idx);
|
|
if (udf->dl)
|
|
{
|
|
for (uint j=idx+1 ; j < udf_hash.records ; j++)
|
|
{
|
|
udf_func *tmp=(udf_func*) hash_element(&udf_hash,j);
|
|
if (tmp->dl && !strcmp(udf->dl,tmp->dl))
|
|
tmp->dl=0;
|
|
}
|
|
}
|
|
dlclose(udf->dlhandle);
|
|
}
|
|
hash_free(&udf_hash);
|
|
free_root(&mem,MYF(0));
|
|
DBUG_VOID_RETURN;
|
|
}
|
|
|
|
|
|
static void del_udf(udf_func *udf)
|
|
{
|
|
DBUG_ENTER("del_udf");
|
|
if (!--udf->usage_count)
|
|
{
|
|
hash_delete(&udf_hash,(byte*) udf);
|
|
using_udf_functions=udf_hash.records != 0;
|
|
}
|
|
else
|
|
{
|
|
/*
|
|
** The functions is in use ; Rename the functions instead of removing it.
|
|
** The functions will be automaticly removed when the least threads
|
|
** doesn't use it anymore
|
|
*/
|
|
char *name= udf->name;
|
|
uint name_length=udf->name_length;
|
|
udf->name=(char*) "*";
|
|
udf->name_length=1;
|
|
hash_update(&udf_hash,(byte*) udf,(byte*) name,name_length);
|
|
}
|
|
DBUG_VOID_RETURN;
|
|
}
|
|
|
|
|
|
void free_udf(udf_func *udf)
|
|
{
|
|
DBUG_ENTER("free_udf");
|
|
pthread_mutex_lock(&THR_LOCK_udf);
|
|
if (!--udf->usage_count)
|
|
{
|
|
hash_delete(&udf_hash,(byte*) udf);
|
|
using_udf_functions=udf_hash.records != 0;
|
|
if (!find_udf_dl(udf->dl))
|
|
dlclose(udf->dlhandle);
|
|
}
|
|
pthread_mutex_unlock(&THR_LOCK_udf);
|
|
DBUG_VOID_RETURN;
|
|
}
|
|
|
|
/* This is only called if using_udf_functions != 0 */
|
|
|
|
udf_func *find_udf(const char *name,uint length,bool mark_used)
|
|
{
|
|
udf_func *udf=0;
|
|
DBUG_ENTER("find_udf");
|
|
|
|
/* TODO: This should be changed to reader locks someday! */
|
|
pthread_mutex_lock(&THR_LOCK_udf);
|
|
udf=(udf_func*) hash_search(&udf_hash,(byte*) name,
|
|
length ? length : (uint) strlen(name));
|
|
if (mark_used)
|
|
udf->usage_count++;
|
|
pthread_mutex_unlock(&THR_LOCK_udf);
|
|
DBUG_RETURN(udf);
|
|
}
|
|
|
|
static void *find_udf_dl(const char *dl)
|
|
{
|
|
DBUG_ENTER("find_udf_dl");
|
|
|
|
/* because only the function name is hashed, we have to search trough
|
|
** all rows to find the dl.
|
|
*/
|
|
for (uint idx=0 ; idx < udf_hash.records ; idx++)
|
|
{
|
|
udf_func *udf=(udf_func*) hash_element(&udf_hash,idx);
|
|
if (!strcmp(dl, udf->dl) && udf->dlhandle != NULL)
|
|
DBUG_RETURN(udf->dlhandle);
|
|
}
|
|
DBUG_RETURN(0);
|
|
}
|
|
|
|
|
|
/* Assume that name && dl is already allocated */
|
|
|
|
static udf_func *add_udf(char *name, Item_result ret, char *dl,
|
|
Item_udftype type)
|
|
{
|
|
if (!name || !dl)
|
|
return 0;
|
|
udf_func *tmp= (udf_func*) alloc_root(&mem, sizeof(udf_func));
|
|
if (!tmp)
|
|
return 0;
|
|
bzero((char*) tmp,sizeof(*tmp));
|
|
tmp->name = name;
|
|
tmp->name_length=(uint) strlen(tmp->name);
|
|
tmp->dl = dl;
|
|
tmp->returns = ret;
|
|
tmp->type = type;
|
|
tmp->usage_count=1;
|
|
if (hash_insert(&udf_hash,(byte*) tmp))
|
|
return 0;
|
|
using_udf_functions=1;
|
|
return tmp;
|
|
}
|
|
|
|
|
|
int mysql_create_function(THD *thd,udf_func *udf)
|
|
{
|
|
int error;
|
|
void *dl=0;
|
|
bool new_dl=0;
|
|
TABLE *table;
|
|
TABLE_LIST tables;
|
|
udf_func *u_d;
|
|
DBUG_ENTER("mysql_create_function");
|
|
|
|
if (!initialized)
|
|
{
|
|
send_error(thd, ER_OUT_OF_RESOURCES, ER(ER_OUT_OF_RESOURCES));
|
|
DBUG_RETURN(1);
|
|
}
|
|
|
|
/*
|
|
Ensure that the .dll doesn't have a path
|
|
This is done to ensure that only approved dll from the system
|
|
directories are used (to make this even remotely secure).
|
|
*/
|
|
if (strchr(udf->dl, '/'))
|
|
{
|
|
send_error(thd, ER_UDF_NO_PATHS,ER(ER_UDF_NO_PATHS));
|
|
DBUG_RETURN(1);
|
|
}
|
|
if (udf->name_length > NAME_LEN)
|
|
{
|
|
net_printf(thd, ER_TOO_LONG_IDENT,udf->name);
|
|
DBUG_RETURN(1);
|
|
}
|
|
|
|
pthread_mutex_lock(&THR_LOCK_udf);
|
|
if (hash_search(&udf_hash,(byte*) udf->name, udf->name_length))
|
|
{
|
|
net_printf(thd, ER_UDF_EXISTS, udf->name);
|
|
goto err;
|
|
}
|
|
if (!(dl = find_udf_dl(udf->dl)))
|
|
{
|
|
if (!(dl = dlopen(udf->dl, RTLD_NOW)))
|
|
{
|
|
DBUG_PRINT("error",("dlopen of %s failed, error: %d (%s)",
|
|
udf->dl,errno,dlerror()));
|
|
net_printf(thd, ER_CANT_OPEN_LIBRARY, udf->dl, errno, dlerror());
|
|
goto err;
|
|
}
|
|
new_dl=1;
|
|
}
|
|
udf->dlhandle=dl;
|
|
init_syms(udf);
|
|
|
|
if (udf->func == NULL)
|
|
{
|
|
net_printf(thd, ER_CANT_FIND_DL_ENTRY, udf->name);
|
|
goto err;
|
|
}
|
|
udf->name=strdup_root(&mem,udf->name);
|
|
udf->dl=strdup_root(&mem,udf->dl);
|
|
if (!udf->name || !udf->dl ||
|
|
!(u_d=add_udf(udf->name,udf->returns,udf->dl,udf->type)))
|
|
{
|
|
send_error(thd,0); // End of memory
|
|
goto err;
|
|
}
|
|
u_d->dlhandle = dl;
|
|
u_d->func=udf->func;
|
|
u_d->func_init=udf->func_init;
|
|
u_d->func_deinit=udf->func_deinit;
|
|
u_d->func_reset=udf->func_reset;
|
|
u_d->func_add=udf->func_add;
|
|
|
|
/* create entry in mysql/func table */
|
|
|
|
bzero((char*) &tables,sizeof(tables));
|
|
tables.db= (char*) "mysql";
|
|
tables.real_name=tables.name= (char*) "func";
|
|
/* Allow creation of functions even if we can't open func table */
|
|
if (!(table = open_ltable(thd,&tables,TL_WRITE)))
|
|
goto err;
|
|
|
|
restore_record(table,2); // Get default values for fields
|
|
table->field[0]->store(u_d->name, u_d->name_length, default_charset_info);
|
|
table->field[1]->store((longlong) u_d->returns);
|
|
table->field[2]->store(u_d->dl,(uint) strlen(u_d->dl), default_charset_info);
|
|
if (table->fields >= 4) // If not old func format
|
|
table->field[3]->store((longlong) u_d->type);
|
|
error = table->file->write_row(table->record[0]);
|
|
|
|
close_thread_tables(thd);
|
|
if (error)
|
|
{
|
|
net_printf(thd, ER_ERROR_ON_WRITE, "func@mysql",error);
|
|
del_udf(u_d);
|
|
goto err;
|
|
}
|
|
pthread_mutex_unlock(&THR_LOCK_udf);
|
|
DBUG_RETURN(0);
|
|
|
|
err:
|
|
if (new_dl)
|
|
dlclose(dl);
|
|
pthread_mutex_unlock(&THR_LOCK_udf);
|
|
DBUG_RETURN(1);
|
|
}
|
|
|
|
|
|
int mysql_drop_function(THD *thd,const char *udf_name)
|
|
{
|
|
TABLE *table;
|
|
TABLE_LIST tables;
|
|
udf_func *udf;
|
|
DBUG_ENTER("mysql_drop_function");
|
|
if (!initialized)
|
|
{
|
|
send_error(thd, ER_OUT_OF_RESOURCES, ER(ER_OUT_OF_RESOURCES));
|
|
DBUG_RETURN(1);
|
|
}
|
|
pthread_mutex_lock(&THR_LOCK_udf);
|
|
if (!(udf=(udf_func*) hash_search(&udf_hash,(byte*) udf_name, (uint) strlen(udf_name))))
|
|
{
|
|
net_printf(thd, ER_FUNCTION_NOT_DEFINED, udf_name);
|
|
goto err;
|
|
}
|
|
del_udf(udf);
|
|
if (!find_udf_dl(udf->dl))
|
|
dlclose(udf->dlhandle);
|
|
|
|
bzero((char*) &tables,sizeof(tables));
|
|
tables.db=(char*) "mysql";
|
|
tables.real_name=tables.name=(char*) "func";
|
|
if (!(table = open_ltable(thd,&tables,TL_WRITE)))
|
|
goto err;
|
|
if (!table->file->index_read_idx(table->record[0],0,(byte*) udf_name,
|
|
(uint) strlen(udf_name),
|
|
HA_READ_KEY_EXACT))
|
|
{
|
|
int error;
|
|
if ((error = table->file->delete_row(table->record[0])))
|
|
table->file->print_error(error, MYF(0));
|
|
}
|
|
close_thread_tables(thd);
|
|
|
|
pthread_mutex_unlock(&THR_LOCK_udf);
|
|
DBUG_RETURN(0);
|
|
err:
|
|
pthread_mutex_unlock(&THR_LOCK_udf);
|
|
DBUG_RETURN(1);
|
|
}
|
|
|
|
#endif /* HAVE_DLOPEN */
|
|
|
|
/*
|
|
** Local variables:
|
|
** tab-width: 8
|
|
** c-basic-offset: 2
|
|
** End:
|
|
*/
|