← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/drizzled.cc

  • Committer: Brian Aker
  • Date: 2009-07-11 05:59:19 UTC
  • mfrom: (1089.1.9 merge)
  • Revision ID: brian@gaz-20090711055919-m4px3crrdgta5lie
Collection of patches from new-cleanup (includes asserts for field in debug)

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/drizzled.cc
46
46
#include "drizzled/temporal_format.h" /* For init_temporal_formats() */
47
47
#include <drizzled/listen.h>
48
48
 
 
49
#include <google/protobuf/stubs/common.h>
 
50
 
49
51
#if TIME_WITH_SYS_TIME
50
52
# include <sys/time.h>
51
53
# include <time.h>
583
585
  if (opt_secure_file_priv)
584
586
    free(opt_secure_file_priv);
585
587
 
 
588
  deinit_temporal_formats();
 
589
 
 
590
#if GOOGLE_PROTOBUF_VERSION >= 2001000
 
591
  google::protobuf::ShutdownProtobufLibrary();
 
592
#endif
 
593
 
586
594
  (void) unlink(pidfile_name);  // This may not always exist
587
595
 
588
596
  if (print_message && server_start_time)