1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-20101 Assertion failure on select @@global.'m2'.replicate_ignore_table;

Browse Source 
- Removing the wrong assert
- Re-enabling  multi_source.mdev-8874
This commit is contained in:
Alexander Barkov 2019-08-05 16:03:33 +04:00
parent 6b48bdf269
commit 4c4e379ba9
4 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/suite/multi_source/disabled.def
View File

@ -1 +0,0 @@
mdev-8874 : MDEV-20101 Assertion failure

10
mysql-test/suite/sys_vars/r/replicate_ignore_table_basic.result
View File

@ -46,3 +46,13 @@ SELECT @@GLOBAL.replicate_ignore_table;
# Cleanup.
SET @@GLOBAL.replicate_ignore_table = @save_replicate_ignore_table;
#
# MDEV-20101 Assertion failure on select @@global.'m2'.replicate_ignore_table
#
SET NAMES latin1;
SELECT @@global.'m2'.replicate_ignore_table;
@@global.'m2'.replicate_ignore_table
NULL
Warnings:
Warning 1617 There is no master connection 'm2'
Warning 1617 There is no master connection 'm2'

7
mysql-test/suite/sys_vars/t/replicate_ignore_table_basic.test
View File

@ -49,3 +49,10 @@ SELECT @@GLOBAL.replicate_ignore_table;
--echo # Cleanup.
SET @@GLOBAL.replicate_ignore_table = @save_replicate_ignore_table;
--echo #
--echo # MDEV-20101 Assertion failure on select @@global.'m2'.replicate_ignore_table
--echo #
SET NAMES latin1;
SELECT @@global.'m2'.replicate_ignore_table;

1
sql/sql_class.cc
View File

@ -2400,7 +2400,6 @@ bool THD::check_string_for_wellformedness(const char *str,
size_t length,
CHARSET_INFO *cs) const
{
DBUG_ASSERT(charset_is_system_charset);
size_t wlen= Well_formed_prefix(cs, str, length).length();
if (wlen < length)
{