diff options
| author | unknown <tsmith@ramayana.hindu.god> | 2007-08-06 16:34:30 -0600 |
|---|---|---|
| committer | unknown <tsmith@ramayana.hindu.god> | 2007-08-06 16:34:30 -0600 |
| commit | da6c340e168643a88fe705252b2066e91b8541df (patch) | |
| tree | e8510b03aaf7540ac29c893bc7925638ad6d70e2 /sql/item_func.cc | |
| parent | e887155203fc4ec7d657508efaf0ee945d5f9e6b (diff) | |
| parent | ccb32a59465eb502d6e292e5f074dcade1ec7fa8 (diff) | |
| download | mariadb-git-da6c340e168643a88fe705252b2066e91b8541df.tar.gz | |
Merge ramayana.hindu.god:/home/tsmith/m/bk/51
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
BitKeeper/deleted/.del-.del-README.txt:
Auto merged
sql/item_func.cc:
Auto merged
Diffstat (limited to 'sql/item_func.cc')
| -rw-r--r-- | sql/item_func.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index 83b27de29b7..f016aa6cd05 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -2916,7 +2916,8 @@ udf_handler::fix_fields(THD *thd, Item_result_field *func, String *res= arguments[i]->val_str(&buffers[i]); if (arguments[i]->null_value) continue; - f_args.args[i]= (char*) res->ptr(); + f_args.args[i]= (char*) res->c_ptr(); + f_args.lengths[i]= res->length(); break; } case INT_RESULT: |