mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-06 15:15:34 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge bb-10.2-ext into 10.3

Browse source
This commit is contained in:
Marko Mäkelä 2018-01-04 09:22:59 +02:00
commit 145ae15a33
209 changed files with 6855 additions and 1509 deletions
Download patch file Download diff file Expand all files Collapse all files

4
sql/sp.cc
View file

@ -1345,8 +1345,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_explicit_name ? sp->m_db : null_clex_str,