← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/db.cc

  • Committer: Brian Aker
  • Date: 2011-01-14 02:43:41 UTC
  • mfrom: (2081.1.3 drizzle)
  • Revision ID: brian@gir-3-20110114024341-3w2x5umqw8vtohu5
Rollup changes for trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/db.cc
25
25
#include <string>
26
26
#include <fstream>
27
27
 
28
 
#include <drizzled/message/schema.pb.h>
29
28
#include "drizzled/error.h"
30
29
#include <drizzled/gettext.h>
31
30
#include <drizzled/my_hash.h>
144
143
 
145
144
/* db-name is already validated when we come here */
146
145
 
147
 
bool alter_db(Session *session, const message::Schema &schema_message)
 
146
bool alter_db(Session *session,
 
147
              const message::Schema &schema_message,
 
148
              const message::schema::shared_ptr &original_schema)
148
149
{
149
150
  TransactionServices &transaction_services= TransactionServices::singleton();
150
151
 
179
180
 
180
181
    if (success)
181
182
    {
182
 
      transaction_services.rawStatement(session, *session->getQueryString());
 
183
      transaction_services.alterSchema(session, original_schema, schema_message);
183
184
      session->my_ok(1);
184
185
    }
185
186
    else