← Back to branch summary

~ubuntu-branches/ubuntu/trusty/mysql-5.5/trusty-security

« back to all changes in this revision

Viewing changes to sql/sql_acl.cc

  • Committer: Package Import Robot
  • Author(s): Marc Deslauriers
  • Date: 2017-01-18 07:41:29 UTC
  • mfrom: (1.1.30)
  • Revision ID: package-import@ubuntu.com-20170118074129-gyilougbokbprl1p
Tags: 5.5.54-0ubuntu0.14.04.1
* SECURITY UPDATE: Update to 5.5.54 to fix security issues
  - CVE-2017-3238
  - CVE-2017-3243
  - CVE-2017-3244
  - CVE-2017-3258
  - CVE-2017-3265
  - CVE-2017-3291
  - CVE-2017-3312
  - CVE-2017-3313
  - CVE-2017-3317
  - CVE-2017-3318 
* debian/patches/fix_test_events_2.patch: fix date in test.

Show diffs side-by-side

added added

removed removed

Lines of Context:
sql/sql_acl.cc
8789
8789
  {
8790
8790
    mpvio->client_capabilities= uint4korr(end);
8791
8791
    mpvio->max_client_packet_length= 0xfffff;
8792
 
    charset_code= default_charset_info->number;
 
8792
    charset_code= global_system_variables.character_set_client->number;
 
8793
    sql_print_warning("Client failed to provide its character set. "
 
8794
                      "'%s' will be used as client character set.",
 
8795
                      global_system_variables.character_set_client->csname);
8793
8796
    if (mpvio->charset_adapter->init_client_charset(charset_code))
8794
8797
      return packet_error;
8795
8798
    goto skip_to_ssl;
8826
8829
      Old clients didn't have their own charset. Instead the assumption
8827
8830
      was that they used what ever the server used.
8828
8831
    */
8829
 
    charset_code= default_charset_info->number;
 
8832
    charset_code= global_system_variables.character_set_client->number;
 
8833
    sql_print_warning("Client failed to provide its character set. "
 
8834
                      "'%s' will be used as client character set.",
 
8835
                      global_system_variables.character_set_client->csname);
8830
8836
  }
8831
8837
  DBUG_EXECUTE_IF("host_error_charset",
8832
8838
                  {