mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
Merge bodhi.netgear:/opt/local/work/tmp_merge
into bodhi.netgear:/opt/local/work/mysql-5.1-runtime-merge-with-5.0
This commit is contained in:
@ -114,7 +114,8 @@ void udf_init()
|
||||
READ_RECORD read_record_info;
|
||||
TABLE *table;
|
||||
int error;
|
||||
DBUG_ENTER("udf_init");
|
||||
DBUG_ENTER("ufd_init");
|
||||
char db[]= "mysql"; /* A subject to casednstr, can't be constant */
|
||||
|
||||
if (initialized)
|
||||
DBUG_VOID_RETURN;
|
||||
@ -135,13 +136,12 @@ void udf_init()
|
||||
initialized = 1;
|
||||
new_thd->thread_stack= (char*) &new_thd;
|
||||
new_thd->store_globals();
|
||||
new_thd->db= my_strdup("mysql", MYF(0));
|
||||
new_thd->db_length=5;
|
||||
new_thd->set_db(db, sizeof(db)-1);
|
||||
|
||||
bzero((gptr) &tables,sizeof(tables));
|
||||
tables.alias= tables.table_name= (char*) "func";
|
||||
tables.lock_type = TL_READ;
|
||||
tables.db=new_thd->db;
|
||||
tables.db= db;
|
||||
|
||||
if (simple_open_n_lock_tables(new_thd, &tables))
|
||||
{
|
||||
|
Reference in New Issue
Block a user