diff options
| author | unknown <bar@mysql.com> | 2005-09-02 10:40:06 +0500 |
|---|---|---|
| committer | unknown <bar@mysql.com> | 2005-09-02 10:40:06 +0500 |
| commit | 38b8687dcf2644b98ed4c0982cb3a964eae9321f (patch) | |
| tree | 484be81f87b970a3d83a54b0c5e52ce67fcfc41f /sql | |
| parent | 38b7c29a808bf519ce08f851759a2726a39dbb35 (diff) | |
| parent | 59272376a4410ca75d12ea4da09b2412ff5179db (diff) | |
| download | mariadb-git-38b8687dcf2644b98ed4c0982cb3a964eae9321f.tar.gz | |
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/home/bar/mysql-5.0
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sp_head.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sp_head.cc b/sql/sp_head.cc index 4358a37daa6..e04523902db 100644 --- a/sql/sp_head.cc +++ b/sql/sp_head.cc @@ -244,8 +244,8 @@ sp_eval_func_item(THD *thd, Item **it_addr, enum enum_field_types type, } DBUG_PRINT("info",("STRING_RESULT: %*s", s->length(), s->c_ptr_quick())); - CREATE_ON_CALLERS_ARENA(it= new(reuse, &rsize) - Item_string(it->collation.collation), + CHARSET_INFO *itcs= it->collation.collation; + CREATE_ON_CALLERS_ARENA(it= new(reuse, &rsize) Item_string(itcs), use_callers_arena, &backup_current_arena); /* We have to use special constructor and allocate string |