diff options
| author | msvensson@neptunus.(none) <> | 2006-03-20 21:35:05 +0100 |
|---|---|---|
| committer | msvensson@neptunus.(none) <> | 2006-03-20 21:35:05 +0100 |
| commit | 0811648e31db70b82b902958e0e32bd93c45121a (patch) | |
| tree | babe7a6eb2084eeec3f356cc60ed196117ffd072 /sql/item_func.cc | |
| parent | f78ae59f0f4751c5608f54fd194e0073789600c5 (diff) | |
| parent | 8ca012aefb4c8454054aeedb08fd1e2f0323f562 (diff) | |
| download | mariadb-git-0811648e31db70b82b902958e0e32bd93c45121a.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/bug11835/my50-bug11835
Diffstat (limited to 'sql/item_func.cc')
| -rw-r--r-- | sql/item_func.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index ccfb71e9d0c..7511b2af8c4 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -2606,7 +2606,7 @@ udf_handler::fix_fields(THD *thd, Item_result_field *func, switch(arguments[i]->type()) { case Item::STRING_ITEM: // Constant string ! { - String *res=arguments[i]->val_str((String *) 0); + String *res=arguments[i]->val_str(&buffers[i]); if (arguments[i]->null_value) continue; f_args.args[i]= (char*) res->ptr(); |