diff options
| author | Alexander Barkov <bar@mariadb.org> | 2017-12-27 12:30:05 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2017-12-27 12:30:05 +0400 |
| commit | 02b7dc7bec4ff95c764a244c5037c69f262651e1 (patch) | |
| tree | 3a5030e6d5995fefee6935c41efee5373394fdc6 /sql/sp.cc | |
| parent | c3bd0b0301936d0dcd0918bb8c966c272610d61b (diff) | |
| download | mariadb-git-02b7dc7bec4ff95c764a244c5037c69f262651e1.tar.gz | |
MDEV-14249 Wrong character set info of Query_log_event and the query in Query_log_event constructed by different charsets cause error when slave apply the event.
Diffstat (limited to 'sql/sp.cc')
| -rw-r--r-- | sql/sp.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sp.cc b/sql/sp.cc index fcbf4dc43d4..ef4d0996b78 100644 --- a/sql/sp.cc +++ b/sql/sp.cc @@ -1277,8 +1277,8 @@ log: { thd->clear_error(); - String log_query; - log_query.set_charset(system_charset_info); + StringBuffer<128> log_query(thd->variables.character_set_client); + DBUG_ASSERT(log_query.charset()->mbminlen == 1); if (!show_create_sp(thd, &log_query, sp->m_type, |