bzr commit into mysql-6.0 branch (konstantin:2671) WL#3726

[Konstantin Osipov]

#At file:///opt/local/work/mysql-6.0-3726/

 2671 Konstantin Osipov	2008-06-20
      Remove the remaining references to reopen_table() (WL#3726).
modified:
  sql/field.h
  sql/sql_base.cc
  sql/table.h

per-file comments:
  sql/field.h
    Remove the remaining references to reopen_table().
  sql/sql_base.cc
    Remove the remaining references to reopen_table().
  sql/table.h
    Remove the remaining references to reopen_table().
=== modified file 'sql/field.h'
--- a/sql/field.h	2008-05-13 12:18:08 +0000
+++ b/sql/field.h	2008-06-19 20:51:30 +0000
@@ -524,7 +524,6 @@ public:
 
   /* Hash value */
   virtual void hash(ulong *nr, ulong *nr2);
-  friend bool reopen_table(THD *,struct st_table *,bool);
   friend int cre_myisam(char * name, register TABLE *form, uint options,
 			ulonglong auto_increment_value);
   friend class Copy_field;

=== modified file 'sql/sql_base.cc'
--- a/sql/sql_base.cc	2008-06-19 12:39:58 +0000
+++ b/sql/sql_base.cc	2008-06-19 20:51:30 +0000
@@ -2769,7 +2769,6 @@ bool open_table(THD *thd, TABLE_LIST *ta
                                      MYF(MY_WME));
     memcpy((char*) table->alias, alias, length);
   }
-  /* These variables are also set in reopen_table() */
   table->tablenr=thd->current_tablenr++;
   table->used_fields=0;
   table->const_table=0;

=== modified file 'sql/table.h'
--- a/sql/table.h	2008-06-12 02:23:08 +0000
+++ b/sql/table.h	2008-06-19 20:51:30 +0000
@@ -578,8 +578,6 @@ private:
   struct st_table *share_next, **share_prev;
 
   friend struct TABLE_share;
-  friend bool reopen_table(st_table *table);
-
 public:
   struct st_table *next, *prev;