Drizzle

Merge lp:~vjsamuel/drizzle/fix-bug-585982 into lp:~drizzle-trunk/drizzle/development

  1. fix-bug-585982
  2. Merge into development
Proposed by Vijay Samuel
Status: Merged
Approved by: Brian Aker
Approved revision: 1777
Merged at revision: 1797
Proposed branch: lp:~vjsamuel/drizzle/fix-bug-585982
Merge into: lp:~drizzle-trunk/drizzle/development
Diff against target: 30 lines (+3/-3)
1 file modified
drizzled/drizzled.cc (+3/-3)
To merge this branch: bzr merge lp:~vjsamuel/drizzle/fix-bug-585982
Reviewer Review Type Date Requested Status
Drizzle Merge Team Pending
Review via email: mp+36662@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'drizzled/drizzled.cc'
2--- drizzled/drizzled.cc 2010-09-26 01:21:36 +0000
3+++ drizzled/drizzled.cc 2010-09-26 17:32:47 +0000
4@@ -1187,7 +1187,7 @@
5 ("completion-type", po::value<uint32_t>(&global_system_variables.completion_type)->default_value(0)->notifier(&check_limits_completion_type),
6 N_("Default completion type."))
7 ("core-file", N_("Write core on errors."))
8- ("datadir,h", po::value<string>(),
9+ ("datadir", po::value<string>(),
10 N_("Path to the database root."))
11 ("default-storage-engine", po::value<string>(),
12 N_("Set the default storage engine (table type) for tables."))
13@@ -1204,7 +1204,7 @@
14 ("log-warnings,W", po::value<string>(),
15 N_("Log some not critical warnings to the log file."))
16 ("pid-file", po::value<string>(),
17- N_("Pid file used by safe_mysqld."))
18+ N_("Pid file used by drizzled."))
19 ("port-open-timeout", po::value<uint32_t>(&drizzled_bind_timeout)->default_value(0),
20 N_("Maximum time in seconds to wait for the port to become free. "
21 "(Default: no wait)"))
22@@ -1744,7 +1744,7 @@
23 (char**) &max_system_variables.log_warnings, 0, GET_BOOL, OPT_ARG, 1, 0, 0,
24 0, 0, 0},
25 {"pid-file", OPT_PID_FILE,
26- N_("Pid file used by safe_mysqld."),
27+ N_("Pid file used by drizzled."),
28 (char**) &pidfile_name_ptr, (char**) &pidfile_name_ptr, 0, GET_STR,
29 REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
30 {"port-open-timeout", OPT_PORT_OPEN_TIMEOUT,