← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/drizzled.cc

  • Committer: Lee Bieber
  • Date: 2010-10-26 14:51:47 UTC
  • mfrom: (1879.1.3 build)
  • Revision ID: kalebral@gmail.com-20101026145147-yqop1w9qw7watara
Merge Monty - clean up of set_var and sys_var
Merge Monty - Generate ChangeLog from bzr as part of distcheck. Also, cleaned up AUTHORS file from bzr log parsed by hand.
Merge Shrews - update transaction log documentation

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/drizzled.cc
321
321
 
322
322
FILE *stderror_file=0;
323
323
 
324
 
struct system_variables global_system_variables;
325
 
struct system_variables max_system_variables;
 
324
struct drizzle_system_variables global_system_variables;
 
325
struct drizzle_system_variables max_system_variables;
326
326
struct global_counters current_global_counters;
327
327
 
328
328
const CHARSET_INFO *system_charset_info, *files_charset_info ;
1531
1531
 
1532
1532
  if (item_create_init())
1533
1533
    return 1;
1534
 
  if (set_var_init())
 
1534
  if (sys_var_init())
1535
1535
    return 1;
1536
1536
  /* Creates static regex matching for temporal values */
1537
1537
  if (! init_temporal_formats())