← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to libdrizzle-2.0/column.cc

  • Committer: Mark Atwood
  • Date: 2011-11-30 07:06:47 UTC
  • mfrom: (2463.1.6 drizzle-include)
  • Revision ID: me@mark.atwood.name-20111130070647-ixp7oalp70hkbt6l
merge lp:~brianaker/drizzle/libdrizzle-2.0-not-install

Show diffs side-by-side

added added

removed removed

Lines of Context:
libdrizzle-2.0/column.cc
371
371
    column->result= result;
372
372
    /* SET BELOW: column->next */
373
373
    column->prev= NULL;
374
 
    column->options= DRIZZLE_COLUMN_ALLOCATED;
 
374
    column->options.is_allocated= true;
375
375
    column->catalog[0]= '\0';
376
376
    column->schema[0]= '\0';
377
377
    column->table[0]= '\0';
392
392
    column->result = result;
393
393
    /* SET BELOW: column->next */
394
394
    column->prev = NULL;
395
 
    column->options= drizzle_column_options_t();
 
395
    column->options.is_allocated= false;
396
396
    column->catalog[0] = '\0';
397
397
    column->schema[0] = '\0';
398
398
    column->table[0] = '\0';
441
441
    column->next->prev= column->prev;
442
442
  }
443
443
 
444
 
  if (column->options & DRIZZLE_COLUMN_ALLOCATED)
 
444
  if (column->options.is_allocated)
445
445
  {
446
446
    delete column;
447
447
  }
1170
1170
  ptr+= 4;
1171
1171
 
1172
1172
  if (con->options & DRIZZLE_CON_MYSQL)
 
1173
  {
1173
1174
    ptr[0]= column->type;
 
1175
  }
1174
1176
  else
 
1177
  {
1175
1178
    ptr[0]= _column_type_drizzle_map_from[column->type];
 
1179
  }
1176
1180
  ptr++;
1177
1181
 
1178
1182
  drizzle_set_byte2(ptr, column->flags);