Drizzle

Merge lp:~dshrews/drizzle/bug620009 into lp:~drizzle-trunk/drizzle/development

  1. bug620009
  2. Merge into development
Proposed by David Shrewsbury
Status: Merged
Approved by: Brian Aker
Approved revision: 1719
Merged at revision: 1724
Proposed branch: lp:~dshrews/drizzle/bug620009
Merge into: lp:~drizzle-trunk/drizzle/development
Diff against target: 14 lines (+2/-2)
1 file modified
drizzled/sql_load.cc (+2/-2)
To merge this branch: bzr merge lp:~dshrews/drizzle/bug620009
Reviewer Review Type Date Requested Status
Drizzle Merge Team Pending
Review via email: mp+33108@code.launchpad.net

Description of the change

Fix for the LOAD DATA info message. It was down-casting 8-byte numbers down to 4-byte and then reconverting them to 8-bytes in the snprintf(). Just removed the casts.

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 'drizzled/sql_load.cc'
2--- drizzled/sql_load.cc 2010-08-17 01:34:55 +0000
3+++ drizzled/sql_load.cc 2010-08-19 14:16:09 +0000
4@@ -388,8 +388,8 @@
5 error= -1; // Error on read
6 goto err;
7 }
8- snprintf(name, sizeof(name), ER(ER_LOAD_INFO), (uint32_t) info.records, (uint32_t) info.deleted,
9- (uint32_t) (info.records - info.copied), (uint32_t) session->cuted_fields);
10+ snprintf(name, sizeof(name), ER(ER_LOAD_INFO), info.records, info.deleted,
11+ (info.records - info.copied), session->cuted_fields);
12
13 if (session->transaction.stmt.hasModifiedNonTransData())
14 session->transaction.all.markModifiedNonTransData();