~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/drizzled.cc

  • Committer: Brian Aker
  • Date: 2011-07-18 17:13:07 UTC
  • mto: (2392.1.1 drizzle-autoconf)
  • mto: This revision was merged to the branch mainline in revision 2399.
  • Revision ID: brian@tangent.org-20110718171307-3ya21g8ntq16qrsq
This shifts the closing of the socket to after we know that no errors are going to occur.

Show diffs side-by-side

added added

removed removed

Lines of Context:
469
469
void unireg_actual_abort(const char *file, int line, const char *func, const std::string& message)
470
470
{
471
471
  std::stringstream temp;
472
 
  temp << _("Aborting:") << "\"" << message << "\"" << " at " << file << ":" << line << " in " << func << "()";
 
472
  temp << _("Aborting:") << "\"" << message << "\"" << ". Abort was called from " << file << ":" << line << " in " << func << "()";
473
473
  errmsg_printf(error::ERROR, temp.str().c_str());
474
474
 
475
475
  clean_up(opt_help == false);