1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00

Folow up on the CS patch:

1. Fix ddl_i18n_koi8r, ddl_i18n_utf8: explicitly specify character-sets
directory for mysqldump;
2. Fix crash in mysqldump if collation is not found;
3. Use proper way to compare character set names.
This commit is contained in:
anozdrin/alik@ibm.
2007-06-29 16:52:05 +04:00
parent 9fae9ef66f
commit bceff6f1d4
4 changed files with 72 additions and 45 deletions

View File

@ -249,7 +249,7 @@ void Lex_input_stream::body_utf8_append_literal(THD *thd,
LEX_STRING utf_txt;
if (txt_cs->number != my_charset_utf8_general_ci.number)
if (my_charset_same(txt_cs, &my_charset_utf8_general_ci))
{
thd->convert_string(&utf_txt,
&my_charset_utf8_general_ci,