← Back to branch summary

~drizzle-trunk/libdrizzle/jenkins-Libdrizzle-83

« back to all changes in this revision

Viewing changes to libdrizzle/structs.h

  • Committer: Continuous Integration
  • Date: 2013-03-12 18:25:57 UTC
  • mfrom: (107.2.14 libdrizzle)
  • Revision ID: ci@drizzle.org-20130312182557-lqxgqbknaph66brl
Merge lp:~wiml/libdrizzle/integer-sizes Build: jenkins-Libdrizzle-74

Show diffs side-by-side

added added

removed removed

Lines of Context:
libdrizzle/structs.h
208
208
  uint32_t thread_id;
209
209
  int backlog;
210
210
  socket_t fd;
211
 
  size_t buffer_size;
 
211
  size_t buffer_size;              /* amount of valid data after 'buffer_ptr' in 'buffer' */
212
212
  size_t command_offset;
213
213
  size_t command_size;
214
214
  size_t command_total;
215
 
  size_t packet_size;
 
215
  uint32_t packet_size;            /* remaining number of bytes in packet currently being read; maximum value 2^24 */
216
216
  struct addrinfo *addrinfo_next;
217
 
  unsigned char *buffer_ptr;
 
217
  unsigned char *buffer_ptr;       /* cursor pointing into 'buffer' */
218
218
  unsigned char *command_buffer;
219
219
  unsigned char *command_data;
220
220
  void *context;
228
228
    drizzle_uds_st uds;
229
229
  } socket;
230
230
  unsigned char *buffer;
231
 
  size_t buffer_allocation;
 
231
  size_t buffer_allocation; /* total allocated size of 'buffer' */
232
232
  char db[DRIZZLE_MAX_DB_SIZE];
233
233
  char password[DRIZZLE_MAX_PASSWORD_SIZE];
234
234
  unsigned char scramble_buffer[DRIZZLE_MAX_SCRAMBLE_SIZE];
492
492
  uint16_t param_count;
493
493
  drizzle_bind_st *query_params;
494
494
  drizzle_bind_st *result_params;
495
 
  uint8_t null_bitmap_length;
 
495
  uint16_t null_bitmap_length;
496
496
  uint8_t *null_bitmap;
497
497
  bool new_bind;
498
498
  drizzle_result_st *prepare_result;
520
520
  drizzle_column_type_t type;
521
521
  void *data;
522
522
  char *data_buffer;
523
 
  uint32_t length;
 
523
  size_t length;  /* amount of data in 'data' */
524
524
  bool is_bound;
525
525
  struct options_t
526
526
  {