Merge lp:~daniel-nichter/drizzle/fix-bug-916567 into lp:~drizzle-trunk/drizzle/development

Proposed by Daniel Nichter
Status: Merged
Approved by: Brian Aker
Approved revision: 2492
Merged at revision: 2494
Proposed branch: lp:~daniel-nichter/drizzle/fix-bug-916567
Merge into: lp:~drizzle-trunk/drizzle/development
Diff against target: 12 lines (+1/-1)
1 file modified
drizzled/daemon.cc (+1/-1)
To merge this branch: bzr merge lp:~daniel-nichter/drizzle/fix-bug-916567
Reviewer Review Type Date Requested Status
Drizzle Merge Team Pending
Review via email: mp+88587@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 'drizzled/daemon.cc'
--- drizzled/daemon.cc 2012-01-05 06:43:46 +0000
+++ drizzled/daemon.cc 2012-01-14 19:15:30 +0000
@@ -74,7 +74,7 @@
74{74{
75 int fd;75 int fd;
76 ssize_t wbytes;76 ssize_t wbytes;
77 while ((wbytes= write(parent_pipe_fds[1], "\0", sizeof("\0"))) == 0);77 while ((wbytes= write(parent_pipe_fds[1], "\0", sizeof("\0"))) == 0)
78 {78 {
79 if (wbytes < 0)79 if (wbytes < 0)
80 {80 {