Drizzle

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

  1. bug-616035
  2. Merge into development
Proposed by Vijay Samuel
Status: Merged
Approved by: Brian Aker
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 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
=== modified file 'client/drizzle.cc'
--- client/drizzle.cc 2010-07-30 20:34:21 +0000
+++ client/drizzle.cc 2010-08-13 20:12:42 +0000
@@ -1329,7 +1329,7 @@
1329 opt_connect_timeout= 0;1329 opt_connect_timeout= 0;
1330 if (in_connect_timeout > 3600*12)1330 if (in_connect_timeout > 3600*12)
1331 {1331 {
1332 cout<<N_("Error: Invalid Value for connect_timeout"); 1332 cout << N_("Error: Invalid Value for connect_timeout");
1333 exit(-1);1333 exit(-1);
1334 }1334 }
1335 opt_connect_timeout= in_connect_timeout;1335 opt_connect_timeout= in_connect_timeout;
@@ -1338,13 +1338,12 @@
1338static void check_max_input_line(uint32_t in_max_input_line)1338static void check_max_input_line(uint32_t in_max_input_line)
1339{1339{
1340 opt_max_input_line= 0;1340 opt_max_input_line= 0;
1341 if (in_max_input_line<4096 || in_max_input_line>(int64_t)2*1024L*1024L*1024L)1341 if (in_max_input_line < 4096 || in_max_input_line > (int64_t)2*1024L*1024L*1024L)
1342 {1342 {
1343 cout<<N_("Error: Invalid Value for max_input_line");1343 cout << N_("Error: Invalid Value for max_input_line");
1344 exit(-1);1344 exit(-1);
1345 }1345 }
1346 opt_max_input_line= in_max_input_line/1024;1346 opt_max_input_line= in_max_input_line - (in_max_input_line % 1024);
1347 opt_max_input_line*=1024;
1348}1347}
13491348
1350int main(int argc,char *argv[])1349int main(int argc,char *argv[])
13511350
=== modified file 'client/drizzletest.cc'
--- client/drizzletest.cc 2010-08-03 21:49:46 +0000
+++ client/drizzletest.cc 2010-08-13 20:12:42 +0000
@@ -5360,7 +5360,7 @@
5360{5360{
5361 if (in_opt_max_connect_retries > 10000 || opt_max_connect_retries<1)5361 if (in_opt_max_connect_retries > 10000 || opt_max_connect_retries<1)
5362 {5362 {
5363 cout<<N_("Error: Invalid Value for opt_max_connect_retries"); 5363 cout << N_("Error: Invalid Value for opt_max_connect_retries");
5364 exit(-1);5364 exit(-1);
5365 }5365 }
5366 opt_max_connect_retries= in_opt_max_connect_retries;5366 opt_max_connect_retries= in_opt_max_connect_retries;
@@ -5370,7 +5370,7 @@
5370{5370{
5371 if (in_opt_tail_lines > 10000)5371 if (in_opt_tail_lines > 10000)
5372 {5372 {
5373 cout<<N_("Error: Invalid Value for opt_tail_lines"); 5373 cout << N_("Error: Invalid Value for opt_tail_lines");
5374 exit(-1);5374 exit(-1);
5375 }5375 }
5376 opt_tail_lines= in_opt_tail_lines;5376 opt_tail_lines= in_opt_tail_lines;