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

Proposed by Vijay Samuel on 2010-08-13
Status: Merged
Approved by: Brian Aker on 2010-08-16
Approved revision: 1702
Merged at revision: 1712
Proposed branch: lp:~vjsamuel/drizzle/bug-616035
Merge into: lp:~drizzle-trunk/drizzle/development
Diff against target: 51 lines (+6/-7)
2 files modified
client/drizzle.cc (+4/-5)
client/drizzletest.cc (+2/-2)
To merge this branch: bzr merge lp:~vjsamuel/drizzle/bug-616035
Reviewer Review Type Date Requested Status
Drizzle Merge Team 2010-08-13 Pending
Review via email: mp+32624@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-07-30 20:34:21 +0000
3+++ client/drizzle.cc 2010-08-13 20:12:42 +0000
4@@ -1329,7 +1329,7 @@
5 opt_connect_timeout= 0;
6 if (in_connect_timeout > 3600*12)
7 {
8- cout<<N_("Error: Invalid Value for connect_timeout");
9+ cout << N_("Error: Invalid Value for connect_timeout");
10 exit(-1);
11 }
12 opt_connect_timeout= in_connect_timeout;
13@@ -1338,13 +1338,12 @@
14 static void check_max_input_line(uint32_t in_max_input_line)
15 {
16 opt_max_input_line= 0;
17- if (in_max_input_line<4096 || in_max_input_line>(int64_t)2*1024L*1024L*1024L)
18+ if (in_max_input_line < 4096 || in_max_input_line > (int64_t)2*1024L*1024L*1024L)
19 {
20- cout<<N_("Error: Invalid Value for max_input_line");
21+ cout << N_("Error: Invalid Value for max_input_line");
22 exit(-1);
23 }
24- opt_max_input_line= in_max_input_line/1024;
25- opt_max_input_line*=1024;
26+ opt_max_input_line= in_max_input_line - (in_max_input_line % 1024);
27 }
28
29 int main(int argc,char *argv[])
30
31=== modified file 'client/drizzletest.cc'
32--- client/drizzletest.cc 2010-08-03 21:49:46 +0000
33+++ client/drizzletest.cc 2010-08-13 20:12:42 +0000
34@@ -5360,7 +5360,7 @@
35 {
36 if (in_opt_max_connect_retries > 10000 || opt_max_connect_retries<1)
37 {
38- cout<<N_("Error: Invalid Value for opt_max_connect_retries");
39+ cout << N_("Error: Invalid Value for opt_max_connect_retries");
40 exit(-1);
41 }
42 opt_max_connect_retries= in_opt_max_connect_retries;
43@@ -5370,7 +5370,7 @@
44 {
45 if (in_opt_tail_lines > 10000)
46 {
47- cout<<N_("Error: Invalid Value for opt_tail_lines");
48+ cout << N_("Error: Invalid Value for opt_tail_lines");
49 exit(-1);
50 }
51 opt_tail_lines= in_opt_tail_lines;