← 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: 2009-07-16 22:37:01 UTC
  • mto: This revision was merged to the branch mainline in revision 1100.
  • Revision ID: brian@gaz-20090716223701-vbbbo8dmgd2ljqqo
Refactor TableShare has to be behind class.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_table.cc
468
468
  {
469
469
    TableShare *share;
470
470
    table->db_type= NULL;
471
 
    if ((share= get_cached_table_share(table->db, table->table_name)))
 
471
    if ((share= TableShare::getShare(table->db, table->table_name)))
472
472
      table->db_type= share->db_type();
473
473
  }
474
474
 
1818
1818
      Then she could create the table. This case is pretty obscure and
1819
1819
      therefore we don't introduce a new error message only for it.
1820
1820
    */
1821
 
    if (get_cached_table_share(db, table_name))
 
1821
    if (TableShare::getShare(db, table_name))
1822
1822
    {
1823
1823
      my_error(ER_TABLE_EXISTS_ERROR, MYF(0), table_name);
1824
1824
      goto unlock_and_end;