← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_base.cc

  • Committer: Brian Aker
  • Date: 2010-06-11 17:26:39 UTC
  • mto: This revision was merged to the branch mainline in revision 1610.
  • Revision ID: brian@gaz-20100611172639-e9q2sliqizeoz4yd
Update for having share declared type.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_base.cc
150
150
    This has to be done to ensure that the table share is removed from
151
151
    the table defintion cache as soon as the last instance is removed
152
152
  */
153
 
  share= new TableShare(const_cast<char *>(old_share->getCacheKey()),  static_cast<uint32_t>(old_share->getCacheKeySize()));
154
 
  share->setType(message::Table::INTERNAL);       // for intern_close_table()
 
153
  share= new TableShare(message::Table::INTERNAL, const_cast<char *>(old_share->getCacheKey()),  static_cast<uint32_t>(old_share->getCacheKeySize()));
155
154
 
156
155
  table->cursor->close();
157
156
  table->db_stat= 0;                            // Mark cursor closed
2308
2307
  key_length= TableShare::createKey(cache_key, const_cast<char*>(identifier.getSchemaName().c_str()),
2309
2308
                                    const_cast<char*>(identifier.getTableName().c_str()));
2310
2309
 
2311
 
  share= new TableShare(cache_key, key_length,
 
2310
  share= new TableShare(message::Table::TEMPORARY, cache_key, key_length,
2312
2311
                        const_cast<char *>(identifier.getPath().c_str()), static_cast<uint32_t>(identifier.getPath().length()));
2313
2312
 
2314
2313
  if (!(new_tmp_table= (Table*) malloc(sizeof(*new_tmp_table))))
2335
2334
  }
2336
2335
 
2337
2336
  new_tmp_table->reginfo.lock_type= TL_WRITE;    // Simulate locked
2338
 
  share->setType(message::Table::TEMPORARY);
2339
2337
 
2340
2338
  if (link_in_list)
2341
2339
  {