~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-14 07:30:41 UTC
  • Revision ID: me@mark.atwood.name-20111114073041-mo2hgg8ouseo2kpu
releaseĀ 2011.11.29

Show diffs side-by-side

added added

removed removed

Lines of Context:
69
69
{
70
70
public:
71
71
  uint16_t error_code;
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;
 
72
  int options;
85
73
  drizzle_verbose_t verbose;
86
74
  uint32_t con_count;
87
75
  uint32_t pfds_size;
104
92
 
105
93
  drizzle_st() :
106
94
    error_code(0),
107
 
    options(),
 
95
    options(DRIZZLE_NONE),
108
96
    verbose(DRIZZLE_VERBOSE_ERROR),
109
97
    con_count(0),
110
98
    pfds_size(0),
161
149
  int capabilities;
162
150
  drizzle_charset_t charset;
163
151
  drizzle_command_t command;
164
 
  struct option_t {
165
 
    bool is_allocated;
166
 
 
167
 
    option_t() :
168
 
      is_allocated(false)
169
 
    { }
170
 
  } _options;
171
152
  int options;
172
153
  drizzle_con_socket_t socket_type;
173
154
  drizzle_con_status_t status;
200
181
    drizzle_con_uds_st uds;
201
182
  } socket;
202
183
  uint8_t buffer[DRIZZLE_MAX_BUFFER_SIZE];
203
 
  char schema[DRIZZLE_MAX_DB_SIZE];
 
184
  char db[DRIZZLE_MAX_DB_SIZE];
204
185
  char password[DRIZZLE_MAX_PASSWORD_SIZE];
205
186
  uint8_t scramble_buffer[DRIZZLE_MAX_SCRAMBLE_SIZE];
206
187
  char server_version[DRIZZLE_MAX_SERVER_VERSION_SIZE];
247
228
 */
248
229
class drizzle_query_st
249
230
{
250
 
private:
251
231
public:
252
232
  drizzle_st *drizzle;
253
233
  drizzle_query_st *next;
254
234
  drizzle_query_st *prev;
255
 
  struct option_t {
256
 
    bool is_allocated;
257
 
 
258
 
    option_t() :
259
 
      is_allocated(false)
260
 
    { }
261
 
  } options;
 
235
  int options;
262
236
  drizzle_query_state_t state;
263
237
  drizzle_con_st *con;
264
238
  drizzle_result_st *result;
271
245
    drizzle(NULL),
272
246
    next(NULL),
273
247
    prev(NULL),
 
248
    options(0),
274
249
    con(NULL),
275
250
    result(NULL),
276
251
    string(NULL),
289
264
  drizzle_con_st *con;
290
265
  drizzle_result_st *next;
291
266
  drizzle_result_st *prev;
292
 
  struct option_t {
293
 
    bool is_allocated;
294
 
 
295
 
    option_t() :
296
 
      is_allocated(false)
297
 
    { }
298
 
  } _options;
299
267
  int options;
300
268
 
301
269
  char info[DRIZZLE_MAX_INFO_SIZE];
363
331
  drizzle_result_st *result;
364
332
  drizzle_column_st *next;
365
333
  drizzle_column_st *prev;
366
 
  struct options_t {
367
 
    bool is_allocated;
368
 
 
369
 
    options_t() :
370
 
      is_allocated(false)
371
 
    { }
372
 
  } options;
 
334
  int options;
373
335
  char catalog[DRIZZLE_MAX_CATALOG_SIZE];
374
 
  char schema[DRIZZLE_MAX_DB_SIZE];
 
336
  char db[DRIZZLE_MAX_DB_SIZE];
375
337
  char table[DRIZZLE_MAX_TABLE_SIZE];
376
338
  char orig_table[DRIZZLE_MAX_TABLE_SIZE];
377
339
  char name[DRIZZLE_MAX_COLUMN_NAME_SIZE];
389
351
    result(NULL),
390
352
    next(NULL),
391
353
    prev(NULL),
 
354
    options(0),
392
355
    size(0),
393
356
    max_size(0),
394
357
    flags(DRIZZLE_COLUMN_FLAGS_NONE),