← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/schema_engine/schema.cc

  • Committer: Brian Aker
  • Date: 2010-12-07 09:12:12 UTC
  • mto: This revision was merged to the branch mainline in revision 1985.
  • Revision ID: brian@tangent.org-20101207091212-1m0w20tck6z7632m
This is a fix for bug lp:686197

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/schema_engine/schema.cc
30
30
#include "drizzled/data_home.h"
31
31
 
32
32
#include "drizzled/internal/my_sys.h"
 
33
#include "drizzled/transaction_services.h"
33
34
 
34
35
#include <fcntl.h>
35
36
#include <sys/stat.h>
155
156
  }
156
157
  mutex.unlock();
157
158
 
 
159
  TransactionServices &transaction_services= TransactionServices::singleton();
 
160
  transaction_services.allocateNewTransactionId();
 
161
 
158
162
  return true;
159
163
}
160
164
 
195
199
  schema_cache.erase(schema_identifier.getPath());
196
200
  mutex.unlock();
197
201
 
 
202
  TransactionServices &transaction_services= TransactionServices::singleton();
 
203
  transaction_services.allocateNewTransactionId();
 
204
 
198
205
  return true;
199
206
}
200
207
 
220
227
      }
221
228
    }
222
229
    mutex.unlock();
 
230
 
 
231
    TransactionServices &transaction_services= TransactionServices::singleton();
 
232
    transaction_services.allocateNewTransactionId();
223
233
  }
224
234
 
225
235
  return true;
332
342
  return false;
333
343
}
334
344
 
 
345
bool Schema::doCanCreateTable(const drizzled::TableIdentifier &identifier)
 
346
{
 
347
 
 
348
  // This should always be the same value as GLOBAL_TEMPORARY_EXT but be
 
349
  // CASE_UP. --Brian 
 
350
  //
 
351
  // This needs to be done static in here for ordering reasons
 
352
  static SchemaIdentifier TEMPORARY_IDENTIFIER(".TEMPORARY");
 
353
  if (static_cast<const SchemaIdentifier&>(identifier) == TEMPORARY_IDENTIFIER)
 
354
  {
 
355
    return false;
 
356
  }
 
357
 
 
358
  return true;
 
359
}
 
360
 
335
361
void Schema::doGetTableIdentifiers(drizzled::CachedDirectory&,
336
362
                                   const drizzled::SchemaIdentifier&,
337
363
                                   drizzled::TableIdentifier::vector&)