bk commit into 5.0 tree (tsmith:1.2496) BUG#29474

[tim]

Below is the list of changes that have just been committed into a local
5.0 repository of tsmith. When tsmith 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@stripped, 2007-08-15 19:34:54-06:00, tsmith@stripped +3 -0
  Bug #29474: 21587 Regression Ever increasing open tables/fd when using HANDLER READ +
DELETE
  
  Revert the fix for bug 21587.  That bug will be re-opened, and a new
  fix must be created.

  sql/mysql_priv.h@stripped, 2007-08-15 19:34:52-06:00, tsmith@stripped +0 -1
    Bug #29474: 21587 Regression Ever increasing open tables/fd when using HANDLER READ +
DELETE
    
    Revert the fix for bug 21587.  That bug will be re-opened, and a new
    fix must be created.

  sql/sql_base.cc@stripped, 2007-08-15 19:34:52-06:00, tsmith@stripped +1 -9
    Bug #29474: 21587 Regression Ever increasing open tables/fd when using HANDLER READ +
DELETE
    
    Revert the fix for bug 21587.  That bug will be re-opened, and a new
    fix must be created.

  sql/sql_handler.cc@stripped, 2007-08-15 19:34:52-06:00, tsmith@stripped +0 -45
    Bug #29474: 21587 Regression Ever increasing open tables/fd when using HANDLER READ +
DELETE
    
    Revert the fix for bug 21587.  That bug will be re-opened, and a new
    fix must be created.

diff -Nrup a/sql/mysql_priv.h b/sql/mysql_priv.h
--- a/sql/mysql_priv.h	2007-07-27 06:37:26 -06:00
+++ b/sql/mysql_priv.h	2007-08-15 19:34:52 -06:00
@@ -995,7 +995,6 @@ bool mysql_ha_read(THD *, TABLE_LIST *,e
                    List<Item> *,enum ha_rkey_function,Item *,ha_rows,ha_rows);
 int mysql_ha_flush(THD *thd, TABLE_LIST *tables, uint mode_flags,
                    bool is_locked);
-void mysql_ha_mark_tables_for_reopen(THD *thd, TABLE *table);
 /* mysql_ha_flush mode_flags bits */
 #define MYSQL_HA_CLOSE_FINAL        0x00
 #define MYSQL_HA_REOPEN_ON_USAGE    0x01
diff -Nrup a/sql/sql_base.cc b/sql/sql_base.cc
--- a/sql/sql_base.cc	2007-08-01 18:39:10 -06:00
+++ b/sql/sql_base.cc	2007-08-15 19:34:52 -06:00
@@ -585,15 +585,7 @@ void close_thread_tables(THD *thd, bool 
 
   DBUG_PRINT("info", ("thd->open_tables: %p", thd->open_tables));
 
-  
-  /* 
-    End open index scans and table scans and remove references to the tables 
-    from the handler tables hash. After this preparation it is safe to close 
-    the tables.
-  */
-  mysql_ha_mark_tables_for_reopen(thd, thd->open_tables);
-
-  found_old_table= 0;
+ found_old_table= 0;
   while (thd->open_tables)
     found_old_table|=close_thread_table(thd, &thd->open_tables);
   thd->some_tables_deleted=0;
diff -Nrup a/sql/sql_handler.cc b/sql/sql_handler.cc
--- a/sql/sql_handler.cc	2007-05-11 10:33:11 -06:00
+++ b/sql/sql_handler.cc	2007-08-15 19:34:52 -06:00
@@ -746,48 +746,3 @@ static int mysql_ha_flush_table(THD *thd
 
   DBUG_RETURN(0);
 }
-
-
-/*
-  Mark tables for reopen.
-
-  SYNOPSIS
-    mysql_ha_mark_tables_for_reopen()
-    thd                         Thread identifier.
-    table                       Table list to mark for reopen.
-
-  DESCRIPTION
-    For each table found in the handler hash mark it as closed
-    (ready for reopen) and end all index/table scans.
-
-  NOTE
-    The caller must lock LOCK_open.
-*/
-
-void mysql_ha_mark_tables_for_reopen(THD *thd, TABLE *table)
-{
-  DBUG_ENTER("mysql_ha_mark_tables_for_reopen");
-
-  safe_mutex_assert_owner(&LOCK_open);
-  for (; table; table= table->next)
-  {
-    /*
-      Some elements in open table list, for example placeholders used for
-      name-locking, can have alias set to 0.
-    */
-    if (table->alias)
-    {
-      TABLE_LIST *hash_tables;
-      if ((hash_tables= (TABLE_LIST*) hash_search(&thd->handler_tables_hash,
-                                                  (byte*) table->alias,
-                                                  strlen(table->alias) + 1)))
-      {
-        /* Mark table as ready for reopen. */
-        hash_tables->table= NULL;
-        /* End open index/table scans. */
-        table->file->ha_index_or_rnd_end();
-      }
-    }
-  }
-  DBUG_VOID_RETURN;
-}