diff options
| author | Alexander Barkov <bar@mariadb.com> | 2019-08-13 11:42:31 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.com> | 2019-08-13 11:42:31 +0400 |
| commit | 95cdc1ca5f006965e1b0e53a8567f6dbb87e01a1 (patch) | |
| tree | 20f91c9dfc995df26363073737c34e8fe565bfe6 /sql/sql_class.cc | |
| parent | ae1d17f52de045b37e0894e1e6684a911a43696c (diff) | |
| parent | 43882e764d6867c6855b1ff057758a3f08b25c55 (diff) | |
| download | mariadb-git-95cdc1ca5f006965e1b0e53a8567f6dbb87e01a1.tar.gz | |
Merge commit '43882e764d6867c6855b1ff057758a3f08b25c55' into 10.4
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 6647a98feac..64cfcb89ac6 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -2454,7 +2454,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) { |