bk commit into 4.1 tree (gluh:1.2593) BUG#20867

[gluh]

Below is the list of changes that have just been committed into a local
4.1 repository of gluh. When gluh 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-01-10 12:57:03+04:00, gluh@stripped +3 -0
  Fix for bug#20867 InnoDB Bug - create temporary table+crash => mysqld needs to clean
up
  2nd version
  During tmp tables cleanup we get the handler for temporary table
  and delete table using handler method.

  sql/mysql_priv.h@stripped, 2007-01-10 12:57:02+04:00, gluh@stripped +1 -0
    added function prototype

  sql/mysqld.cc@stripped, 2007-01-10 12:57:02+04:00, gluh@stripped +1 -1
    added call of mysql_rm_tmp_tables() function

  sql/sql_base.cc@stripped, 2007-01-10 12:57:02+04:00, gluh@stripped +35 -7
    mysql_rm_tmp_tables()
    -removed from table_cache_init
    -During tmp tables cleanup we get the handler for temporary table
     and delete table using handler method. 
     it allows to remove orphan records from data dictionary(InnoDB)

# 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:	gluh
# Host:	eagle.(none)
# Root:	/home/gluh/MySQL/Merge/4.1-opt

--- 1.384/sql/mysql_priv.h	2006-11-06 01:05:00 +04:00
+++ 1.385/sql/mysql_priv.h	2007-01-10 12:57:02 +04:00
@@ -861,6 +861,7 @@ bool open_log(MYSQL_LOG *log, const char
 
 /* mysqld.cc */
 extern void yyerror(const char*);
+my_bool mysql_rm_tmp_tables(void);
 
 /* item_func.cc */
 extern bool check_reserved_words(LEX_STRING *name);

--- 1.621/sql/mysqld.cc	2006-12-04 22:06:40 +04:00
+++ 1.622/sql/mysqld.cc	2007-01-10 12:57:02 +04:00
@@ -3241,7 +3241,7 @@ we force server id to 2, but this MySQL 
   */
   error_handler_hook = my_message_sql;
   start_signal_handler();				// Creates pidfile
-  if (acl_init(opt_noacl) ||
+  if (mysql_rm_tmp_tables() || acl_init(opt_noacl) ||
       my_tz_init((THD *)0, default_tz_name, opt_bootstrap))
   {
     abort_loop=1;

--- 1.274/sql/sql_base.cc	2006-10-20 13:57:36 +05:00
+++ 1.275/sql/sql_base.cc	2007-01-10 12:57:02 +04:00
@@ -34,7 +34,6 @@ HASH assign_cache;
 static int open_unireg_entry(THD *thd,TABLE *entry,const char *db,
 			     const char *name, const char *alias);
 static void free_cache_entry(TABLE *entry);
-static void mysql_rm_tmp_tables(void);
 
 
 extern "C" byte *table_cache_key(const byte *record,uint *length,
@@ -47,7 +46,6 @@ extern "C" byte *table_cache_key(const b
 
 bool table_cache_init(void)
 {
-  mysql_rm_tmp_tables();
   return hash_init(&open_cache, &my_charset_bin, table_cache_size+16,
 		   0, 0,table_cache_key,
 		   (hash_free_key) free_cache_entry, 0) != 0;
@@ -2940,14 +2938,20 @@ fill_record(Field **ptr,List<Item> &valu
 }
 
 
-static void mysql_rm_tmp_tables(void)
+my_bool mysql_rm_tmp_tables(void)
 {
   uint i, idx;
-  char	filePath[FN_REFLEN], *tmpdir;
+  char	filePath[FN_REFLEN], *tmpdir, filePathCopy[FN_REFLEN];
   MY_DIR *dirp;
   FILEINFO *file;
+  TABLE tmp_table;
+  THD *thd;
   DBUG_ENTER("mysql_rm_tmp_tables");
 
+  if (!(thd= new THD))
+    DBUG_RETURN(1);
+  thd->store_globals();
+
   for (i=0; i<=mysql_tmpdir_list.max; i++)
   {
     tmpdir=mysql_tmpdir_list.list[i];
@@ -2968,13 +2972,37 @@ static void mysql_rm_tmp_tables(void)
 
     if (!bcmp(file->name,tmp_file_prefix,tmp_file_prefix_length))
     {
-        sprintf(filePath,"%s%s",tmpdir,file->name);
-        VOID(my_delete(filePath,MYF(MY_WME)));
+      char *ext= fn_ext(file->name);
+      uint ext_len= strlen(ext);
+      uint filePath_len= my_snprintf(filePath, sizeof(filePath),
+                                     "%s%s", tmpdir, file->name);
+      if (!bcmp(reg_ext, ext, ext_len))
+      {
+        TABLE tmp_table;
+        if (!openfrm(filePath, "tmp_table", (uint) 0,
+                     READ_KEYINFO | COMPUTE_TYPES | EXTRA_RECORD,
+                     0, &tmp_table))
+        {
+          /* We should cut file extention before deleting of table */
+          memcpy(filePathCopy, filePath, filePath_len - ext_len);
+          filePathCopy[filePath_len - ext_len]= 0;
+          tmp_table.file->delete_table(filePathCopy);
+          closefrm(&tmp_table);
+        }
+      }
+      /*
+        File can be already deleted by tmp_table.file->delete_table().
+        So we hide error messages which happnes during deleting of these
+        files(MYF(0)).
+      */
+      VOID(my_delete(filePath, MYF(0))); 
     }
   }
   my_dirend(dirp);
   }
-  DBUG_VOID_RETURN;
+  delete thd;
+  my_pthread_setspecific_ptr(THR_THD,  0);
+  DBUG_RETURN(0);
 }