Commit 4c4e379b authored by Alexander Barkov's avatar Alexander Barkov

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

- Removing the wrong assert
- Re-enabling  multi_source.mdev-8874
parent 6b48bdf2
...@@ -46,3 +46,13 @@ SELECT @@GLOBAL.replicate_ignore_table; ...@@ -46,3 +46,13 @@ SELECT @@GLOBAL.replicate_ignore_table;
# Cleanup. # Cleanup.
SET @@GLOBAL.replicate_ignore_table = @save_replicate_ignore_table; 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'
...@@ -49,3 +49,10 @@ SELECT @@GLOBAL.replicate_ignore_table; ...@@ -49,3 +49,10 @@ SELECT @@GLOBAL.replicate_ignore_table;
--echo # Cleanup. --echo # Cleanup.
SET @@GLOBAL.replicate_ignore_table = @save_replicate_ignore_table; 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;
...@@ -2400,7 +2400,6 @@ bool THD::check_string_for_wellformedness(const char *str, ...@@ -2400,7 +2400,6 @@ bool THD::check_string_for_wellformedness(const char *str,
size_t length, size_t length,
CHARSET_INFO *cs) const CHARSET_INFO *cs) const
{ {
DBUG_ASSERT(charset_is_system_charset);
size_t wlen= Well_formed_prefix(cs, str, length).length(); size_t wlen= Well_formed_prefix(cs, str, length).length();
if (wlen < length) if (wlen < length)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment