← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/definition/table.cc

  • Committer: Brian Aker
  • Date: 2010-11-21 20:19:07 UTC
  • mfrom: (1938.4.9 trunk)
  • Revision ID: brian@tangent.org-20101121201907-2pryxt1g3sr9iitu
Merge in simple change such that we use the KEY we already have, instead of
recalculating one.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/definition/table.cc
116
116
 
117
117
  if (to_be_deleted)
118
118
  {
119
 
    TableIdentifier identifier(share->getSchemaName(), share->getTableName());
120
 
   
121
 
    definition::Cache::singleton().erase(identifier.getKey());
122
 
    return;
 
119
    definition::Cache::singleton().erase(share->getCacheKey());
123
120
  }
124
121
}
125
122
 
137
134
 
138
135
  if (to_be_deleted)
139
136
  {
140
 
    TableIdentifier identifier(share->getSchemaName(), share->getTableName());
141
 
   
142
 
    definition::Cache::singleton().erase(identifier.getKey());
143
 
    return;
 
137
    definition::Cache::singleton().erase(share->getCacheKey());
144
138
  }
145
139
}
146
140
 
203
197
*/
204
198
 
205
199
TableShare::shared_ptr TableShare::getShareCreate(Session *session, 
206
 
                                         TableIdentifier &identifier,
207
 
                                         int &in_error)
 
200
                                                  TableIdentifier &identifier,
 
201
                                                  int &in_error)
208
202
{
209
203
  TableShare::shared_ptr share;
210
204