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
=== modified file 'libdrizzle/structs.h'
--- libdrizzle/structs.h 2009-03-27 06:48:36 +0000
+++ libdrizzle/structs.h 2009-05-20 07:21:11 +0000
@@ -24,22 +24,22 @@
24 * @ingroup drizzle24 * @ingroup drizzle
25 */25 */
26struct drizzle_st26struct drizzle_st
27{ 27{
28 drizzle_options_t options;28 drizzle_options_t options;
29 uint32_t con_count;
29 drizzle_con_st *con_list;30 drizzle_con_st *con_list;
30 uint32_t con_count;
31 drizzle_con_st *con_ready;31 drizzle_con_st *con_ready;
32 struct pollfd *pfds;32 struct pollfd *pfds;
33 uint32_t pfds_size;33 uint32_t pfds_size;
34 int last_errno;
35 char last_error[DRIZZLE_MAX_ERROR_SIZE];
36 uint16_t error_code;
37 char sqlstate[DRIZZLE_MAX_SQLSTATE_SIZE + 1];
3834
35 uint32_t query_count;
39 drizzle_query_st *query_list;36 drizzle_query_st *query_list;
40 uint32_t query_count;
41 uint32_t query_new;37 uint32_t query_new;
42 uint32_t query_running;38 uint32_t query_running;
39 int last_errno;
40 uint16_t error_code;
41 char sqlstate[DRIZZLE_MAX_SQLSTATE_SIZE + 1];
42 char last_error[DRIZZLE_MAX_ERROR_SIZE];
43};43};
4444
45/**45/**
@@ -51,8 +51,8 @@
51 drizzle_con_st *next;51 drizzle_con_st *next;
52 drizzle_con_st *prev;52 drizzle_con_st *prev;
53 drizzle_con_options_t options;53 drizzle_con_options_t options;
54 uint32_t result_count;
54 drizzle_result_st *result_list;55 drizzle_result_st *result_list;
55 uint32_t result_count;
5656
57 const void *data;57 const void *data;
58 drizzle_con_data_free_fn *data_free_fn;58 drizzle_con_data_free_fn *data_free_fn;

Subscribers

People subscribed via source and target branches