Merge lp:~ziminq/drizzle/fix549914 into lp:~drizzle-trunk/drizzle/development

Proposed by ziminq
Status: Merged
Merged at revision: not available
Proposed branch: lp:~ziminq/drizzle/fix549914
Merge into: lp:~drizzle-trunk/drizzle/development
Diff against target: 15 lines (+5/-1)
1 file modified
client/drizzle.cc (+5/-1)
To merge this branch: bzr merge lp:~ziminq/drizzle/fix549914
Reviewer Review Type Date Requested Status
Jay Pipes (community) Approve
Review via email: mp+22374@code.launchpad.net

Description of the change

fix the bug 549914.

in the best practices, we have to check whether all the error paths are handled correctly in some way later. but for this bug, this fix is ok, in my view.

To post a comment you must log in.
Revision history for this message
Jay Pipes (jaypipes) wrote :

Nice work!

review: Approve

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-03-26 07:04:37 +0000
3+++ client/drizzle.cc 2010-03-29 15:04:24 +0000
4@@ -2619,7 +2619,11 @@
5 return 0;
6
7 if (drizzle_con_error(&con)[0])
8- return put_error(&con, result);
9+ {
10+ int ret = put_error(&con, result);
11+ drizzle_result_free(result);
12+ return ret;
13+ }
14 return 0;
15 }
16