Drizzle Client & Protocol Library

Merge lp:~linuxjedi/libdrizzle/5.1-fixes into lp:libdrizzle

  1. 5.1-fixes
  2. Merge into libdrizzle-redux
Proposed by Andrew Hutchings
Status: Merged
Approved by: Andrew Hutchings
Approved revision: no longer in the source branch.
Merged at revision: 95
Proposed branch: lp:~linuxjedi/libdrizzle/5.1-fixes
Merge into: lp:libdrizzle
Diff against target: 25 lines (+2/-2)
2 files modified
cli/drizzle_binlogs.c (+1/-1)
rpm/spec.in (+1/-1)
To merge this branch: bzr merge lp:~linuxjedi/libdrizzle/5.1-fixes
Reviewer Review Type Date Requested Status
Drizzle Trunk Pending
Review via email: mp+143763@code.launchpad.net

Description of the change

Use fwrite instead of write in drizzle_binlogs.

Gives 10x speed optimisation

Also fix RPM deps

To post a comment you must log in.
lp:~linuxjedi/libdrizzle/5.1-fixes updated
95. By Drizzle Continuous Integration

Merge lp:~linuxjedi/libdrizzle/5.1-fixes Build: jenkins-Libdrizzle-50

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'cli/drizzle_binlogs.c'
2--- cli/drizzle_binlogs.c 2013-01-13 22:31:54 +0000
3+++ cli/drizzle_binlogs.c 2013-01-17 20:40:31 +0000
4@@ -295,7 +295,7 @@
5 {
6 if (len)
7 {
8- if (write(fileno(file), data, len) <= 0)
9+ if (fwrite(data, 1, len, file) != len)
10 {
11 printf("Error: binlog: Error writing binary log: %s", strerror(errno));
12 exit(EXIT_FAILURE);
13
14=== modified file 'rpm/spec.in'
15--- rpm/spec.in 2013-01-04 20:58:19 +0000
16+++ rpm/spec.in 2013-01-17 20:40:31 +0000
17@@ -4,7 +4,7 @@
18 Release: 1
19 License: BSD
20 Group: System Environment/Libraries
21-BuildRequires: glib2-devel openssl-devel
22+BuildRequires: zlib-devel openssl-devel
23 URL: https://launchpad.net/libdrizzle
24
25 Packager: Brian Aker <brian@tangent.org>

Subscribers

People subscribed via source and target branches

to all changes:
to status/vote changes: