← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/main.cc

  • Committer: Monty Taylor
  • Date: 2010-09-27 18:14:40 UTC
  • mto: (1798.2.1 fix-install-pidfile)
  • mto: This revision was merged to the branch mainline in revision 1801.
  • Revision ID: mordred@inaugust.com-20100927181440-3xydnd9w26p2luks
Fixed temporoary dir sequencing.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/main.cc
236
236
  google::protobuf::SetLogHandler(&GoogleProtoErrorThrower);
237
237
 
238
238
  /* Function generates error messages before abort */
 
239
  error_handler_hook= my_message_sql;
239
240
  /* init_common_variables must get basic settings such as data_home_dir
240
241
     and plugin_load_list. */
241
242
  if (init_common_variables(argc, argv, modules))
242
243
    unireg_abort(1);                            // Will do exit
243
244
 
 
245
  /*
 
246
    init signals & alarm
 
247
    After this we can't quit by a simple unireg_abort
 
248
  */
244
249
  init_signals();
245
250
 
246
251
 
304
309
  if (plugin::Listen::setup())
305
310
    unireg_abort(1);
306
311
 
307
 
  /*
308
 
    init signals & alarm
309
 
    After this we can't quit by a simple unireg_abort
310
 
  */
311
 
  error_handler_hook= my_message_sql;
312
312
 
313
313
  assert(plugin::num_trx_monitored_objects > 0);
314
314
  if (drizzle_rm_tmp_tables() ||