← 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-05-28 01:36:09 UTC
  • Revision ID: brian@gaz-20100528013609-lvsd6znyufrpmddk
Rollup patch for hiding tableshare.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_table.cc
1677
1677
  mysql_lock_abort(session, table);     /* end threads waiting on lock */
1678
1678
 
1679
1679
  /* Wait until all there are no other threads that has this table open */
1680
 
  remove_table_from_cache(session, table->s->getSchemaName(),
1681
 
                          table->s->getTableName(),
 
1680
  remove_table_from_cache(session, table->getMutableShare()->getSchemaName(),
 
1681
                          table->getMutableShare()->getTableName(),
1682
1682
                          RTFC_WAIT_OTHER_THREAD_FLAG);
1683
1683
}
1684
1684
 
1825
1825
    }
1826
1826
 
1827
1827
    /* Close all instances of the table to allow repair to rename files */
1828
 
    if (lock_type == TL_WRITE && table->table->s->version)
 
1828
    if (lock_type == TL_WRITE && table->table->getShare()->version)
1829
1829
    {
1830
1830
      pthread_mutex_lock(&LOCK_open); /* Lock type is TL_WRITE and we lock to repair the table */
1831
1831
      const char *old_message=session->enter_cond(&COND_refresh, &LOCK_open,
1832
1832
                                              "Waiting to get writelock");
1833
1833
      mysql_lock_abort(session,table->table);
1834
 
      remove_table_from_cache(session, table->table->s->getSchemaName(),
1835
 
                              table->table->s->getTableName(),
 
1834
      remove_table_from_cache(session, table->table->getMutableShare()->getSchemaName(),
 
1835
                              table->table->getMutableShare()->getTableName(),
1836
1836
                              RTFC_WAIT_OTHER_THREAD_FLAG |
1837
1837
                              RTFC_CHECK_KILLED_FLAG);
1838
1838
      session->exit_cond(old_message);
1923
1923
    if (table->table)
1924
1924
    {
1925
1925
      if (fatal_error)
1926
 
        table->table->s->version=0;               // Force close of table
 
1926
        table->table->getMutableShare()->version=0;               // Force close of table
1927
1927
      else if (open_for_modify)
1928
1928
      {
1929
 
        if (table->table->s->tmp_table)
 
1929
        if (table->table->getShare()->tmp_table)
1930
1930
          table->table->cursor->info(HA_STATUS_CONST);
1931
1931
        else
1932
1932
        {
1933
1933
          pthread_mutex_lock(&LOCK_open);
1934
 
          remove_table_from_cache(session, table->table->s->getSchemaName(),
1935
 
                                  table->table->s->getTableName(), RTFC_NO_FLAG);
 
1934
          remove_table_from_cache(session, table->table->getMutableShare()->getSchemaName(),
 
1935
                                  table->table->getMutableShare()->getTableName(), RTFC_NO_FLAG);
1936
1936
          pthread_mutex_unlock(&LOCK_open);
1937
1937
        }
1938
1938
      }
2122
2122
  if (session->open_tables_from_list(&src_table, &not_used))
2123
2123
    return true;
2124
2124
 
2125
 
  TableIdentifier src_identifier(src_table->table->s->getSchemaName(),
2126
 
                                 src_table->table->s->getTableName(), src_table->table->s->tmp_table);
 
2125
  TableIdentifier src_identifier(src_table->table->getMutableShare()->getSchemaName(),
 
2126
                                 src_table->table->getMutableShare()->getTableName(), src_table->table->getMutableShare()->tmp_table);
2127
2127
 
2128
2128
 
2129
2129
 
2198
2198
      } 
2199
2199
      else
2200
2200
      {
2201
 
        bool rc= replicateCreateTableLike(session, table, name_lock, (src_table->table->s->tmp_table), is_if_not_exists);
 
2201
        bool rc= replicateCreateTableLike(session, table, name_lock, (src_table->table->getShare()->tmp_table), is_if_not_exists);
2202
2202
        (void)rc;
2203
2203
 
2204
2204
        res= false;