← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_parse.cc

  • Committer: Brian Aker
  • Date: 2011-02-16 02:39:43 UTC
  • mfrom: (2171.1.3 drizzle-staging)
  • Revision ID: brian@tangent.org-20110216023943-z4lxkjvknnrrncr2
Merge of all fixes related to errors, schemas, etc.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_parse.cc
28
28
#include <drizzled/data_home.h>
29
29
#include <drizzled/sql_base.h>
30
30
#include <drizzled/show.h>
31
 
#include <drizzled/db.h>
32
31
#include <drizzled/function/time/unix_timestamp.h>
33
32
#include <drizzled/function/get_system_var.h>
34
33
#include <drizzled/item/cmpfunc.h>
53
52
#include "drizzled/plugin/event_observer.h"
54
53
#include "drizzled/visibility.h"
55
54
 
 
55
#include <drizzled/schema.h>
 
56
 
56
57
#include <limits.h>
57
58
 
58
59
#include <bitset>
223
224
 
224
225
    identifier::Schema identifier(tmp);
225
226
 
226
 
    if (not change_db(session, identifier))
 
227
    if (not schema::change(*session, identifier))
227
228
    {
228
229
      session->my_ok();
229
230
    }
955
956
    my_casedn_str(files_charset_info, table->db.str);
956
957
 
957
958
    identifier::Schema schema_identifier(string(table->db.str));
958
 
    if (not check_db_name(session, schema_identifier))
 
959
    if (not schema::check(*session, schema_identifier))
959
960
    {
960
961
 
961
962
      my_error(ER_WRONG_DB_NAME, MYF(0), table->db.str);