← Back to branch summary

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

« back to all changes in this revision

Viewing changes to sql/mysqld.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/mysqld.cc
3483
3483
  /* Set collactions that depends on the default collation */
3484
3484
  global_system_variables.collation_server=      default_charset_info;
3485
3485
  global_system_variables.collation_database=    default_charset_info;
3486
 
  global_system_variables.collation_connection=  default_charset_info;
3487
 
  global_system_variables.character_set_results= default_charset_info;
3488
 
  global_system_variables.character_set_client=  default_charset_info;
 
3486
 
 
3487
  if (is_supported_parser_charset(default_charset_info))
 
3488
  {
 
3489
    global_system_variables.collation_connection= default_charset_info;
 
3490
    global_system_variables.character_set_results= default_charset_info;
 
3491
    global_system_variables.character_set_client= default_charset_info;
 
3492
  }
 
3493
  else
 
3494
  {
 
3495
    sql_print_information("'%s' can not be used as client character set. "
 
3496
                          "'%s' will be used as default client character set.",
 
3497
                          default_charset_info->csname,
 
3498
                          my_charset_latin1.csname);
 
3499
    global_system_variables.collation_connection= &my_charset_latin1;
 
3500
    global_system_variables.character_set_results= &my_charset_latin1;
 
3501
    global_system_variables.character_set_client= &my_charset_latin1;
 
3502
  }
 
3503
 
3489
3504
  if (!(character_set_filesystem= 
3490
3505
        get_charset_by_csname(character_set_filesystem_name,
3491
3506
                              MY_CS_PRIMARY, MYF(MY_WME))))