bzr commit into mysql-5.1-bugteam branch (azundris:2926)

[Tatiana A. Nurnberg]

#At file:///misc/mysql/forest/32149/51-32149/ based on revid:sergey.glukhov@stripped

 2926 Tatiana A. Nurnberg	2009-06-05 [merge]
      auto-merge

    modified:
      sql/sql_insert.cc
      sql/sql_select.cc
      storage/myisam/ha_myisam.cc
=== modified file 'sql/sql_insert.cc'
--- a/sql/sql_insert.cc	2009-05-30 13:32:28 +0000
+++ b/sql/sql_insert.cc	2009-06-04 23:30:08 +0000
@@ -3111,6 +3111,9 @@ bool select_insert::send_data(List<Item>
     }
   }
   
+  // Release latches in case bulk insert takes a long time
+  ha_release_temporary_latches(thd);
+
   error= write_record(thd, table, &info);
   table->auto_increment_field_not_null= FALSE;
   

=== modified file 'sql/sql_select.cc'
--- a/sql/sql_select.cc	2009-05-25 08:00:40 +0000
+++ b/sql/sql_select.cc	2009-06-04 23:30:08 +0000
@@ -10602,6 +10602,9 @@ free_tmp_table(THD *thd, TABLE *entry)
   save_proc_info=thd->proc_info;
   thd_proc_info(thd, "removing tmp table");
 
+  // Release latches since this can take a long time
+  ha_release_temporary_latches(thd);
+
   if (entry->file)
   {
     if (entry->db_stat)
@@ -10647,6 +10650,10 @@ bool create_myisam_from_heap(THD *thd, T
     table->file->print_error(error,MYF(0));
     DBUG_RETURN(1);
   }
+
+  // Release latches since this can take a long time
+  ha_release_temporary_latches(thd);
+
   new_table= *table;
   share= *table->s;
   new_table.s= &share;

=== modified file 'storage/myisam/ha_myisam.cc'
--- a/storage/myisam/ha_myisam.cc	2009-05-27 10:42:19 +0000
+++ b/storage/myisam/ha_myisam.cc	2009-06-04 23:30:08 +0000
@@ -1112,6 +1112,9 @@ int ha_myisam::repair(THD *thd, MI_CHECK
   param.out_flag= 0;
   strmov(fixed_name,file->filename);
 
+  // Release latches since this can take a long time
+  ha_release_temporary_latches(thd);
+
   // Don't lock tables if we have used LOCK TABLE
   if (!thd->locked_tables && 
       mi_lock_database(file, table->s->tmp_table ? F_EXTRA_LCK : F_WRLCK))


Attachment: [text/bzr-bundle] bzr/[e-mail]