List:Commits« Previous MessageNext Message »
From:Marc Alff Date:March 16 2011 9:32am
Subject:bzr commit into mysql-trunk branch (marc.alff:3258)
View as plain text  
#At file:///Users/malff/BZR_TREE/mysql-trunk-wl4896/ based on revid:marc.alff@stripped

 3258 Marc Alff	2011-03-16
      Build cleanup

    modified:
      include/mysql/psi/mysql_socket.h
      mysql-test/suite/perfschema/r/pfs_upgrade_lc2.result
      mysql-test/suite/perfschema/r/schema_lc2.result
=== modified file 'include/mysql/psi/mysql_socket.h'
--- a/include/mysql/psi/mysql_socket.h	2011-03-14 16:11:25 +0000
+++ b/include/mysql/psi/mysql_socket.h	2011-03-16 09:32:27 +0000
@@ -342,7 +342,6 @@ inline_mysql_end_socket_wait(struct PSI_
   #define mysql_socket_sendmsg(FD, M, FL)
   #define mysql_socket_recvmsg(FD, M, FL)
   #define mysql_socket_sockatmark(FD)
-  #define mysql_socket_isfdtype(FD, FT)
   #define mysql_socket_socketpair(K, D, T, P, FDS)
 
 #else
@@ -372,14 +371,6 @@ inline_mysql_end_socket_wait(struct PSI_
   #endif
 
   #ifdef HAVE_PSI_INTERFACE
-	  #define mysql_socket_isfdtype(FD, FT) \
-	  inline_mysql_socket_isfdtype(__FILE__, __LINE__, FD, FT)
-  #else
-	  #define mysql_socket_isfdtype(FD, FT) \
-	  inline_mysql_socket_isfdtype(FD, FT)
-  #endif
-
-  #ifdef HAVE_PSI_INTERFACE
 	  #define mysql_socket_socketpair(K, D, T, P, FDS) \
 	  inline_mysql_socket_socketpair(K, D, T, P, FDS)
   #else
@@ -1027,38 +1018,6 @@ inline_mysql_socket_sockatmark
   return result;
 }
 
-/** mysql_socket_isfdtype */
-
-static inline int
-inline_mysql_socket_isfdtype
-(
-#ifdef HAVE_PSI_INTERFACE
-  const char *src_file, uint src_line,
-#endif
- MYSQL_SOCKET mysql_socket, int fdtype)
-{
-  int result;
-#ifdef HAVE_PSI_INTERFACE
-  struct PSI_socket_locker *locker= NULL;
-  PSI_socket_locker_state state;
-
-  if (likely(PSI_server != NULL && mysql_socket.m_psi != NULL))
-  {
-    locker= PSI_server->get_thread_socket_locker(&state, mysql_socket.m_psi, PSI_SOCKET_STAT);
-    if (likely(locker !=NULL))
-      PSI_server->start_socket_wait(locker, (size_t)0, src_file, src_line);
-  }
-#endif
-  
-  result= isfdtype(mysql_socket.fd, fdtype);
-
-#ifdef HAVE_PSI_INTERFACE
-  if (likely(locker != NULL))
-    PSI_server->end_socket_wait(locker, (size_t)0);
-#endif
-  return result;
-}
-
 /** mysql_socket_socketpair */
 
 static inline int

=== modified file 'mysql-test/suite/perfschema/r/pfs_upgrade_lc2.result'
--- a/mysql-test/suite/perfschema/r/pfs_upgrade_lc2.result	2011-02-22 02:58:40 +0000
+++ b/mysql-test/suite/perfschema/r/pfs_upgrade_lc2.result	2011-03-16 09:32:27 +0000
@@ -18,20 +18,23 @@ ERROR 1050 (42S01) at line 177: Table 'e
 ERROR 1050 (42S01) at line 186: Table 'file_instances' already exists
 ERROR 1050 (42S01) at line 197: Table 'file_summary_by_event_name' already exists
 ERROR 1050 (42S01) at line 209: Table 'file_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 218: Table 'mutex_instances' already exists
-ERROR 1050 (42S01) at line 232: Table 'objects_summary_global_by_type' already exists
-ERROR 1050 (42S01) at line 242: Table 'performance_timers' already exists
-ERROR 1050 (42S01) at line 252: Table 'rwlock_instances' already exists
-ERROR 1050 (42S01) at line 261: Table 'setup_actors' already exists
-ERROR 1050 (42S01) at line 269: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 278: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 288: Table 'setup_objects' already exists
-ERROR 1050 (42S01) at line 296: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 341: Table 'table_io_waits_summary_by_index_usage' already exists
-ERROR 1050 (42S01) at line 385: Table 'table_io_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 464: Table 'table_lock_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 484: Table 'threads' already exists
-ERROR 1644 (HY000) at line 904: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 221: Table 'socket_instances' already exists
+ERROR 1050 (42S01) at line 288: Table 'socket_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 353: Table 'socket_summary_by_event_name' already exists
+ERROR 1050 (42S01) at line 362: Table 'mutex_instances' already exists
+ERROR 1050 (42S01) at line 376: Table 'objects_summary_global_by_type' already exists
+ERROR 1050 (42S01) at line 386: Table 'performance_timers' already exists
+ERROR 1050 (42S01) at line 396: Table 'rwlock_instances' already exists
+ERROR 1050 (42S01) at line 405: Table 'setup_actors' already exists
+ERROR 1050 (42S01) at line 413: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 422: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 432: Table 'setup_objects' already exists
+ERROR 1050 (42S01) at line 440: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 485: Table 'table_io_waits_summary_by_index_usage' already exists
+ERROR 1050 (42S01) at line 529: Table 'table_io_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 608: Table 'table_lock_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 628: Table 'threads' already exists
+ERROR 1644 (HY000) at line 1048: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 show tables like "user_table";
 Tables_in_performance_schema (user_table)
@@ -54,20 +57,23 @@ ERROR 1050 (42S01) at line 177: Table 'e
 ERROR 1050 (42S01) at line 186: Table 'file_instances' already exists
 ERROR 1050 (42S01) at line 197: Table 'file_summary_by_event_name' already exists
 ERROR 1050 (42S01) at line 209: Table 'file_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 218: Table 'mutex_instances' already exists
-ERROR 1050 (42S01) at line 232: Table 'objects_summary_global_by_type' already exists
-ERROR 1050 (42S01) at line 242: Table 'performance_timers' already exists
-ERROR 1050 (42S01) at line 252: Table 'rwlock_instances' already exists
-ERROR 1050 (42S01) at line 261: Table 'setup_actors' already exists
-ERROR 1050 (42S01) at line 269: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 278: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 288: Table 'setup_objects' already exists
-ERROR 1050 (42S01) at line 296: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 341: Table 'table_io_waits_summary_by_index_usage' already exists
-ERROR 1050 (42S01) at line 385: Table 'table_io_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 464: Table 'table_lock_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 484: Table 'threads' already exists
-ERROR 1644 (HY000) at line 904: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 221: Table 'socket_instances' already exists
+ERROR 1050 (42S01) at line 288: Table 'socket_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 353: Table 'socket_summary_by_event_name' already exists
+ERROR 1050 (42S01) at line 362: Table 'mutex_instances' already exists
+ERROR 1050 (42S01) at line 376: Table 'objects_summary_global_by_type' already exists
+ERROR 1050 (42S01) at line 386: Table 'performance_timers' already exists
+ERROR 1050 (42S01) at line 396: Table 'rwlock_instances' already exists
+ERROR 1050 (42S01) at line 405: Table 'setup_actors' already exists
+ERROR 1050 (42S01) at line 413: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 422: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 432: Table 'setup_objects' already exists
+ERROR 1050 (42S01) at line 440: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 485: Table 'table_io_waits_summary_by_index_usage' already exists
+ERROR 1050 (42S01) at line 529: Table 'table_io_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 608: Table 'table_lock_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 628: Table 'threads' already exists
+ERROR 1644 (HY000) at line 1048: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 show tables like "user_view";
 Tables_in_performance_schema (user_view)
@@ -88,20 +94,23 @@ ERROR 1050 (42S01) at line 177: Table 'e
 ERROR 1050 (42S01) at line 186: Table 'file_instances' already exists
 ERROR 1050 (42S01) at line 197: Table 'file_summary_by_event_name' already exists
 ERROR 1050 (42S01) at line 209: Table 'file_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 218: Table 'mutex_instances' already exists
-ERROR 1050 (42S01) at line 232: Table 'objects_summary_global_by_type' already exists
-ERROR 1050 (42S01) at line 242: Table 'performance_timers' already exists
-ERROR 1050 (42S01) at line 252: Table 'rwlock_instances' already exists
-ERROR 1050 (42S01) at line 261: Table 'setup_actors' already exists
-ERROR 1050 (42S01) at line 269: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 278: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 288: Table 'setup_objects' already exists
-ERROR 1050 (42S01) at line 296: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 341: Table 'table_io_waits_summary_by_index_usage' already exists
-ERROR 1050 (42S01) at line 385: Table 'table_io_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 464: Table 'table_lock_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 484: Table 'threads' already exists
-ERROR 1644 (HY000) at line 904: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 221: Table 'socket_instances' already exists
+ERROR 1050 (42S01) at line 288: Table 'socket_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 353: Table 'socket_summary_by_event_name' already exists
+ERROR 1050 (42S01) at line 362: Table 'mutex_instances' already exists
+ERROR 1050 (42S01) at line 376: Table 'objects_summary_global_by_type' already exists
+ERROR 1050 (42S01) at line 386: Table 'performance_timers' already exists
+ERROR 1050 (42S01) at line 396: Table 'rwlock_instances' already exists
+ERROR 1050 (42S01) at line 405: Table 'setup_actors' already exists
+ERROR 1050 (42S01) at line 413: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 422: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 432: Table 'setup_objects' already exists
+ERROR 1050 (42S01) at line 440: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 485: Table 'table_io_waits_summary_by_index_usage' already exists
+ERROR 1050 (42S01) at line 529: Table 'table_io_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 608: Table 'table_lock_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 628: Table 'threads' already exists
+ERROR 1644 (HY000) at line 1048: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 select name from mysql.proc where db='performance_schema';
 name
@@ -122,20 +131,23 @@ ERROR 1050 (42S01) at line 177: Table 'e
 ERROR 1050 (42S01) at line 186: Table 'file_instances' already exists
 ERROR 1050 (42S01) at line 197: Table 'file_summary_by_event_name' already exists
 ERROR 1050 (42S01) at line 209: Table 'file_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 218: Table 'mutex_instances' already exists
-ERROR 1050 (42S01) at line 232: Table 'objects_summary_global_by_type' already exists
-ERROR 1050 (42S01) at line 242: Table 'performance_timers' already exists
-ERROR 1050 (42S01) at line 252: Table 'rwlock_instances' already exists
-ERROR 1050 (42S01) at line 261: Table 'setup_actors' already exists
-ERROR 1050 (42S01) at line 269: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 278: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 288: Table 'setup_objects' already exists
-ERROR 1050 (42S01) at line 296: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 341: Table 'table_io_waits_summary_by_index_usage' already exists
-ERROR 1050 (42S01) at line 385: Table 'table_io_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 464: Table 'table_lock_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 484: Table 'threads' already exists
-ERROR 1644 (HY000) at line 904: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 221: Table 'socket_instances' already exists
+ERROR 1050 (42S01) at line 288: Table 'socket_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 353: Table 'socket_summary_by_event_name' already exists
+ERROR 1050 (42S01) at line 362: Table 'mutex_instances' already exists
+ERROR 1050 (42S01) at line 376: Table 'objects_summary_global_by_type' already exists
+ERROR 1050 (42S01) at line 386: Table 'performance_timers' already exists
+ERROR 1050 (42S01) at line 396: Table 'rwlock_instances' already exists
+ERROR 1050 (42S01) at line 405: Table 'setup_actors' already exists
+ERROR 1050 (42S01) at line 413: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 422: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 432: Table 'setup_objects' already exists
+ERROR 1050 (42S01) at line 440: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 485: Table 'table_io_waits_summary_by_index_usage' already exists
+ERROR 1050 (42S01) at line 529: Table 'table_io_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 608: Table 'table_lock_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 628: Table 'threads' already exists
+ERROR 1644 (HY000) at line 1048: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 select name from mysql.proc where db='performance_schema';
 name
@@ -156,20 +168,23 @@ ERROR 1050 (42S01) at line 177: Table 'e
 ERROR 1050 (42S01) at line 186: Table 'file_instances' already exists
 ERROR 1050 (42S01) at line 197: Table 'file_summary_by_event_name' already exists
 ERROR 1050 (42S01) at line 209: Table 'file_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 218: Table 'mutex_instances' already exists
-ERROR 1050 (42S01) at line 232: Table 'objects_summary_global_by_type' already exists
-ERROR 1050 (42S01) at line 242: Table 'performance_timers' already exists
-ERROR 1050 (42S01) at line 252: Table 'rwlock_instances' already exists
-ERROR 1050 (42S01) at line 261: Table 'setup_actors' already exists
-ERROR 1050 (42S01) at line 269: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 278: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 288: Table 'setup_objects' already exists
-ERROR 1050 (42S01) at line 296: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 341: Table 'table_io_waits_summary_by_index_usage' already exists
-ERROR 1050 (42S01) at line 385: Table 'table_io_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 464: Table 'table_lock_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 484: Table 'threads' already exists
-ERROR 1644 (HY000) at line 904: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 221: Table 'socket_instances' already exists
+ERROR 1050 (42S01) at line 288: Table 'socket_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 353: Table 'socket_summary_by_event_name' already exists
+ERROR 1050 (42S01) at line 362: Table 'mutex_instances' already exists
+ERROR 1050 (42S01) at line 376: Table 'objects_summary_global_by_type' already exists
+ERROR 1050 (42S01) at line 386: Table 'performance_timers' already exists
+ERROR 1050 (42S01) at line 396: Table 'rwlock_instances' already exists
+ERROR 1050 (42S01) at line 405: Table 'setup_actors' already exists
+ERROR 1050 (42S01) at line 413: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 422: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 432: Table 'setup_objects' already exists
+ERROR 1050 (42S01) at line 440: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 485: Table 'table_io_waits_summary_by_index_usage' already exists
+ERROR 1050 (42S01) at line 529: Table 'table_io_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 608: Table 'table_lock_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 628: Table 'threads' already exists
+ERROR 1644 (HY000) at line 1048: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 select name from mysql.event where db='performance_schema';
 name

=== modified file 'mysql-test/suite/perfschema/r/schema_lc2.result'
--- a/mysql-test/suite/perfschema/r/schema_lc2.result	2010-12-09 16:17:13 +0000
+++ b/mysql-test/suite/perfschema/r/schema_lc2.result	2011-03-16 09:32:27 +0000
@@ -26,6 +26,9 @@ setup_consumers
 setup_instruments
 setup_objects
 setup_timers
+socket_instances
+socket_summary_by_event_name
+socket_summary_by_instance
 table_io_waits_summary_by_index_usage
 table_io_waits_summary_by_table
 table_lock_waits_summary_by_table


Attachment: [text/bzr-bundle] bzr/marc.alff@oracle.com-20110316093227-1pymm2ok04c1yni0.bundle
Thread
bzr commit into mysql-trunk branch (marc.alff:3258) Marc Alff16 Mar