← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

  • Committer: Mark Atwood
  • Date: 2011-07-26 19:55:19 UTC
  • mfrom: (2371.1.3 drizzle-fix-fedora15)
  • Revision ID: me@mark.atwood.name-20110726195519-nt8m1gsmvjbhco1c
merge lp:~brianaker/drizzle/fedora-fix-3

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),
314
314
  mem_root(TABLE_ALLOC_BLOCK_SIZE),
315
315
  table_charset(0),
316
316
  all_set(),
317
 
  db(NULL_LEX_STRING),
318
 
  table_name(NULL_LEX_STRING),
319
 
  path(NULL_LEX_STRING),
320
 
  normalized_path(NULL_LEX_STRING),
 
317
  db(NULL_lex_string_t),
 
318
  table_name(NULL_lex_string_t),
 
319
  path(NULL_lex_string_t),
 
320
  normalized_path(NULL_lex_string_t),
321
321
  block_size(0),
322
322
  version(0),
323
323
  timestamp_offset(0),
388
388
  mem_root(TABLE_ALLOC_BLOCK_SIZE),
389
389
  table_charset(0),
390
390
  all_set(),
391
 
  db(NULL_LEX_STRING),
392
 
  table_name(NULL_LEX_STRING),
393
 
  path(NULL_LEX_STRING),
394
 
  normalized_path(NULL_LEX_STRING),
 
391
  db(NULL_lex_string_t),
 
392
  table_name(NULL_lex_string_t),
 
393
  path(NULL_lex_string_t),
 
394
  normalized_path(NULL_lex_string_t),
395
395
  block_size(0),
396
396
  version(0),
397
397
  timestamp_offset(0),
464
464
  mem_root(TABLE_ALLOC_BLOCK_SIZE),
465
465
  table_charset(0),
466
466
  all_set(),
467
 
  db(NULL_LEX_STRING),
468
 
  table_name(NULL_LEX_STRING),
469
 
  path(NULL_LEX_STRING),
470
 
  normalized_path(NULL_LEX_STRING),
 
467
  db(NULL_lex_string_t),
 
468
  table_name(NULL_lex_string_t),
 
469
  path(NULL_lex_string_t),
 
470
  normalized_path(NULL_lex_string_t),
471
471
  block_size(0),
472
472
  version(0),
473
473
  timestamp_offset(0),
995
995
      unireg_type= Field::TIMESTAMP_UN_FIELD;
996
996
    }
997
997
 
998
 
    LEX_STRING comment;
 
998
    lex_string_t comment;
999
999
    if (!pfield.has_comment())
1000
1000
    {
1001
1001
      comment.str= (char*)"";