summaryrefslogtreecommitdiff
path: root/sql/sql_udf.cc
diff options
context:
space:
mode:
authorunknown <bar@gw.udmsearch.izhnet.ru>2002-05-17 16:29:52 +0500
committerunknown <bar@gw.udmsearch.izhnet.ru>2002-05-17 16:29:52 +0500
commit8bee96ab0ad02e45bb4652f6878173d030642051 (patch)
treee4f1191a52998c24839a96bb95784af36d1f03d0 /sql/sql_udf.cc
parentb043f06666c278a4277e7d35b1bff418d45708c2 (diff)
downloadmariadb-git-8bee96ab0ad02e45bb4652f6878173d030642051.tar.gz
Now string values are created and filled with charset field
SELECT func(charset2) FROM t ORDER BY 1 works in correct charset
Diffstat (limited to 'sql/sql_udf.cc')
-rw-r--r--sql/sql_udf.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_udf.cc b/sql/sql_udf.cc
index f44fa3b7321..225c0ea26a4 100644
--- a/sql/sql_udf.cc
+++ b/sql/sql_udf.cc
@@ -412,9 +412,9 @@ int mysql_create_function(THD *thd,udf_func *udf)
goto err;
restore_record(table,2); // Get default values for fields
- table->field[0]->store(u_d->name, u_d->name_length);
+ table->field[0]->store(u_d->name, u_d->name_length, default_charset_info);
table->field[1]->store((longlong) u_d->returns);
- table->field[2]->store(u_d->dl,(uint) strlen(u_d->dl));
+ table->field[2]->store(u_d->dl,(uint) strlen(u_d->dl), default_charset_info);
if (table->fields >= 4) // If not old func format
table->field[3]->store((longlong) u_d->type);
error = table->file->write_row(table->record[0]);