database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge of patch for bug#14685362 from mysql-5.1.

Browse Source
This commit is contained in:
Nirbhay Choubey
2013-03-18 12:46:06 +05:30
parent 4df9eafa03 78eb581829
commit fb401ad38e
2 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql-common/client.c
View File

@ -2215,6 +2215,8 @@ mysql_autodetect_character_set(MYSQL *mysql)
}
#endif
if (mysql->options.charset_name)
my_free(mysql->options.charset_name);
if (!(mysql->options.charset_name= my_strdup(csname, MYF(MY_WME))))
return 1;
return 0;