← 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-15 22:57:37 UTC
  • mto: This revision was merged to the branch mainline in revision 1344.
  • Revision ID: brian@gaz-20100315225737-72okaenigqt4b3oe
Lets hide stuff.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_table.cc
1665
1665
  mysql_lock_abort(session, table);     /* end threads waiting on lock */
1666
1666
 
1667
1667
  /* Wait until all there are no other threads that has this table open */
1668
 
  remove_table_from_cache(session, table->s->db.str,
 
1668
  remove_table_from_cache(session, table->s->getSchemaName(),
1669
1669
                          table->s->table_name.str,
1670
1670
                          RTFC_WAIT_OTHER_THREAD_FLAG);
1671
1671
}
1819
1819
      const char *old_message=session->enter_cond(&COND_refresh, &LOCK_open,
1820
1820
                                              "Waiting to get writelock");
1821
1821
      mysql_lock_abort(session,table->table);
1822
 
      remove_table_from_cache(session, table->table->s->db.str,
 
1822
      remove_table_from_cache(session, table->table->s->getSchemaName(),
1823
1823
                              table->table->s->table_name.str,
1824
1824
                              RTFC_WAIT_OTHER_THREAD_FLAG |
1825
1825
                              RTFC_CHECK_KILLED_FLAG);
1919
1919
        else
1920
1920
        {
1921
1921
          pthread_mutex_lock(&LOCK_open);
1922
 
          remove_table_from_cache(session, table->table->s->db.str,
 
1922
          remove_table_from_cache(session, table->table->s->getSchemaName(),
1923
1923
                                  table->table->s->table_name.str, RTFC_NO_FLAG);
1924
1924
          pthread_mutex_unlock(&LOCK_open);
1925
1925
        }
2111
2111
  if (session->open_tables_from_list(&src_table, &not_used))
2112
2112
    return true;
2113
2113
 
2114
 
  TableIdentifier src_identifier(src_table->table->s->db.str,
 
2114
  TableIdentifier src_identifier(src_table->table->s->getSchemaName(),
2115
2115
                                 src_table->table->s->table_name.str, src_table->table->s->tmp_table);
2116
2116
 
2117
2117