Skip to content

Commit 4c4e379

Browse files
committed
MDEV-20101 Assertion failure on select @@global.'m2'.replicate_ignore_table;
- Removing the wrong assert - Re-enabling multi_source.mdev-8874
1 parent 6b48bdf commit 4c4e379

File tree

4 files changed

+17
-2
lines changed

4 files changed

+17
-2
lines changed
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +0,0 @@
1-
mdev-8874 : MDEV-20101 Assertion failure

mysql-test/suite/sys_vars/r/replicate_ignore_table_basic.result

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,3 +46,13 @@ SELECT @@GLOBAL.replicate_ignore_table;
4646

4747
# Cleanup.
4848
SET @@GLOBAL.replicate_ignore_table = @save_replicate_ignore_table;
49+
#
50+
# MDEV-20101 Assertion failure on select @@global.'m2'.replicate_ignore_table
51+
#
52+
SET NAMES latin1;
53+
SELECT @@global.'m2'.replicate_ignore_table;
54+
@@global.'m2'.replicate_ignore_table
55+
NULL
56+
Warnings:
57+
Warning 1617 There is no master connection 'm2'
58+
Warning 1617 There is no master connection 'm2'

mysql-test/suite/sys_vars/t/replicate_ignore_table_basic.test

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,3 +49,10 @@ SELECT @@GLOBAL.replicate_ignore_table;
4949

5050
--echo # Cleanup.
5151
SET @@GLOBAL.replicate_ignore_table = @save_replicate_ignore_table;
52+
53+
--echo #
54+
--echo # MDEV-20101 Assertion failure on select @@global.'m2'.replicate_ignore_table
55+
--echo #
56+
57+
SET NAMES latin1;
58+
SELECT @@global.'m2'.replicate_ignore_table;

sql/sql_class.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2400,7 +2400,6 @@ bool THD::check_string_for_wellformedness(const char *str,
24002400
size_t length,
24012401
CHARSET_INFO *cs) const
24022402
{
2403-
DBUG_ASSERT(charset_is_system_charset);
24042403
size_t wlen= Well_formed_prefix(cs, str, length).length();
24052404
if (wlen < length)
24062405
{

0 commit comments

Comments
 (0)