← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/drizzled.cc

  • Committer: Brian Aker
  • Date: 2009-05-14 16:47:01 UTC
  • mfrom: (1014.3.4 merge)
  • Revision ID: brian@gaz-20090514164701-l58qmp3mqo6et160
Merging Brian's work.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/drizzled.cc
1479
1479
  }
1480
1480
  /* Set collactions that depends on the default collation */
1481
1481
  global_system_variables.collation_server=      default_charset_info;
1482
 
  global_system_variables.collation_database=    default_charset_info;
1483
1482
 
1484
1483
  global_system_variables.optimizer_use_mrr= 1;
1485
1484
  global_system_variables.optimizer_switch= 0;