From: Marc Alff
Date: May 15 2012 5:09pm
Subject: bzr push into mysql-trunk branch (marc.alff:3843)
List-Archive: http://lists.mysql.com/commits/143815
Message-Id: <201205151709.q4FH9IKq021547@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3843 Marc Alff	2012-05-15 [merge]
      local merge

    modified:
      storage/innobase/fts/fts0que.cc
      storage/innobase/handler/i_s.cc
      storage/innobase/row/row0mysql.cc
=== modified file 'storage/perfschema/unittest/pfs-t.cc'
--- a/storage/perfschema/unittest/pfs-t.cc	2012-01-09 09:09:26 +0000
+++ b/storage/perfschema/unittest/pfs-t.cc	2012-05-15 17:07:19 +0000
@@ -1485,6 +1485,8 @@ void test_event_name_index()
   memset(& param, 0xFF, sizeof(param));
   param.m_enabled= true;
 
+  /* NOTE: Need to add 3 to each index: table io, table lock, idle */
+
   /* Per mutex info waits should be at [0..9] */
   param.m_mutex_class_sizing= 10;
   /* Per rwlock info waits should be at [10..29] */
@@ -1540,10 +1542,10 @@ void test_event_name_index()
   psi->register_mutex("X", dummy_mutexes, 2);
   mutex_class= find_mutex_class(dummy_mutex_key_1);
   ok(mutex_class != NULL, "mutex class 1");
-  ok(mutex_class->m_event_name_index == 0, "index 0");
+  ok(mutex_class->m_event_name_index == 3, "index 3");
   mutex_class= find_mutex_class(dummy_mutex_key_2);
   ok(mutex_class != NULL, "mutex class 2");
-  ok(mutex_class->m_event_name_index == 1, "index 1");
+  ok(mutex_class->m_event_name_index == 4, "index 4");
 
   PFS_rwlock_class *rwlock_class;
   PSI_rwlock_key dummy_rwlock_key_1;
@@ -1557,10 +1559,10 @@ void test_event_name_index()
   psi->register_rwlock("X", dummy_rwlocks, 2);
   rwlock_class= find_rwlock_class(dummy_rwlock_key_1);
   ok(rwlock_class != NULL, "rwlock class 1");
-  ok(rwlock_class->m_event_name_index == 10, "index 10");
+  ok(rwlock_class->m_event_name_index == 13, "index 13");
   rwlock_class= find_rwlock_class(dummy_rwlock_key_2);
   ok(rwlock_class != NULL, "rwlock class 2");
-  ok(rwlock_class->m_event_name_index == 11, "index 11");
+  ok(rwlock_class->m_event_name_index == 14, "index 14");
 
   PFS_cond_class *cond_class;
   PSI_cond_key dummy_cond_key_1;
@@ -1574,10 +1576,10 @@ void test_event_name_index()
   psi->register_cond("X", dummy_conds, 2);
   cond_class= find_cond_class(dummy_cond_key_1);
   ok(cond_class != NULL, "cond class 1");
-  ok(cond_class->m_event_name_index == 30, "index 30");
+  ok(cond_class->m_event_name_index == 33, "index 33");
   cond_class= find_cond_class(dummy_cond_key_2);
   ok(cond_class != NULL, "cond class 2");
-  ok(cond_class->m_event_name_index == 31, "index 31");
+  ok(cond_class->m_event_name_index == 34, "index 34");
 
   PFS_file_class *file_class;
   PSI_file_key dummy_file_key_1;
@@ -1591,10 +1593,10 @@ void test_event_name_index()
   psi->register_file("X", dummy_files, 2);
   file_class= find_file_class(dummy_file_key_1);
   ok(file_class != NULL, "file class 1");
-  ok(file_class->m_event_name_index == 70, "index 70");
+  ok(file_class->m_event_name_index == 73, "index 73");
   file_class= find_file_class(dummy_file_key_2);
   ok(file_class != NULL, "file class 2");
-  ok(file_class->m_event_name_index == 71, "index 71");
+  ok(file_class->m_event_name_index == 74, "index 74");
 
   PFS_socket_class *socket_class;
   PSI_socket_key dummy_socket_key_1;
@@ -1608,13 +1610,13 @@ void test_event_name_index()
   psi->register_socket("X", dummy_sockets, 2);
   socket_class= find_socket_class(dummy_socket_key_1);
   ok(socket_class != NULL, "socket class 1");
-  ok(socket_class->m_event_name_index == 150, "index 150");
+  ok(socket_class->m_event_name_index == 153, "index 153");
   socket_class= find_socket_class(dummy_socket_key_2);
   ok(socket_class != NULL, "socket class 2");
-  ok(socket_class->m_event_name_index == 151, "index 151");
+  ok(socket_class->m_event_name_index == 154, "index 154");
 
-  ok(global_table_io_class.m_event_name_index == 310, "index 310");
-  ok(global_table_lock_class.m_event_name_index == 311, "index 311");
+  ok(global_table_io_class.m_event_name_index == 0, "index 0");
+  ok(global_table_lock_class.m_event_name_index == 1, "index 1");
   ok(wait_class_max= 313, "313 event names"); // 3 global classes
 }
 

No bundle (reason: useless for push emails).