← Back to branch summary

~stewart/drizzle/bug723653

« back to all changes in this revision

Viewing changes to drizzled/drizzled.cc

  • Committer: Continuous Integration
  • Date: 2013-02-28 06:25:08 UTC
  • mfrom: (2622.6.2 move-timed-mutexes)
  • Revision ID: ci@drizzle.org-20130228062508-vg49zngt5v408e3s
Merge lp:~stewart/drizzle/move-timed-mutexes  Build: jenkins-Drizzle-Builder-171

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/drizzled.cc
1213
1213
  _("Don't print a stack trace on failure."))
1214
1214
  ("symbolic-links,s", po::value<bool>(&internal::my_use_symdir)->default_value(IF_PURIFY(false,true))->zero_tokens(),
1215
1215
  _("Enable symbolic link support."))
1216
 
  ("timed-mutexes", po::value<bool>(&internal::timed_mutexes)->default_value(false)->zero_tokens(),
1217
 
  _("Specify whether to time mutexes (only InnoDB mutexes are currently "
1218
 
     "supported)"))
1219
1216
  ("tmpdir,t", po::value<string>(),
1220
1217
  _("Path for temporary files."))
1221
1218
  ("transaction-isolation", po::value<string>(),
1655
1652
  OPT_OPTIMIZER_PRUNE_LEVEL,
1656
1653
  OPT_AUTO_INCREMENT, OPT_AUTO_INCREMENT_OFFSET,
1657
1654
  OPT_ENABLE_LARGE_PAGES,
1658
 
  OPT_TIMED_MUTEXES,
1659
1655
  OPT_TABLE_LOCK_WAIT_TIMEOUT,
1660
1656
  OPT_PLUGIN_ADD,
1661
1657
  OPT_PLUGIN_REMOVE,
1749
1745
     option if compiled with valgrind support.
1750
1746
   */
1751
1747
   IF_PURIFY(0,1), 0, 0, 0, 0, 0},
1752
 
  {"timed_mutexes", OPT_TIMED_MUTEXES,
1753
 
   N_("Specify whether to time mutexes (only InnoDB mutexes are currently "
1754
 
      "supported)"),
1755
 
   (char**) &internal::timed_mutexes, NULL, 0, GET_BOOL, NO_ARG, 0,
1756
 
    0, 0, 0, 0, 0},
1757
1748
  {"transaction-isolation", OPT_TX_ISOLATION,
1758
1749
   N_("Default transaction isolation level."),
1759
1750
   0, 0, 0, GET_STR, REQUIRED_ARG, 0,