← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/schema_engine/schema.cc

Merge Joe - fix bug 685709: trans id assignment for schema commands should be in interface not engine 

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"
34
33
 
35
34
#include <fcntl.h>
36
35
#include <sys/stat.h>
156
155
  }
157
156
  mutex.unlock();
158
157
 
159
 
  TransactionServices &transaction_services= TransactionServices::singleton();
160
 
  transaction_services.allocateNewTransactionId();
161
 
 
162
158
  return true;
163
159
}
164
160
 
199
195
  schema_cache.erase(schema_identifier.getPath());
200
196
  mutex.unlock();
201
197
 
202
 
  TransactionServices &transaction_services= TransactionServices::singleton();
203
 
  transaction_services.allocateNewTransactionId();
204
 
 
205
198
  return true;
206
199
}
207
200
 
227
220
      }
228
221
    }
229
222
    mutex.unlock();
230
 
 
231
 
    TransactionServices &transaction_services= TransactionServices::singleton();
232
 
    transaction_services.allocateNewTransactionId();
233
223
  }
234
224
 
235
225
  return true;