← 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 07:06:04 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-20100927070604-212jlx22rv9c60rk
https://launchpad.net/bugs/648309
https://launchpad.net/bugs/648308
Rearranged option processing.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/main.cc
238
238
  /* Function generates error messages before abort */
239
239
  /* init_common_variables must get basic settings such as data_home_dir
240
240
     and plugin_load_list. */
241
 
  if (init_common_variables(argc, argv))
 
241
  if (init_common_variables(argc, argv, modules))
242
242
    unireg_abort(1);                            // Will do exit
243
243
 
244
244
  init_signals();