diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-03-20 21:41:27 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-03-20 21:41:27 +0100 |
| commit | c7f8c632eb485566ddb6b98c924a78a15cbef2fc (patch) | |
| tree | 316670b60bea41e56d82cc81ba41b4049cea2c66 /sql/item_func.cc | |
| parent | 60bc9ad712c846b235d9856cf5cd9663a9ab076a (diff) | |
| parent | b1aacfac72065ab4085199522f75bdaf1f44a088 (diff) | |
| download | mariadb-git-c7f8c632eb485566ddb6b98c924a78a15cbef2fc.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1
into neptunus.(none):/home/msvensson/mysql/bug11835/my51-bug11835
client/mysqltest.c:
Auto merged
configure.in:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
sql/item_func.cc:
Auto merged
sql/sql_udf.cc:
Auto merged
sql/share/errmsg.txt:
Auto merged
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 34fd07e5a16..7937f4093f2 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -2608,7 +2608,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(); |