← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/db.cc

  • Committer: Monty Taylor
  • Date: 2009-02-09 20:45:49 UTC
  • mfrom: (864 drizzle)
  • mto: This revision was merged to the branch mainline in revision 865.
  • Revision ID: mordred@inaugust.com-20090209204549-hcaonir5zwelh0t9
Merged from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/db.cc
239
239
  close(fd);
240
240
 
241
241
  buffer= db.collation();
242
 
  if (!(create->default_table_charset= get_charset_by_name(buffer.c_str(),
243
 
                                                           MYF(0))))
 
242
  if (!(create->default_table_charset= get_charset_by_name(buffer.c_str())))
244
243
  {
245
244
    errmsg_printf(ERRMSG_LVL_ERROR,
246
245
                  _("Error while loading database options: '%s':"),path);