bk commit into 5.0 tree (holyfoot:1.2166)

[holyfoot]

Below is the list of changes that have just been committed into a local
5.0 repository of hf. When hf does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2166 06/04/19 14:52:30 holyfoot@deer.(none) +1 -0
  merging

  sql/sql_table.cc
    1.305 06/04/19 14:51:05 holyfoot@stripped +3 -3
    merging

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	holyfoot
# Host:	deer.(none)
# Root:	/home/hf/work/mysql-5.0.mrg

--- 1.304/sql/sql_table.cc	Tue Apr 18 16:12:51 2006
+++ 1.305/sql/sql_table.cc	Wed Apr 19 14:51:05 2006
@@ -2535,13 +2535,13 @@
         table->table->s->version=0;               // Force close of table
       else if (open_for_modify)
       {
-        if (table->table->tmp_table)
+        if (table->table->s->tmp_table)
           table->table->file->info(HA_STATUS_CONST);
         else
         {
           pthread_mutex_lock(&LOCK_open);
-          remove_table_from_cache(thd, table->table->table_cache_key,
-              table->table->real_name, RTFC_NO_FLAG);
+          remove_table_from_cache(thd, table->table->s->db,
+                                  table->table->s->table_name, RTFC_NO_FLAG);
           pthread_mutex_unlock(&LOCK_open);
         }
         /* Something may be modified, that's why we have to invalidate cache */