diff options
| author | Nirbhay Choubey <nirbhay.choubey@oracle.com> | 2013-03-18 12:46:06 +0530 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay.choubey@oracle.com> | 2013-03-18 12:46:06 +0530 |
| commit | fb401ad38e2238f246aeaeab830927c4528efd0c (patch) | |
| tree | c01799f77c48abe53533d4ae3c2e889fe9ee65db /sql-common | |
| parent | 4df9eafa03d0c6f2bac00e8d17bc81b9e82edca5 (diff) | |
| parent | 78eb58182905f47710b1d35b820ed9b5d0a72917 (diff) | |
| download | mariadb-git-fb401ad38e2238f246aeaeab830927c4528efd0c.tar.gz | |
Merge of patch for bug#14685362 from mysql-5.1.
Diffstat (limited to 'sql-common')
| -rw-r--r-- | sql-common/client.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql-common/client.c b/sql-common/client.c index ef1e3c1b7d4..7e369e74eb8 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -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; |