← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/schema.cc

  • Committer: Mark Atwood
  • Date: 2011-06-24 11:45:17 UTC
  • mfrom: (2318.6.64 rf)
  • Revision ID: me@mark.atwood.name-20110624114517-1mq8no6jlp2nrg7m
merge lp:~olafvdspek/drizzle/refactor15

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/schema.cc
72
72
 
73
73
bool create(Session &session, const message::Schema &schema_message, const bool is_if_not_exists)
74
74
{
75
 
  TransactionServices &transaction_services= TransactionServices::singleton();
76
75
  bool error= false;
77
76
 
78
77
  /*
123
122
    }
124
123
    else // Created !
125
124
    {
126
 
      transaction_services.createSchema(session, schema_message);
 
125
      TransactionServices::createSchema(session, schema_message);
127
126
      session.my_ok(1);
128
127
    }
129
128
  }
139
138
           const message::Schema &schema_message,
140
139
           const message::Schema &original_schema)
141
140
{
142
 
  TransactionServices &transaction_services= TransactionServices::singleton();
143
 
 
144
141
  /*
145
142
    Do not alter database if another thread is holding read lock.
146
143
    Wait for global read lock before acquiring session->catalog()->schemaLock().
172
169
 
173
170
    if (success)
174
171
    {
175
 
      transaction_services.alterSchema(session, original_schema, schema_message);
 
172
      TransactionServices::alterSchema(session, original_schema, schema_message);
176
173
      session.my_ok(1);
177
174
    }
178
175
    else