database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

A clean-up patch for Item_func_conv_charset (needed for MDEV-9181)

Browse Source 
Removing the "conv_charset" member and using collation.collation
instead, as they duplicated each other.
This commit is contained in:
Alexander Barkov
2016-01-26 17:52:24 +04:00
parent 71b39066d4
commit 77c75a46cf
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
storage/spider/spd_db_mysql.cc
View File

@@ -4041,7 +4041,7 @@ int spider_db_mysql_util::open_item_func(
{
Item_func_conv_charset *item_func_conv_charset =
(Item_func_conv_charset *)item_func;
CHARSET_INFO *conv_charset = item_func_conv_charset->conv_charset;
CHARSET_INFO *conv_charset = item_func_conv_charset->collation.collation;
uint cset_length = strlen(conv_charset->csname);
if (str->reserve(SPIDER_SQL_USING_LEN + cset_length))
DBUG_RETURN(HA_ERR_OUT_OF_MEM);