diff options
| author | unknown <holyfoot/hf@mysql.com/hfmain.(none)> | 2007-01-03 11:13:01 +0400 |
|---|---|---|
| committer | unknown <holyfoot/hf@mysql.com/hfmain.(none)> | 2007-01-03 11:13:01 +0400 |
| commit | 6a4fbf09bec454762c09afd33e264d1a7999597e (patch) | |
| tree | 67158e1231a13e0031e1b313303882ddd6a05ba4 /sql/sql_udf.cc | |
| parent | 42a7506d288a7666b666f9b514e7bbb2b1dc88dd (diff) | |
| parent | 4c737cf1428c4b08bafd9888b86c8aed6002380b (diff) | |
| download | mariadb-git-6a4fbf09bec454762c09afd33e264d1a7999597e.tar.gz | |
Merge mysql.com:/d2/hf/common/my50-common
into mysql.com:/d2/hf/opt/my50-opt
myisam/mi_check.c:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/item_subselect.h:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_udf.cc:
Auto merged
Diffstat (limited to 'sql/sql_udf.cc')
| -rw-r--r-- | sql/sql_udf.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_udf.cc b/sql/sql_udf.cc index 1ebf2a79d7c..5769c39623e 100644 --- a/sql/sql_udf.cc +++ b/sql/sql_udf.cc @@ -535,7 +535,7 @@ int mysql_drop_function(THD *thd,const LEX_STRING *udf_name) tables.table_name= tables.alias= (char*) "func"; if (!(table = open_ltable(thd,&tables,TL_WRITE))) goto err; - table->field[0]->store(udf_name->str, udf_name->length, system_charset_info); + table->field[0]->store(udf->name.str, udf->name.length, &my_charset_bin); table->file->extra(HA_EXTRA_RETRIEVE_ALL_COLS); if (!table->file->index_read_idx(table->record[0], 0, (byte*) table->field[0]->ptr, |