diff options
| author | unknown <acurtis@xiphis.org> | 2005-04-09 00:36:08 +0100 |
|---|---|---|
| committer | unknown <acurtis@xiphis.org> | 2005-04-09 00:36:08 +0100 |
| commit | 2054223668a8a53cdd35eb60c23c92d74ad9dd7f (patch) | |
| tree | b1ecb9cb422d7fed611b7901d4c764981ad8754e /sql/sql_udf.cc | |
| parent | 01b0f1a3e5fdb514e9cfde3db07cb6a323e367a4 (diff) | |
| parent | fbb21ebfe26e2cbb1729ac419e3fb659b6c3b4b5 (diff) | |
| download | mariadb-git-2054223668a8a53cdd35eb60c23c92d74ad9dd7f.tar.gz | |
Merge xiphis.org:/var/db/bk/work-acurtis/bug6776.1
into xiphis.org:/var/db/bk/work-acurtis/bug6776.2
BitKeeper/etc/logging_ok:
auto-union
sql/sql_udf.cc:
Auto merged
Diffstat (limited to 'sql/sql_udf.cc')
| -rw-r--r-- | sql/sql_udf.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sql/sql_udf.cc b/sql/sql_udf.cc index 3340c46bb6b..f5d64efb5e9 100644 --- a/sql/sql_udf.cc +++ b/sql/sql_udf.cc @@ -525,8 +525,11 @@ 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; - 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; |