Drizzle

Merge lp:~linuxjedi/drizzle/trunk-bug-664212 into lp:~drizzle-trunk/drizzle/development

  1. trunk-bug-664212
  2. Merge into development
Proposed by Andrew Hutchings
Status: Merged
Approved by: Brian Aker
Approved revision: 1867
Merged at revision: 1868
Proposed branch: lp:~linuxjedi/drizzle/trunk-bug-664212
Merge into: lp:~drizzle-trunk/drizzle/development
Diff against target: 23 lines (+4/-3)
1 file modified
client/drizzledump_data.cc (+4/-3)
To merge this branch: bzr merge lp:~linuxjedi/drizzle/trunk-bug-664212
Reviewer Review Type Date Requested Status
Drizzle Merge Team Pending
Review via email: mp+39083@code.launchpad.net

Description of the change

Fix drizzledump output for --skip-extended-insert

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/drizzledump_data.cc'
2--- client/drizzledump_data.cc 2010-10-20 12:58:34 +0000
3+++ client/drizzledump_data.cc 2010-10-21 19:01:46 +0000
4@@ -347,15 +347,16 @@
5 os << ",";
6 }
7 /* Break insert up if it is too long */
8- if (extended_insert and
9- (byte_counter >= DRIZZLE_MAX_LINE_LENGTH))
10+ if ((extended_insert and
11+ (byte_counter >= DRIZZLE_MAX_LINE_LENGTH)) or (not extended_insert))
12 {
13 os << ");" << std::endl;
14 new_insert= true;
15 byte_counter= 0;
16 }
17 }
18- os << ");" << std::endl;
19+ if (not new_insert)
20+ os << ");" << std::endl;
21
22 if (opt_autocommit)
23 os << "COMMIT;" << std::endl;