← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/drizzled.cc

  • Committer: Monty Taylor
  • Date: 2009-05-24 23:54:21 UTC
  • mfrom: (1014.2.12 kill-malloc)
  • mto: This revision was merged to the branch mainline in revision 1039.
  • Revision ID: mordred@inaugust.com-20090524235421-x5vfss90auzbn896
Merged Monty from lp:~mordred/drizzle/kill-malloc

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/drizzled.cc
264
264
StorageEngine *heap_engine;
265
265
StorageEngine *myisam_engine;
266
266
 
267
 
bool use_temp_pool;
268
267
char* opt_secure_file_priv= 0;
269
268
/*
270
269
  True if there is at least one per-hour limit for some user, so we should
367
366
struct system_variables max_system_variables;
368
367
struct system_status_var global_status_var;
369
368
 
370
 
MY_BITMAP temp_pool;
371
 
 
372
369
const CHARSET_INFO *system_charset_info, *files_charset_info ;
373
370
const CHARSET_INFO *table_alias_charset;
374
371
const CHARSET_INFO *character_set_filesystem;
592
589
  free(drizzle_tmpdir);
593
590
  if (opt_secure_file_priv)
594
591
    free(opt_secure_file_priv);
595
 
  bitmap_free(&temp_pool);
596
592
 
597
593
  (void) unlink(pidfile_name);  // This may not always exist
598
594
 
1502
1498
  }
1503
1499
  global_system_variables.lc_time_names= my_default_lc_time_names;
1504
1500
 
1505
 
  if (use_temp_pool && bitmap_init(&temp_pool,0,1024,1))
1506
 
    return 1;
1507
 
 
1508
1501
  /* Reset table_alias_charset, now that lower_case_table_names is set. */
1509
1502
  lower_case_table_names= 1; /* This we need to look at */
1510
1503
  table_alias_charset= files_charset_info;
2260
2253
     option if compiled with valgrind support.
2261
2254
   */
2262
2255
   IF_PURIFY(0,1), 0, 0, 0, 0, 0},
2263
 
  {"temp-pool", OPT_TEMP_POOL,
2264
 
   N_("Using this option will cause most temporary files created to use a "
2265
 
      "small set of names, rather than a unique name for each new file."),
2266
 
   (char**) &use_temp_pool, (char**) &use_temp_pool, 0, GET_BOOL, NO_ARG, 1,
2267
 
   0, 0, 0, 0, 0},
2268
2256
  {"timed_mutexes", OPT_TIMED_MUTEXES,
2269
2257
   N_("Specify whether to time mutexes (only InnoDB mutexes are currently "
2270
2258
      "supported)"),