← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table/instance/base.cc

  • Committer: Olaf van der Spek
  • Date: 2011-08-04 08:13:04 UTC
  • mfrom: (2384 drizzle)
  • mto: This revision was merged to the branch mainline in revision 2385.
  • Revision ID: olafvdspek@gmail.com-20110804081304-rlejjpvoos17bjdf
Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table/instance/base.cc
252
252
  key_info(NULL),
253
253
  mem_root(TABLE_ALLOC_BLOCK_SIZE),
254
254
  all_set(),
255
 
  db(NULL_LEX_STRING),
256
 
  table_name(NULL_LEX_STRING),
257
 
  path(NULL_LEX_STRING),
258
 
  normalized_path(NULL_LEX_STRING),
 
255
  db(NULL_lex_string_t),
 
256
  table_name(NULL_lex_string_t),
 
257
  path(NULL_lex_string_t),
 
258
  normalized_path(NULL_lex_string_t),
259
259
  block_size(0),
260
260
  version(0),
261
261
  timestamp_offset(0),
315
315
  mem_root(TABLE_ALLOC_BLOCK_SIZE),
316
316
  table_charset(0),
317
317
  all_set(),
318
 
  db(NULL_LEX_STRING),
319
 
  table_name(NULL_LEX_STRING),
320
 
  path(NULL_LEX_STRING),
321
 
  normalized_path(NULL_LEX_STRING),
 
318
  db(NULL_lex_string_t),
 
319
  table_name(NULL_lex_string_t),
 
320
  path(NULL_lex_string_t),
 
321
  normalized_path(NULL_lex_string_t),
322
322
  block_size(0),
323
323
  version(0),
324
324
  timestamp_offset(0),
389
389
  mem_root(TABLE_ALLOC_BLOCK_SIZE),
390
390
  table_charset(0),
391
391
  all_set(),
392
 
  db(NULL_LEX_STRING),
393
 
  table_name(NULL_LEX_STRING),
394
 
  path(NULL_LEX_STRING),
395
 
  normalized_path(NULL_LEX_STRING),
 
392
  db(NULL_lex_string_t),
 
393
  table_name(NULL_lex_string_t),
 
394
  path(NULL_lex_string_t),
 
395
  normalized_path(NULL_lex_string_t),
396
396
  block_size(0),
397
397
  version(0),
398
398
  timestamp_offset(0),
465
465
  mem_root(TABLE_ALLOC_BLOCK_SIZE),
466
466
  table_charset(0),
467
467
  all_set(),
468
 
  db(NULL_LEX_STRING),
469
 
  table_name(NULL_LEX_STRING),
470
 
  path(NULL_LEX_STRING),
471
 
  normalized_path(NULL_LEX_STRING),
 
468
  db(NULL_lex_string_t),
 
469
  table_name(NULL_lex_string_t),
 
470
  path(NULL_lex_string_t),
 
471
  normalized_path(NULL_lex_string_t),
472
472
  block_size(0),
473
473
  version(0),
474
474
  timestamp_offset(0),
993
993
      unireg_type= Field::TIMESTAMP_UN_FIELD;
994
994
    }
995
995
 
996
 
    LEX_STRING comment;
 
996
    lex_string_t comment;
997
997
    if (!pfield.has_comment())
998
998
    {
999
999
      comment.str= (char*)"";