← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/drizzled.cc

  • Committer: Olaf van der Spek
  • Date: 2011-08-04 08:13:04 UTC
  • mfrom: (2384 drizzle)
  • mto: This revision was merged to the branch mainline in revision 2385.
  • Revision ID: olafvdspek@gmail.com-20110804081304-rlejjpvoos17bjdf
Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/drizzled.cc
1422
1422
  if (sys_var_init())
1423
1423
    return 1;
1424
1424
  /* Creates static regex matching for temporal values */
1425
 
  if (! init_temporal_formats())
 
1425
  if (not init_temporal_formats())
1426
1426
    return 1;
1427
1427
 
1428
1428
  if (!(default_charset_info=