← 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-04-29 01:45:36 UTC
  • mfrom: (1000.1.6 merge)
  • Revision ID: brian@gaz-20090429014536-pwu5m8ug6n8fvh68
Merge refactoring (mainly around TABLE_SHARE... one step forward...)

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_table.cc
423
423
 
424
424
  for (table= tables; table; table= table->next_local)
425
425
  {
426
 
    TABLE_SHARE *share;
 
426
    TableShare *share;
427
427
    table->db_type= NULL;
428
428
    if ((share= get_cached_table_share(table->db, table->table_name)))
429
429
      table->db_type= share->db_type();
1725
1725
  if (create_info->row_type == ROW_TYPE_DYNAMIC)
1726
1726
    db_options|=HA_OPTION_PACK_RECORD;
1727
1727
  alias= table_case_name(create_info, table_name);
1728
 
  if (!(file= get_new_handler((TABLE_SHARE*) 0, session->mem_root,
 
1728
  if (!(file= get_new_handler((TableShare*) 0, session->mem_root,
1729
1729
                              create_info->db_type)))
1730
1730
  {
1731
1731
    my_error(ER_OUTOFMEMORY, MYF(0), sizeof(handler));
2065
2065
  int error=0;
2066
2066
 
2067
2067
  file= (base == NULL ? 0 :
2068
 
         get_new_handler((TABLE_SHARE*) 0, session->mem_root, base));
 
2068
         get_new_handler((TableShare*) 0, session->mem_root, base));
2069
2069
 
2070
2070
  build_table_filename(from, sizeof(from), old_db, old_name, "",
2071
2071
                       flags & FN_FROM_IS_TMP);
2204
2204
{
2205
2205
  int error= 0;
2206
2206
  Table tmp_table, *table;
2207
 
  TABLE_SHARE *share;
 
2207
  TableShare *share;
2208
2208
  char from[FN_REFLEN],tmp[FN_REFLEN+32];
2209
2209
  const char **ext;
2210
2210
  struct stat stat_info;
4479
4479
    case ENABLE:
4480
4480
      /*
4481
4481
        wait_while_table_is_used() ensures that table being altered is
4482
 
        opened only by this thread and that Table::TABLE_SHARE::version
 
4482
        opened only by this thread and that Table::TableShare::version
4483
4483
        of Table object corresponding to this table is 0.
4484
4484
        The latter guarantees that no DML statement will open this table
4485
4485
        until ALTER Table finishes (i.e. until close_thread_tables())