← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/main.cc

  • Committer: lbieber
  • Date: 2010-09-07 22:29:56 UTC
  • mfrom: (1747.1.3 build)
  • Revision ID: lbieber@orisndriz03-20100907222956-d60u695b7hx3zs0d
Merge Andrew - bug 597778 - Timestamp cannot reliably store leap seconds, so don't try. Leave that to datetime only
Merge Andrew - bug 621862 - Add / clean-up error messages for unireg_abort
Merge Andrew - bug 629563 - Drop the broken --mysql options and Change the --protocol option to accept 'mysql' or 'drizzle' ('mysql' currently default)

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/main.cc
235
235
  */
236
236
  error_handler_hook= my_message_sql;
237
237
 
238
 
 
 
238
  /* Function generates error messages before abort */
239
239
  if (init_common_variables(DRIZZLE_CONFIG_NAME,
240
240
                            argc, argv, load_default_groups))
241
241
    unireg_abort(1);                            // Will do exit