bk commit into 5.0-hp tree (vtkachenko:1.1877)

[Vadim Tkachenko]

Below is the list of changes that have just been committed into a local
5.0-hp repository of vtkachenko. When vtkachenko 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.1877 05/07/15 23:00:01 vtkachenko@stripped +1 -0
  ha_innodb.cc:
    Fix rw_lock info in SHOW MUTEX

  sql/ha_innodb.cc
    1.218 05/07/15 22:59:02 vtkachenko@stripped +24 -16
    Fix rw_lock info in SHOW MUTEX

# 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:	vtkachenko
# Host:	melody.mysql.com
# Root:	/users/vtkachenko/bk/HP/mysql-5.0-hp-build

--- 1.217/sql/ha_innodb.cc	2005-07-12 19:39:20 +02:00
+++ 1.218/sql/ha_innodb.cc	2005-07-15 22:59:02 +02:00
@@ -1530,8 +1530,11 @@
 	reserve the kernel mutex, we have to release the search system latch
 	first to obey the latching order. */
 
-	innobase_release_stat_resources(trx);
-
+//	innobase_release_stat_resources(trx);
+        if (trx->has_search_latch) {
+                          trx_search_latch_release_if_reserved(trx);
+        }
+        
         /* The flag trx->active_trans is set to 1 in
 
 	1. ::external_lock(),
@@ -1619,7 +1622,11 @@
 
 	/* Tell the InnoDB server that there might be work for utility
 	threads: */
+        if (trx->declared_to_be_inside_innodb) {
+                          /* Release our possible ticket in the FIFO */
 
+                          srv_conc_force_exit_innodb(trx);
+        }
 	srv_active_wake_master_thread();
 
 	DBUG_RETURN(0);
@@ -6466,7 +6473,6 @@
 
   while ( lock != NULL )
   {
-//    fprintf(stderr, "curname %s %s\n", current_name, lock->mutex.cmutex_name);
         if (strcmp(current_name, lock->mutex.cmutex_name) != 0)
         {
           if (!first_row)
@@ -6521,20 +6527,22 @@
 
     lock = UT_LIST_GET_NEXT(list, lock);
   }
-  protocol->prepare_for_resend();
-  protocol->store(current_name, system_charset_info);
-  protocol->store(current_fname, system_charset_info);
-  protocol->store((ulonglong)x_count);
-  protocol->store((ulonglong)sum_x_work/1000);
-  protocol->store((ulonglong)sum_x_wait/1000);
-  protocol->store((ulonglong)s_count);
-  protocol->store((ulonglong)sum_s_work/1000);
-  protocol->store((ulonglong)sum_s_wait/1000);
-  if (protocol->write())
-  {                                    
-    DBUG_RETURN(1);
+  if (!first_row)
+  {
+    protocol->prepare_for_resend();
+    protocol->store(current_name, system_charset_info);
+    protocol->store(current_fname, system_charset_info);
+    protocol->store((ulonglong)x_count);
+    protocol->store((ulonglong)sum_x_work/1000);
+    protocol->store((ulonglong)sum_x_wait/1000);
+    protocol->store((ulonglong)s_count);
+    protocol->store((ulonglong)sum_s_work/1000);
+    protocol->store((ulonglong)sum_s_wait/1000);
+    if (protocol->write())
+    {                                    
+      DBUG_RETURN(1);
+    }
   }
-
 
   protocol->prepare_for_resend();
   protocol->store("rw_lock_mutexes", system_charset_info);