← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/db.cc

  • Committer: Brian Aker
  • Date: 2009-01-06 09:02:30 UTC
  • mfrom: (758.1.5 devel)
  • Revision ID: brian@tangent.org-20090106090230-ov94my79hsiz4bes
Merge from Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/db.cc
402
402
  buffer= db.characterset();
403
403
  if (!(create->default_table_charset= get_charset_by_csname(buffer.c_str(), MY_CS_PRIMARY, MYF(0))))
404
404
  {
405
 
    sql_print_error(_("Error while loading database options: '%s':"),path);
406
 
    sql_print_error(ER(ER_UNKNOWN_COLLATION), buffer.c_str());
 
405
    errmsg_printf(ERRMSG_LVL_ERROR, _("Error while loading database options: '%s':"),path);
 
406
    errmsg_printf(ERRMSG_LVL_ERROR, ER(ER_UNKNOWN_COLLATION), buffer.c_str());
407
407
    create->default_table_charset= default_charset_info;
408
408
  }
409
409
 
410
410
  buffer= db.collation();
411
411
  if (!(create->default_table_charset= get_charset_by_name(buffer.c_str(), MYF(0))))
412
412
  {
413
 
    sql_print_error(_("Error while loading database options: '%s':"),path);
414
 
    sql_print_error(ER(ER_UNKNOWN_COLLATION), buffer.c_str());
 
413
    errmsg_printf(ERRMSG_LVL_ERROR, _("Error while loading database options: '%s':"),path);
 
414
    errmsg_printf(ERRMSG_LVL_ERROR, ER(ER_UNKNOWN_COLLATION), buffer.c_str());
415
415
    create->default_table_charset= default_charset_info;
416
416
  }
417
417