← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_table.cc

  • Committer: Brian Aker
  • Date: 2010-03-31 05:53:34 UTC
  • Revision ID: brian@gaz-20100331055334-yqqmzlgqb2xq1p5b
Mass overhaul to use schema_identifier.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_table.cc
84
84
    let's fetch the database default character set and
85
85
    apply it to the table.
86
86
  */
 
87
  SchemaIdentifier identifier(db);
87
88
  if (create_info->default_table_charset == NULL)
88
 
    create_info->default_table_charset= plugin::StorageEngine::getSchemaCollation(db);
 
89
    create_info->default_table_charset= plugin::StorageEngine::getSchemaCollation(identifier);
89
90
}
90
91
 
91
92
/*
1442
1443
  if (create_info->row_type == ROW_TYPE_DYNAMIC)
1443
1444
    db_options|=HA_OPTION_PACK_RECORD;
1444
1445
 
1445
 
  set_table_default_charset(create_info, identifier.getDBName().c_str());
 
1446
  set_table_default_charset(create_info, identifier.getSchemaName().c_str());
1446
1447
 
1447
1448
  /* Build a Table object to pass down to the engine, and the do the actual create. */
1448
1449
  if (not mysql_prepare_create_table(session, create_info, table_proto, alter_info,
1637
1638
 
1638
1639
  assert(base);
1639
1640
 
 
1641
  if (not plugin::StorageEngine::doesSchemaExist(to))
 
1642
  {
 
1643
    my_error(ER_NO_DB_ERROR, MYF(0), to.getSchemaName().c_str());
 
1644
    return true;
 
1645
  }
 
1646
 
1640
1647
  error= base->renameTable(*session, from, to);
1641
1648
 
1642
1649
  if (error == HA_ERR_WRONG_COMMAND)