Drizzle

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

  1. fix-bug-636511
  2. Merge into development
Proposed by Vijay Samuel
Status: Merged
Approved by: Brian Aker
Approved revision: 1800
Merged at revision: 1801
Proposed branch: lp:~vjsamuel/drizzle/fix-bug-636511
Merge into: lp:~drizzle-trunk/drizzle/development
Diff against target: 11 lines (+0/-1)
1 file modified
client/drizzle.cc (+0/-1)
To merge this branch: bzr merge lp:~vjsamuel/drizzle/fix-bug-636511
Reviewer Review Type Date Requested Status
Drizzle Merge Team Pending
Review via email: mp+36876@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 'client/drizzle.cc'
2--- client/drizzle.cc 2010-09-26 08:33:47 +0000
3+++ client/drizzle.cc 2010-09-28 14:51:57 +0000
4@@ -1367,7 +1367,6 @@
5 N_("Append everything into outfile. See interactive help (\\h) also. Does not work in batch mode. Disable with --disable-tee. This option is disabled by default."))
6 ("disable-tee", po::value<bool>()->default_value(false)->zero_tokens(),
7 N_("Disable outfile. See interactive help (\\h) also."))
8- ("wait,w", N_("Wait and retry if connection is down."))
9 ("connect_timeout", po::value<uint32_t>(&opt_connect_timeout)->default_value(0)->notifier(&check_timeout_value),
10 N_("Number of seconds before connection timeout."))
11 ("max_input_line", po::value<uint32_t>(&opt_max_input_line)->default_value(16*1024L*1024L)->notifier(&check_max_input_line),