Commit f2824c4d authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-4.1 

into xiphis.org:/.amd_mnt/bk.anubis/host/work-acurtis/bug6776.1
parents dab65c71 fbb21ebf

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -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

sql/sql_udf.cc

+5 −2
Original line number Diff line number Diff line
@@ -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;