diff options
| author | unknown <acurtis@xiphis.org> | 2005-04-08 21:40:50 +0100 |
|---|---|---|
| committer | unknown <acurtis@xiphis.org> | 2005-04-08 21:40:50 +0100 |
| commit | be400cb092574d3b4f81a7e6c0d01759eb34f10a (patch) | |
| tree | 3066268324dd9b4ccc00382fa9ddb273f7ebb317 /sql/sql_udf.cc | |
| parent | 5474a95aa574df8755f88d9c634a1b692ed6f538 (diff) | |
| parent | 11d36cab93dfca86a818b7f79eacbeaf82d9dbb4 (diff) | |
| download | mariadb-git-be400cb092574d3b4f81a7e6c0d01759eb34f10a.tar.gz | |
Merge xiphis.org:/var/db/bk/work-acurtis/bug6776
into xiphis.org:/var/db/bk/work-acurtis/bug6776.1
sql/sql_udf.cc:
Auto merged
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
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 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; |