bk commit into 5.0 tree (dfischer:1.2352)

[df]

Below is the list of changes that have just been committed into a local
5.0 repository of mysqldev. When mysqldev 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, 2006-12-19 11:48:08+01:00, dfischer@stripped +1 -0
  Merge mysql.com:/data0/mysqldev/my/mysql-5.0-release
  into  mysql.com:/data0/mysqldev/my/build-200612151202-5.0.32/mysql-5.0-release
  MERGE: 1.2294.18.6

  sql/ha_innodb.cc@stripped, 2006-12-19 11:47:14+01:00, mysqldev@stripped +0 -0
    Auto merged
    MERGE: 1.302.1.1

# 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:	dfischer
# Host:	production.mysql.com
# Root:	/data0/mysqldev/my/build-200612151202-5.0.32/mysql-5.0-release/RESYNC

--- 1.304/sql/ha_innodb.cc	2006-12-19 11:48:17 +01:00
+++ 1.305/sql/ha_innodb.cc	2006-12-19 11:48:17 +01:00
@@ -5308,19 +5308,11 @@
 
 		prebuilt->trx->op_info = (char*)
 		                          "returning various info to MySQL";
-
-		if (ib_table->space != 0) {
-			my_snprintf(path, sizeof(path), "%s/%s%s",
-				    mysql_data_home, ib_table->name,
-				    ".ibd");
-			unpack_filename(path,path);
-		} else {
-			my_snprintf(path, sizeof(path), "%s/%s%s",
+		my_snprintf(path, sizeof(path), "%s/%s%s",
 				    mysql_data_home, ib_table->name,
 				    reg_ext);
 
-			unpack_filename(path,path);
-		}
+		unpack_filename(path,path);
 
 		/* Note that we do not know the access time of the table,
 		nor the CHECK TABLE time, nor the UPDATE or INSERT time. */
@@ -6377,14 +6369,17 @@
   Protocol        *protocol= thd->protocol;
   List<Item> field_list;
   mutex_t*  mutex;
+#ifdef UNIV_DEBUG
   ulint   rw_lock_count= 0;
   ulint   rw_lock_count_spin_loop= 0;
   ulint   rw_lock_count_spin_rounds= 0;
   ulint   rw_lock_count_os_wait= 0;
   ulint   rw_lock_count_os_yield= 0;
   ulonglong rw_lock_wait_time= 0;
+#endif /* UNIV_DEBUG */
   DBUG_ENTER("innodb_mutex_show_status");
 
+#ifdef UNIV_DEBUG
   field_list.push_back(new Item_empty_string("Mutex", FN_REFLEN));
   field_list.push_back(new Item_empty_string("Module", FN_REFLEN));
   field_list.push_back(new Item_uint("Count", 21));
@@ -6393,19 +6388,23 @@
   field_list.push_back(new Item_uint("OS_waits", 21));
   field_list.push_back(new Item_uint("OS_yields", 21));
   field_list.push_back(new Item_uint("OS_waits_time", 21));
+#else /* UNIV_DEBUG */
+  field_list.push_back(new Item_empty_string("File", FN_REFLEN));
+  field_list.push_back(new Item_uint("Line", 21));
+  field_list.push_back(new Item_uint("OS_waits", 21));
+#endif /* UNIV_DEBUG */
 
   if (protocol->send_fields(&field_list,
                             Protocol::SEND_NUM_ROWS | Protocol::SEND_EOF))
     DBUG_RETURN(TRUE);
 
-#ifdef MUTEX_PROTECT_TO_BE_ADDED_LATER
-    mutex_enter(&mutex_list_mutex);
-#endif
+  mutex_enter_noninline(&mutex_list_mutex);
 
   mutex = UT_LIST_GET_FIRST(mutex_list);
 
   while ( mutex != NULL )
   {
+#ifdef UNIV_DEBUG
     if (mutex->mutex_type != 1)
     {
       if (mutex->count_using > 0)
@@ -6422,9 +6421,7 @@
 
         if (protocol->write())
         {
-#ifdef MUTEX_PROTECT_TO_BE_ADDED_LATER
-          mutex_exit(&mutex_list_mutex);
-#endif
+          mutex_exit_noninline(&mutex_list_mutex);
           DBUG_RETURN(1);
         }
       }
@@ -6438,10 +6435,25 @@
       rw_lock_count_os_yield += mutex->count_os_yield;
       rw_lock_wait_time += mutex->lspent_time;
     }
+#else /* UNIV_DEBUG */
+    protocol->prepare_for_resend();
+    protocol->store(mutex->cfile_name, system_charset_info);
+    protocol->store((ulonglong)mutex->cline);
+    protocol->store((ulonglong)mutex->count_os_wait);
+
+    if (protocol->write())
+    {
+      mutex_exit_noninline(&mutex_list_mutex);
+      DBUG_RETURN(1);
+    }
+#endif /* UNIV_DEBUG */
 
     mutex = UT_LIST_GET_NEXT(list, mutex);
   }
 
+  mutex_exit_noninline(&mutex_list_mutex);
+
+#ifdef UNIV_DEBUG
   protocol->prepare_for_resend();
   protocol->store("rw_lock_mutexes", system_charset_info);
   protocol->store("", system_charset_info);
@@ -6456,10 +6468,8 @@
   {
     DBUG_RETURN(1);
   }
+#endif /* UNIV_DEBUG */
 
-#ifdef MUTEX_PROTECT_TO_BE_ADDED_LATER
-      mutex_exit(&mutex_list_mutex);
-#endif
   send_eof(thd);
   DBUG_RETURN(FALSE);
 }