← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_connect.cc

  • Committer: Monty Taylor
  • Date: 2008-09-13 20:24:20 UTC
  • mfrom: (383.1.35 drizzle)
  • Revision ID: monty@inaugust.com-20080913202420-lkj76ewbabl8ljvp
Merged from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_connect.cc
184
184
  */
185
185
  if (!opt_character_set_client_handshake ||
186
186
      !(thd->variables.character_set_client= get_charset(cs_number, MYF(0))) ||
187
 
      !my_strcasecmp(&my_charset_latin1,
 
187
      !my_strcasecmp(&my_charset_utf8_general_ci,
188
188
                     global_system_variables.character_set_client->name,
189
189
                     thd->variables.character_set_client->name))
190
190
  {