← Back to branch summary

~ubuntu-branches/ubuntu/trusty/drizzle/trusty

« back to all changes in this revision

Viewing changes to drizzled/statement/create_schema.cc

  • Committer: Package Import Robot
  • Author(s): Dmitrijs Ledkovs
  • Date: 2013-10-29 15:43:40 UTC
  • mfrom: (1.2.12) (2.1.19 trusty-proposed)
  • Revision ID: package-import@ubuntu.com-20131029154340-2gp39el6cv8bwf2o
Tags: 1:7.2.3-2ubuntu1
* Merge from debian, remaining changes:
  - Link against boost_system because of boost_thread.
  - Add required libs to message/include.am
  - Add upstart job and adjust init script to be upstart compatible.
  - Disable -floop-parallelize-all due to gcc-4.8/4.9 compiler ICE
    http://gcc.gnu.org/bugzilla/show_bug.cgi?id=57732

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/statement/create_schema.cc
29
29
#include <drizzled/plugin/storage_engine.h>
30
30
#include <drizzled/sql_lex.h>
31
31
#include <drizzled/plugin/authorization.h>
 
32
#include <drizzled/catalog/instance.h>
32
33
 
33
34
#include <string>
34
35
 
47
48
    return true;
48
49
  }
49
50
 
50
 
  identifier::Schema schema_identifier(to_string(lex().name));
 
51
  identifier::Schema schema_identifier(session().catalog().identifier(),
 
52
                                       to_string(lex().name));
51
53
  if (not check(schema_identifier))
52
54
    return false;
53
55
 
54
 
  drizzled::message::schema::init(schema_message, lex().name.data());
 
56
  drizzled::message::schema::init(schema_message, schema_identifier);
55
57
 
56
58
  message::set_definer(schema_message, *session().user());
57
59