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

More tests for "MDEV-7563 Support CHECK constraint".

Browse Source 
Testing non-ASCII string literals.
This commit is contained in:
Alexander Barkov
2016-06-24 23:57:27 +02:00
committed by Sergei Golubchik
parent 11debf698f
commit 3f32bf627f
9 changed files with 158 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
sql/sql_connect.cc
View File

@ -799,12 +799,9 @@ bool thd_init_client_charset(THD *thd, uint cs_number)
if (!opt_character_set_client_handshake ||
!(cs= get_charset(cs_number, MYF(0))))
{
thd->variables.character_set_client=
global_system_variables.character_set_client;
thd->variables.collation_connection=
global_system_variables.collation_connection;
thd->variables.character_set_results=
global_system_variables.character_set_results;
thd->update_charset(global_system_variables.character_set_client,
global_system_variables.collation_connection,
global_system_variables.character_set_results);
}
else
{
@ -814,10 +811,8 @@ bool thd_init_client_charset(THD *thd, uint cs_number)
my_error(ER_WRONG_VALUE_FOR_VAR, MYF(0), "character_set_client",
cs->csname);
return true;
}
thd->variables.character_set_results=
thd->variables.collation_connection=
thd->variables.character_set_client= cs;
}
thd->update_charset(cs,cs,cs);
}
return false;
}