← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/main.cc

Merge Monty - Added inter-plugin dependencies for controlling plugin load order

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/main.cc
62
62
#include "drizzled/replication_services.h"
63
63
#include "drizzled/transaction_services.h"
64
64
#include "drizzled/catalog/local.h"
 
65
#include "drizzled/abort_exception.h"
65
66
 
66
67
#include <drizzled/debug.h>
67
68
 
291
292
    server_id= 1;
292
293
  }
293
294
 
294
 
  if (init_server_components(modules))
 
295
  try
 
296
  {
 
297
    if (init_server_components(modules))
 
298
      DRIZZLE_ABORT;
 
299
  }
 
300
  catch (abort_exception& ex)
 
301
  {
 
302
#if defined(DEBUG)
 
303
    cout << _("Drizzle has receieved an abort event.") << endl;
 
304
    cout << _("In Function: ") << *::boost::get_error_info<boost::throw_function>(ex) << endl;
 
305
    cout << _("In File: ") << *::boost::get_error_info<boost::throw_file>(ex) << endl;
 
306
    cout << _("On Line: ") << *::boost::get_error_info<boost::throw_line>(ex) << endl;
 
307
#endif
295
308
    unireg_abort(1);
 
309
  }
 
310
 
296
311
 
297
312
  /**
298
313
   * This check must be done after init_server_components for now