diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 9237eea21c4..e4de8c6ebf2 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -8,6 +8,7 @@ Miguel@light.local Sinisa@sinisa.nasamreza.org WAX@sergbook.mysql.com acurtis@pcgem.rdg.cyberkinetica.com +acurtis@xiphis.org administrador@light.hegel.local ahlentz@co3064164-a.rochd1.qld.optusnet.com.au akishkin@work.mysql.com diff --git a/sql/sql_udf.cc b/sql/sql_udf.cc index 05df069d69a..19df1a85565 100644 --- a/sql/sql_udf.cc +++ b/sql/sql_udf.cc @@ -526,8 +526,11 @@ int mysql_drop_function(THD *thd,const LEX_STRING *udf_name) tables.real_name= tables.alias= (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->str, - (uint) udf_name->length, + table->field[0]->store(udf_name.str, udf_name.length, system_charset_info); + table->file->extra(HA_EXTRA_RETRIEVE_ALL_COLS); + if (!table->file->index_read_idx(table->record[0], 0, + (byte*) table->field[0]->ptr, + table->key_info[0].key_length HA_READ_KEY_EXACT)) { int error;