← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/main.cc

  • Committer: Andrew Hutchings
  • Date: 2010-09-08 19:03:09 UTC
  • mfrom: (1750 staging)
  • mto: (1750.1.1 build)
  • mto: This revision was merged to the branch mainline in revision 1751.
  • Revision ID: andrew@linuxjedi.co.uk-20100908190309-mya1nu7xvo1fpvk8
Merge trunk into branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/main.cc
229
229
 
230
230
  google::protobuf::SetLogHandler(&GoogleProtoErrorThrower);
231
231
 
 
232
  /*
 
233
    init signals & alarm
 
234
    After this we can't quit by a simple unireg_abort
 
235
  */
 
236
  error_handler_hook= my_message_sql;
 
237
 
 
238
  /* Function generates error messages before abort */
232
239
  if (init_common_variables(DRIZZLE_CONFIG_NAME,
233
240
                            argc, argv, load_default_groups))
234
241
    unireg_abort(1);                            // Will do exit
249
256
  data_home[1]=0;
250
257
  data_home_len= 2;
251
258
 
252
 
  if ((user_info= check_user(drizzled_user)))
253
 
  {
254
 
    set_user(drizzled_user, user_info);
255
 
  }
256
 
 
257
259
  if (server_id == 0)
258
260
  {
259
261
    server_id= 1;
279
281
  if (plugin::Listen::setup())
280
282
    unireg_abort(1);
281
283
 
282
 
  /*
283
 
    init signals & alarm
284
 
    After this we can't quit by a simple unireg_abort
285
 
  */
286
 
  error_handler_hook= my_message_sql;
287
 
 
288
284
  assert(plugin::num_trx_monitored_objects > 0);
289
285
  if (drizzle_rm_tmp_tables() ||
290
286
      my_tz_init((Session *)0, default_tz_name))