diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-03-29 16:53:37 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-03-29 16:53:37 +0300 |
| commit | d84a2826290d9676faebba0849d1b9fb7f5efcd8 (patch) | |
| tree | 22a7c58cda643c4c0f1c610e4d77c29d0995c5c0 /sql/log_event_client.cc | |
| parent | 50c8ef01fc63e32acd38788107ae4029d0f1b9ce (diff) | |
| parent | 191821f7df312a8d0f723cc937ef6a6e2388b0d6 (diff) | |
| download | mariadb-git-d84a2826290d9676faebba0849d1b9fb7f5efcd8.tar.gz | |
Merge 10.10 into 10.11
Diffstat (limited to 'sql/log_event_client.cc')
| -rw-r--r-- | sql/log_event_client.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/log_event_client.cc b/sql/log_event_client.cc index 15d3ae8921b..4ae8bffcad7 100644 --- a/sql/log_event_client.cc +++ b/sql/log_event_client.cc @@ -1970,11 +1970,11 @@ bool Query_log_event::print_query_header(IO_CACHE* file, goto err; } if (my_b_printf(file,"SET " - "@@session.character_set_client=%d," + "@@session.character_set_client=%s," "@@session.collation_connection=%d," "@@session.collation_server=%d" "%s\n", - uint2korr(charset), + cs_info->cs_name.str, uint2korr(charset+2), uint2korr(charset+4), print_event_info->delimiter)) |