← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table_share.h

  • Committer: Brian Aker
  • Date: 2010-03-25 19:25:04 UTC
  • mto: This revision was merged to the branch mainline in revision 1411.
  • Revision ID: brian@gaz-20100325192504-stbk05bhlac8zg3v
Removed the internal table type in favor of the protobuf one.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table_share.h
65
65
    max_rows(0),
66
66
    table_proto(NULL),
67
67
    storage_engine(NULL),
68
 
    tmp_table(STANDARD_TABLE),
 
68
    tmp_table(message::Table::STANDARD),
69
69
    ref_count(0),
70
70
    null_bytes(0),
71
71
    last_null_bit_pos(0),
126
126
    max_rows(0),
127
127
    table_proto(NULL),
128
128
    storage_engine(NULL),
129
 
    tmp_table(STANDARD_TABLE),
 
129
    tmp_table(message::Table::STANDARD),
130
130
    ref_count(0),
131
131
    null_bytes(0),
132
132
    last_null_bit_pos(0),
337
337
  {
338
338
    return storage_engine;
339
339
  }
340
 
  enum tmp_table_type tmp_table;
 
340
  message::Table::TableType tmp_table;
341
341
 
342
342
  uint32_t ref_count;       /* How many Table objects uses this */
343
343
  uint32_t getTableCount()
499
499
    memset(this, 0, sizeof(TableShare));
500
500
    memory::init_sql_alloc(&mem_root, TABLE_ALLOC_BLOCK_SIZE, 0);
501
501
    table_category=         TABLE_CATEGORY_TEMPORARY;
502
 
    tmp_table=              INTERNAL_TMP_TABLE;
 
502
    tmp_table=              message::Table::INTERNAL;
503
503
    db.str=                 (char*) key;
504
504
    db.length=           strlen(key);
505
505
    table_cache_key.str=    (char*) key;
533
533
      If someone is waiting for this to be deleted, inform it about this.
534
534
      Don't do a delete until we know that no one is refering to this anymore.
535
535
    */
536
 
    if (tmp_table == STANDARD_TABLE)
 
536
    if (tmp_table == message::Table::STANDARD)
537
537
    {
538
538
      /* share->mutex is locked in release_table_share() */
539
539
      while (waiting_on_cond)