Drizzle Client & Protocol Library

Merge lp:~stewart/libdrizzle/pahole into lp:~drizzle-trunk/libdrizzle/classic

  1. pahole
  2. Merge into classic
Proposed by Stewart Smith
Status: Merged
Merged at revision: not available
Proposed branch: lp:~stewart/libdrizzle/pahole
Merge into: lp:~drizzle-trunk/libdrizzle/classic
Diff against target: None lines
To merge this branch: bzr merge lp:~stewart/libdrizzle/pahole
Reviewer Review Type Date Requested Status
Eric Day Pending
Review via email: mp+6721@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
1=== modified file 'libdrizzle/structs.h'
2--- libdrizzle/structs.h 2009-03-27 06:48:36 +0000
3+++ libdrizzle/structs.h 2009-05-20 07:21:11 +0000
4@@ -24,22 +24,22 @@
5 * @ingroup drizzle
6 */
7 struct drizzle_st
8-{
9+{
10 drizzle_options_t options;
11+ uint32_t con_count;
12 drizzle_con_st *con_list;
13- uint32_t con_count;
14 drizzle_con_st *con_ready;
15 struct pollfd *pfds;
16 uint32_t pfds_size;
17- int last_errno;
18- char last_error[DRIZZLE_MAX_ERROR_SIZE];
19- uint16_t error_code;
20- char sqlstate[DRIZZLE_MAX_SQLSTATE_SIZE + 1];
21
22+ uint32_t query_count;
23 drizzle_query_st *query_list;
24- uint32_t query_count;
25 uint32_t query_new;
26 uint32_t query_running;
27+ int last_errno;
28+ uint16_t error_code;
29+ char sqlstate[DRIZZLE_MAX_SQLSTATE_SIZE + 1];
30+ char last_error[DRIZZLE_MAX_ERROR_SIZE];
31 };
32
33 /**
34@@ -51,8 +51,8 @@
35 drizzle_con_st *next;
36 drizzle_con_st *prev;
37 drizzle_con_options_t options;
38+ uint32_t result_count;
39 drizzle_result_st *result_list;
40- uint32_t result_count;
41
42 const void *data;
43 drizzle_con_data_free_fn *data_free_fn;

Subscribers

People subscribed via source and target branches