← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/schema_engine/schema.cc

Merge in Joe's transaction id code.

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>
156
157
  }
157
158
  mutex.unlock();
158
159
 
 
160
  TransactionServices &transaction_services= TransactionServices::singleton();
 
161
  transaction_services.allocateNewTransactionId();
 
162
 
159
163
  return true;
160
164
}
161
165
 
196
200
  schema_cache.erase(schema_identifier.getPath());
197
201
  mutex.unlock();
198
202
 
 
203
  TransactionServices &transaction_services= TransactionServices::singleton();
 
204
  transaction_services.allocateNewTransactionId();
 
205
 
199
206
  return true;
200
207
}
201
208
 
221
228
      }
222
229
    }
223
230
    mutex.unlock();
 
231
 
 
232
    TransactionServices &transaction_services= TransactionServices::singleton();
 
233
    transaction_services.allocateNewTransactionId();
224
234
  }
225
235
 
226
236
  return true;