~drizzle-trunk/drizzle/development

merge lp:~brianaker/drizzle/lion-fix

added added

removed removed

476

{

477

std::stringstream temp;

478

temp << _("Aborting:") << "\"" << message << "\"" << ". Abort was called from " << file << ":" << line << " in " << func << "()";

479

errmsg_printf(error::ERROR, temp.str().c_str());

479

errmsg_printf(error::ERROR, "%s", temp.str().c_str());

480

481

clean_up(vm.count("help") == 0);

482

internal::my_end();