diff options
| author | unknown <konstantin@bodhi.netgear> | 2006-07-06 22:55:48 +0400 |
|---|---|---|
| committer | unknown <konstantin@bodhi.netgear> | 2006-07-06 22:55:48 +0400 |
| commit | df9b4754b7680fae685d34a9ed1210452f6f8088 (patch) | |
| tree | a054d3ff659c59af94637b315fc1234edc00dbcf /sql/sql_udf.cc | |
| parent | d2b4e9c8e22f3d06848701e8fa1e9c800c471960 (diff) | |
| parent | 7982816b8adac32e055849f0e8d15a973889ad1d (diff) | |
| download | mariadb-git-df9b4754b7680fae685d34a9ed1210452f6f8088.tar.gz | |
Merge bodhi.netgear:/opt/local/work/tmp_merge
into bodhi.netgear:/opt/local/work/mysql-5.1-runtime-merge-with-5.0
mysql-test/r/create.result:
Auto merged
mysql-test/r/ps.result:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/t/create.test:
Auto merged
mysql-test/t/ps.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/sp.cc:
Auto merged
sql/sp.h:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sp_head.h:
Auto merged
sql/sql_db.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_trigger.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/table.h:
Auto merged
sql/tztime.cc:
Auto merged
include/my_sys.h:
Manual merge (second attempt).
mysql-test/r/bdb.result:
Manual merge (second attempt).
mysql-test/t/bdb.test:
Manual merge (second attempt).
mysys/my_malloc.c:
Manual merge (second attempt).
mysys/safemalloc.c:
Manual merge (second attempt).
sql/ha_federated.cc:
Manual merge (second attempt).
sql/log_event.cc:
Manual merge (second attempt).
sql/set_var.cc:
Manual merge (second attempt).
sql/set_var.h:
Manual merge (second attempt).
sql/slave.cc:
Manual merge (second attempt).
sql/slave.h:
Manual merge (second attempt).
sql/sql_class.h:
Manual merge (second attempt).
sql/sql_table.cc:
Manual merge (second attempt).
sql/sql_udf.cc:
Manual merge (second attempt).
sql/sql_yacc.yy:
Manual merge (second attempt).
Diffstat (limited to 'sql/sql_udf.cc')
| -rw-r--r-- | sql/sql_udf.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/sql_udf.cc b/sql/sql_udf.cc index 4b9de6905fe..b92a9363a22 100644 --- a/sql/sql_udf.cc +++ b/sql/sql_udf.cc @@ -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)) { |