← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to libdrizzle-2.0/structs.h

  • Committer: Mark Atwood
  • Date: 2011-11-20 08:50:16 UTC
  • mfrom: (2461.1.2 drizzle-build)
  • Revision ID: me@mark.atwood.name-20111120085016-2o4no5btx18x2gws
merge lp:~brianaker/drizzle/libdrizzle-refactor

Show diffs side-by-side

added added

removed removed

Lines of Context:
libdrizzle-2.0/structs.h
69
69
{
70
70
public:
71
71
  uint16_t error_code;
72
 
  int options;
 
72
  struct options_t {
 
73
    bool is_allocated;
 
74
    bool is_non_blocking;
 
75
    bool is_free_objects;
 
76
    bool is_assert_dangling;
 
77
 
 
78
    options_t() :
 
79
      is_allocated(false),
 
80
      is_non_blocking(false),
 
81
      is_free_objects(false),
 
82
      is_assert_dangling(false)
 
83
    { }
 
84
  } options;
73
85
  drizzle_verbose_t verbose;
74
86
  uint32_t con_count;
75
87
  uint32_t pfds_size;
92
104
 
93
105
  drizzle_st() :
94
106
    error_code(0),
95
 
    options(DRIZZLE_NONE),
 
107
    options(),
96
108
    verbose(DRIZZLE_VERBOSE_ERROR),
97
109
    con_count(0),
98
110
    pfds_size(0),
181
193
    drizzle_con_uds_st uds;
182
194
  } socket;
183
195
  uint8_t buffer[DRIZZLE_MAX_BUFFER_SIZE];
184
 
  char db[DRIZZLE_MAX_DB_SIZE];
 
196
  char schema[DRIZZLE_MAX_DB_SIZE];
185
197
  char password[DRIZZLE_MAX_PASSWORD_SIZE];
186
198
  uint8_t scramble_buffer[DRIZZLE_MAX_SCRAMBLE_SIZE];
187
199
  char server_version[DRIZZLE_MAX_SERVER_VERSION_SIZE];
228
240
 */
229
241
class drizzle_query_st
230
242
{
 
243
private:
231
244
public:
232
245
  drizzle_st *drizzle;
233
246
  drizzle_query_st *next;
333
346
  drizzle_column_st *prev;
334
347
  int options;
335
348
  char catalog[DRIZZLE_MAX_CATALOG_SIZE];
336
 
  char db[DRIZZLE_MAX_DB_SIZE];
 
349
  char schema[DRIZZLE_MAX_DB_SIZE];
337
350
  char table[DRIZZLE_MAX_TABLE_SIZE];
338
351
  char orig_table[DRIZZLE_MAX_TABLE_SIZE];
339
352
  char name[DRIZZLE_MAX_COLUMN_NAME_SIZE];