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
=== modified file 'drizzled/drizzled.cc'
--- drizzled/drizzled.cc 2010-09-26 01:21:36 +0000
+++ drizzled/drizzled.cc 2010-09-26 17:32:47 +0000
@@ -1187,7 +1187,7 @@
1187 ("completion-type", po::value<uint32_t>(&global_system_variables.completion_type)->default_value(0)->notifier(&check_limits_completion_type),1187 ("completion-type", po::value<uint32_t>(&global_system_variables.completion_type)->default_value(0)->notifier(&check_limits_completion_type),
1188 N_("Default completion type."))1188 N_("Default completion type."))
1189 ("core-file", N_("Write core on errors."))1189 ("core-file", N_("Write core on errors."))
1190 ("datadir,h", po::value<string>(),1190 ("datadir", po::value<string>(),
1191 N_("Path to the database root."))1191 N_("Path to the database root."))
1192 ("default-storage-engine", po::value<string>(),1192 ("default-storage-engine", po::value<string>(),
1193 N_("Set the default storage engine (table type) for tables."))1193 N_("Set the default storage engine (table type) for tables."))
@@ -1204,7 +1204,7 @@
1204 ("log-warnings,W", po::value<string>(),1204 ("log-warnings,W", po::value<string>(),
1205 N_("Log some not critical warnings to the log file.")) 1205 N_("Log some not critical warnings to the log file."))
1206 ("pid-file", po::value<string>(),1206 ("pid-file", po::value<string>(),
1207 N_("Pid file used by safe_mysqld."))1207 N_("Pid file used by drizzled."))
1208 ("port-open-timeout", po::value<uint32_t>(&drizzled_bind_timeout)->default_value(0),1208 ("port-open-timeout", po::value<uint32_t>(&drizzled_bind_timeout)->default_value(0),
1209 N_("Maximum time in seconds to wait for the port to become free. "1209 N_("Maximum time in seconds to wait for the port to become free. "
1210 "(Default: no wait)"))1210 "(Default: no wait)"))
@@ -1744,7 +1744,7 @@
1744 (char**) &max_system_variables.log_warnings, 0, GET_BOOL, OPT_ARG, 1, 0, 0,1744 (char**) &max_system_variables.log_warnings, 0, GET_BOOL, OPT_ARG, 1, 0, 0,
1745 0, 0, 0},1745 0, 0, 0},
1746 {"pid-file", OPT_PID_FILE,1746 {"pid-file", OPT_PID_FILE,
1747 N_("Pid file used by safe_mysqld."),1747 N_("Pid file used by drizzled."),
1748 (char**) &pidfile_name_ptr, (char**) &pidfile_name_ptr, 0, GET_STR,1748 (char**) &pidfile_name_ptr, (char**) &pidfile_name_ptr, 0, GET_STR,
1749 REQUIRED_ARG, 0, 0, 0, 0, 0, 0},1749 REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
1750 {"port-open-timeout", OPT_PORT_OPEN_TIMEOUT,1750 {"port-open-timeout", OPT_PORT_OPEN_TIMEOUT,