diff options
| author | Konstantin Osipov <kostja@sun.com> | 2010-02-02 12:22:17 +0300 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2010-02-02 12:22:17 +0300 |
| commit | 3147bdd0ac34a5c62158b8c28da6ca77e0901f08 (patch) | |
| tree | 919a1043e20b3f1f6a58331ae90a4a9529b0ab5e /sql/sp.cc | |
| parent | 2c6015e8dc962bef8f353af920581d9b6bd7fd82 (diff) | |
| parent | 5bce1e06429c3d58457051f0c439f130609df375 (diff) | |
| download | mariadb-git-3147bdd0ac34a5c62158b8c28da6ca77e0901f08.tar.gz | |
Merge next-mr -> next-4284.
Diffstat (limited to 'sql/sp.cc')
| -rw-r--r-- | sql/sp.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sp.cc b/sql/sp.cc index 8a9f130b8f7..840268e2e22 100644 --- a/sql/sp.cc +++ b/sql/sp.cc @@ -914,6 +914,7 @@ sp_create_routine(THD *thd, int type, sp_head *sp) DBUG_PRINT("enter", ("type: %d name: %.*s",type, (int) sp->m_name.length, sp->m_name.str)); String retstr(64); + retstr.set_charset(system_charset_info); DBUG_ASSERT(type == TYPE_ENUM_PROCEDURE || type == TYPE_ENUM_FUNCTION); @@ -1471,6 +1472,7 @@ sp_find_routine(THD *thd, int type, sp_name *name, sp_cache **cp, 64 -- size of "returns" column of mysql.proc. */ String retstr(64); + retstr.set_charset(sp->get_creation_ctx()->get_client_cs()); DBUG_PRINT("info", ("found: 0x%lx", (ulong)sp)); if (sp->m_first_free_instance) |