← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/handler.cc

  • Committer: Mark Atwood
  • Date: 2009-01-05 04:37:22 UTC
  • mto: (758.1.1 devel)
  • mto: This revision was merged to the branch mainline in revision 759.
  • Revision ID: me@mark.atwood.name-20090105043722-03l4mzcxi4yjjjih
replace sql_print_error etc with errmsg_print

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/handler.cc
958
958
  {
959
959
    while ((got= hton->recover(hton, info->list, info->len)) > 0 )
960
960
    {
961
 
      sql_print_information(_("Found %d prepared transaction(s) in %s"),
 
961
      errmsg_printf(ERRMSG_LVL_INFO, _("Found %d prepared transaction(s) in %s"),
962
962
                            got, ha_resolve_storage_engine_name(hton));
963
963
      for (int i=0; i < got; i ++)
964
964
      {
1010
1010
    return(0);
1011
1011
 
1012
1012
  if (info.commit_list)
1013
 
    sql_print_information(_("Starting crash recovery..."));
 
1013
    errmsg_printf(ERRMSG_LVL_INFO, _("Starting crash recovery..."));
1014
1014
 
1015
1015
 
1016
1016
#ifndef WILL_BE_DELETED_LATER
1033
1033
  }
1034
1034
  if (!info.list)
1035
1035
  {
1036
 
    sql_print_error(ER(ER_OUTOFMEMORY), info.len*sizeof(XID));
 
1036
    errmsg_printf(ERRMSG_LVL_ERROR, ER(ER_OUTOFMEMORY), info.len*sizeof(XID));
1037
1037
    return(1);
1038
1038
  }
1039
1039
 
1042
1042
 
1043
1043
  free((unsigned char*)info.list);
1044
1044
  if (info.found_foreign_xids)
1045
 
    sql_print_warning(_("Found %d prepared XA transactions"),
1046
 
                      info.found_foreign_xids);
 
1045
    errmsg_printf(ERRMSG_LVL_WARN, _("Found %d prepared XA transactions"),
 
1046
                  info.found_foreign_xids);
1047
1047
  if (info.dry_run && info.found_my_xids)
1048
1048
  {
1049
 
    sql_print_error(_("Found %d prepared transactions! It means that drizzled "
 
1049
    errmsg_printf(ERRMSG_LVL_ERROR,
 
1050
                  _("Found %d prepared transactions! It means that drizzled "
1050
1051
                    "was not shut down properly last time and critical "
1051
1052
                    "recovery information (last binlog or %s file) was "
1052
1053
                    "manually deleted after a crash. You have to start "
1056
1057
    return(1);
1057
1058
  }
1058
1059
  if (info.commit_list)
1059
 
    sql_print_information(_("Crash recovery finished."));
 
1060
    errmsg_printf(ERRMSG_LVL_INFO, _("Crash recovery finished."));
1060
1061
  return(0);
1061
1062
}
1062
1063