Drizzle

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

  1. fix-bug-636512
  2. Merge into development
Proposed by Vijay Samuel
Status: Merged
Approved by: Brian Aker
Approved revision: 1800
Merged at revision: 1800
Proposed branch: lp:~vjsamuel/drizzle/fix-bug-636512
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-636512
Reviewer Review Type Date Requested Status
Drizzle Merge Team Pending
Review via email: mp+36859@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 13:04:00 +0000
4@@ -1295,7 +1295,6 @@
5 N_("Continue even if we get an sql error."))
6 ("named-commands,G", po::value<bool>(&named_cmds)->default_value(false)->zero_tokens(),
7 N_("Enable named commands. Named commands mean this program's internal commands; see drizzle> help . When enabled, the named commands can be used from any line of the query, otherwise only from the first line, before an enter."))
8- ("ignore-spaces,i", N_("Ignore space after function names."))
9 ("no-beep,b", po::value<bool>(&opt_nobeep)->default_value(false)->zero_tokens(),
10 N_("Turn off beep on error."))
11 ("disable-line-numbers", N_("Do not write line numbers for errors."))