Skip to content

MDEV-40270 @@default_master_connection does not convert character sets #5350

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ParadoxV5 wants to merge 1 commit into
base: 10.11
Choose a base branch
from
Open

MDEV-40270 @@default_master_connection does not convert character sets #5350

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions mysql-test/main/null_conn.result
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
CHANGE MASTER TO master_host='127.0.0.1\0hulu', master_user='root\0bulu';
SET @@GLOBAL.replicate_do_db= 'A\0Z';
SELECT @@GLOBAL.replicate_do_db;
@@GLOBAL.replicate_do_db
A
SET @@GLOBAL.replicate_do_db= DEFAULT;
RESET SLAVE ALL;
5 changes: 5 additions & 0 deletions mysql-test/suite/sys_vars/r/debug_sync_basic.result
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,8 @@ set @@session.debug_sync=1.1;
ERROR 42000: Incorrect argument type to variable 'debug_sync'
set @@session.debug_sync=1e1;
ERROR 42000: Incorrect argument type to variable 'debug_sync'
set @@session.debug_sync='now SIGNAL �';
select @@session.debug_sync, charset(@@session.debug_sync);
@@session.debug_sync charset(@@session.debug_sync)
ON - current signals: '�' utf8mb3
set @@session.debug_sync=reset;
5 changes: 5 additions & 0 deletions mysql-test/suite/sys_vars/r/default_master_connection_basic.result
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@ SET @@session.default_master_connection = '1234-5678';
SELECT @@session.default_master_connection;
@@session.default_master_connection
1234-5678
SET @@session.default_master_connection = 'ma�tre';
SELECT @@session.default_master_connection ,
CHARSET(@@session.default_master_connection);
@@session.default_master_connection CHARSET(@@session.default_master_connection)
ma�tre utf8mb3
SET @@session.default_master_connection = '@!*/"';
SELECT @@session.default_master_connection;
@@session.default_master_connection
Expand Down
5 changes: 5 additions & 0 deletions mysql-test/suite/sys_vars/t/debug_sync_basic.test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# Note: This file is in Latin1 (Windows-1252) encoding per MTR convention.
--source include/have_debug_sync.inc
#
# exists as session only
Expand All @@ -19,3 +20,7 @@ set @@session.debug_sync=1.1;
--error ER_WRONG_TYPE_FOR_VAR
set @@session.debug_sync=1e1;

# MDEV-40270: string with a different character set (Latin1 here)
set @@session.debug_sync='now SIGNAL �';
select @@session.debug_sync, charset(@@session.debug_sync);
set @@session.debug_sync=reset;
7 changes: 7 additions & 0 deletions mysql-test/suite/sys_vars/t/default_master_connection_basic.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
# Implemented in the scope of MDEV-253
# The variable is SESSION-only
#
# Note: This file is in Latin1 (Windows-1252) encoding per MTR convention.
#

--source include/not_embedded.inc

Expand Down Expand Up @@ -47,10 +49,15 @@ SET @@session.default_master_connection = '';
SELECT @@session.default_master_connection;
SET @@session.default_master_connection = '1234-5678';
SELECT @@session.default_master_connection;
# MDEV-40270: string with a different character set (Latin1 here)
SET @@session.default_master_connection = 'ma�tre';
SELECT @@session.default_master_connection ,
CHARSET(@@session.default_master_connection);
SET @@session.default_master_connection = '@!*/"';
SELECT @@session.default_master_connection;
SET @@session.default_master_connection = REPEAT('a',191);
SELECT @@session.default_master_connection;
# bareword string
SET @@session.default_master_connection = master2;
SELECT @@session.default_master_connection;

Expand Down
29 changes: 17 additions & 12 deletions sql/sys_vars.inl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -864,6 +864,7 @@ public:
SYSVAR_ASSERT(scope() == ONLY_SESSION)
*const_cast<SHOW_TYPE*>(&show_val_type)= SHOW_LEX_STRING;
}
/// Duplicate of Sys_var_charptr::do_string_check() with @ref max_length check
bool do_check(THD *thd, set_var *var) override
{
char buff[STRING_BUFFER_USUAL_SIZE];
Expand All @@ -876,6 +877,17 @@ public:
}
else
{
uint32 _offset;
char charset_buff[STRING_BUFFER_USUAL_SIZE];
String charset_str(charset_buff, sizeof(charset_buff), str.charset());
if (String::needs_conversion(res->length(), res->charset(),
charset_str.charset(), &_offset))
{
uint _errors;
charset_str.copy(res->ptr(), res->length(),
res->charset(), charset_str.charset(), &_errors);
res= &charset_str;
}
if (res->length() > max_length)
{
my_error(ER_WRONG_STRING_LENGTH, MYF(0),
Expand Down Expand Up @@ -1760,20 +1772,13 @@ public:
SYSVAR_ASSERT(scope() == ONLY_SESSION);
option.var_type|= GET_STR;
}
/// Sys_var_dbug::do_check() with fixed charset()
bool do_check(THD *thd, set_var *var) override
{
char buff[STRING_BUFFER_USUAL_SIZE];
String str(buff, sizeof(buff), system_charset_info), *res;

if (!(res=var->value->val_str(&str)))
var->save_result.string_value= empty_lex_str;
else
{
if (!thd->make_lex_string(&var->save_result.string_value,
res->ptr(), res->length()))
return true;
}
return false;
bool error= Sys_var_charptr::do_string_check(thd, var, system_charset_info);
if (!var->save_result.string_value.str)
var->save_result.string_value.str= const_cast<char *>("");
return error;
}
bool session_update(THD *thd, set_var *var) override
{
Expand Down