List:Commits« Previous MessageNext Message »
From:Marc Alff Date:August 25 2011 3:10pm
Subject:bzr push into mysql-trunk branch (marc.alff:3406)
View as plain text  
 3406 Marc Alff	2011-08-25 [merge]
      Local merge

    modified:
      extra/innochecksum.c
=== modified file 'include/mysql/psi/mysql_socket.h'
--- a/include/mysql/psi/mysql_socket.h	2011-08-18 12:27:21 +0000
+++ b/include/mysql/psi/mysql_socket.h	2011-08-25 07:53:21 +0000
@@ -901,9 +901,10 @@ inline_mysql_socket_accept
     PSI_CALL(set_socket_info)(socket_accept.m_psi, &socket_accept.fd, addr,
                               addr_length);
   return socket_accept;
-#endif
+#else
   socket_accept.fd= accept(socket_listen.fd, addr, addr_len);
   return socket_accept;
+#endif
 }
 
 /** mysql_socket_close */

=== modified file 'include/mysql/psi/psi.h'
--- a/include/mysql/psi/psi.h	2011-08-16 03:57:30 +0000
+++ b/include/mysql/psi/psi.h	2011-08-25 07:53:21 +0000
@@ -1635,7 +1635,7 @@ typedef void (*set_statement_rows_examin
   @param count the metric increment value
 */
 typedef void (*inc_statement_created_tmp_disk_tables_t)
-  (struct PSI_statement_locker *locker, ulonglong count);
+  (struct PSI_statement_locker *locker, ulong count);
 
 /**
   Increment a statement event "created tmp tables" metric.
@@ -1643,7 +1643,7 @@ typedef void (*inc_statement_created_tmp
   @param count the metric increment value
 */
 typedef void (*inc_statement_created_tmp_tables_t)
-  (struct PSI_statement_locker *locker, ulonglong count);
+  (struct PSI_statement_locker *locker, ulong count);
 
 /**
   Increment a statement event "select full join" metric.
@@ -1651,7 +1651,7 @@ typedef void (*inc_statement_created_tmp
   @param count the metric increment value
 */
 typedef void (*inc_statement_select_full_join_t)
-  (struct PSI_statement_locker *locker, ulonglong count);
+  (struct PSI_statement_locker *locker, ulong count);
 
 /**
   Increment a statement event "select full range join" metric.
@@ -1659,7 +1659,7 @@ typedef void (*inc_statement_select_full
   @param count the metric increment value
 */
 typedef void (*inc_statement_select_full_range_join_t)
-  (struct PSI_statement_locker *locker, ulonglong count);
+  (struct PSI_statement_locker *locker, ulong count);
 
 /**
   Increment a statement event "select range join" metric.
@@ -1667,7 +1667,7 @@ typedef void (*inc_statement_select_full
   @param count the metric increment value
 */
 typedef void (*inc_statement_select_range_t)
-  (struct PSI_statement_locker *locker, ulonglong count);
+  (struct PSI_statement_locker *locker, ulong count);
 
 /**
   Increment a statement event "select range check" metric.
@@ -1675,7 +1675,7 @@ typedef void (*inc_statement_select_rang
   @param count the metric increment value
 */
 typedef void (*inc_statement_select_range_check_t)
-  (struct PSI_statement_locker *locker, ulonglong count);
+  (struct PSI_statement_locker *locker, ulong count);
 
 /**
   Increment a statement event "select scan" metric.
@@ -1683,7 +1683,7 @@ typedef void (*inc_statement_select_rang
   @param count the metric increment value
 */
 typedef void (*inc_statement_select_scan_t)
-  (struct PSI_statement_locker *locker, ulonglong count);
+  (struct PSI_statement_locker *locker, ulong count);
 
 /**
   Increment a statement event "sort merge passes" metric.
@@ -1691,7 +1691,7 @@ typedef void (*inc_statement_select_scan
   @param count the metric increment value
 */
 typedef void (*inc_statement_sort_merge_passes_t)
-  (struct PSI_statement_locker *locker, ulonglong count);
+  (struct PSI_statement_locker *locker, ulong count);
 
 /**
   Increment a statement event "sort range" metric.
@@ -1699,7 +1699,7 @@ typedef void (*inc_statement_sort_merge_
   @param count the metric increment value
 */
 typedef void (*inc_statement_sort_range_t)
-  (struct PSI_statement_locker *locker, ulonglong count);
+  (struct PSI_statement_locker *locker, ulong count);
 
 /**
   Increment a statement event "sort rows" metric.
@@ -1707,7 +1707,7 @@ typedef void (*inc_statement_sort_range_
   @param count the metric increment value
 */
 typedef void (*inc_statement_sort_rows_t)
-  (struct PSI_statement_locker *locker, ulonglong count);
+  (struct PSI_statement_locker *locker, ulong count);
 
 /**
   Increment a statement event "sort scan" metric.
@@ -1715,7 +1715,7 @@ typedef void (*inc_statement_sort_rows_t
   @param count the metric increment value
 */
 typedef void (*inc_statement_sort_scan_t)
-  (struct PSI_statement_locker *locker, ulonglong count);
+  (struct PSI_statement_locker *locker, ulong count);
 
 /**
   Set a statement event "no index used" metric.

=== modified file 'include/mysql/psi/psi_abi_v1.h.pp'
--- a/include/mysql/psi/psi_abi_v1.h.pp	2011-08-16 15:12:11 +0000
+++ b/include/mysql/psi/psi_abi_v1.h.pp	2011-08-25 07:53:21 +0000
@@ -410,27 +410,27 @@ typedef void (*set_statement_rows_sent_t
 typedef void (*set_statement_rows_examined_t)
   (struct PSI_statement_locker *locker, ulonglong count);
 typedef void (*inc_statement_created_tmp_disk_tables_t)
-  (struct PSI_statement_locker *locker, ulonglong count);
+  (struct PSI_statement_locker *locker, ulong count);
 typedef void (*inc_statement_created_tmp_tables_t)
-  (struct PSI_statement_locker *locker, ulonglong count);
+  (struct PSI_statement_locker *locker, ulong count);
 typedef void (*inc_statement_select_full_join_t)
-  (struct PSI_statement_locker *locker, ulonglong count);
+  (struct PSI_statement_locker *locker, ulong count);
 typedef void (*inc_statement_select_full_range_join_t)
-  (struct PSI_statement_locker *locker, ulonglong count);
+  (struct PSI_statement_locker *locker, ulong count);
 typedef void (*inc_statement_select_range_t)
-  (struct PSI_statement_locker *locker, ulonglong count);
+  (struct PSI_statement_locker *locker, ulong count);
 typedef void (*inc_statement_select_range_check_t)
-  (struct PSI_statement_locker *locker, ulonglong count);
+  (struct PSI_statement_locker *locker, ulong count);
 typedef void (*inc_statement_select_scan_t)
-  (struct PSI_statement_locker *locker, ulonglong count);
+  (struct PSI_statement_locker *locker, ulong count);
 typedef void (*inc_statement_sort_merge_passes_t)
-  (struct PSI_statement_locker *locker, ulonglong count);
+  (struct PSI_statement_locker *locker, ulong count);
 typedef void (*inc_statement_sort_range_t)
-  (struct PSI_statement_locker *locker, ulonglong count);
+  (struct PSI_statement_locker *locker, ulong count);
 typedef void (*inc_statement_sort_rows_t)
-  (struct PSI_statement_locker *locker, ulonglong count);
+  (struct PSI_statement_locker *locker, ulong count);
 typedef void (*inc_statement_sort_scan_t)
-  (struct PSI_statement_locker *locker, ulonglong count);
+  (struct PSI_statement_locker *locker, ulong count);
 typedef void (*set_statement_no_index_used_t)
   (struct PSI_statement_locker *locker);
 typedef void (*set_statement_no_good_index_used_t)

=== modified file 'mysys/psi_noop.cc'
--- a/mysys/psi_noop.cc	2011-07-22 20:08:29 +0000
+++ b/mysys/psi_noop.cc	2011-08-25 07:53:21 +0000
@@ -500,67 +500,67 @@ static void set_statement_rows_examined_
 }
 
 static void inc_statement_created_tmp_disk_tables_noop(PSI_statement_locker *locker,
-                                                       ulonglong count)
+                                                       ulong count)
 {
   return;
 }
 
 static void inc_statement_created_tmp_tables_noop(PSI_statement_locker *locker,
-                                                  ulonglong count)
+                                                  ulong count)
 {
   return;
 }
 
 static void inc_statement_select_full_join_noop(PSI_statement_locker *locker,
-                                                ulonglong count)
+                                                ulong count)
 {
   return;
 }
 
 static void inc_statement_select_full_range_join_noop(PSI_statement_locker *locker,
-                                                      ulonglong count)
+                                                      ulong count)
 {
   return;
 }
 
 static void inc_statement_select_range_noop(PSI_statement_locker *locker,
-                                            ulonglong count)
+                                            ulong count)
 {
   return;
 }
 
 static void inc_statement_select_range_check_noop(PSI_statement_locker *locker,
-                                                  ulonglong count)
+                                                  ulong count)
 {
   return;
 }
 
 static void inc_statement_select_scan_noop(PSI_statement_locker *locker,
-                                           ulonglong count)
+                                           ulong count)
 {
   return;
 }
 
 static void inc_statement_sort_merge_passes_noop(PSI_statement_locker *locker,
-                                                 ulonglong count)
+                                                 ulong count)
 {
   return;
 }
 
 static void inc_statement_sort_range_noop(PSI_statement_locker *locker,
-                                          ulonglong count)
+                                          ulong count)
 {
   return;
 }
 
 static void inc_statement_sort_rows_noop(PSI_statement_locker *locker,
-                                         ulonglong count)
+                                         ulong count)
 {
   return;
 }
 
 static void inc_statement_sort_scan_noop(PSI_statement_locker *locker,
-                                         ulonglong count)
+                                         ulong count)
 {
   return;
 }

=== modified file 'storage/perfschema/pfs.cc'
--- a/storage/perfschema/pfs.cc	2011-08-18 16:15:02 +0000
+++ b/storage/perfschema/pfs.cc	2011-08-25 07:53:21 +0000
@@ -4395,67 +4395,67 @@ static void set_statement_rows_examined_
 }
 
 static void inc_statement_created_tmp_disk_tables_v1(PSI_statement_locker *locker,
-                                                    ulonglong count)
+                                                    ulong count)
 {
   INC_STATEMENT_ATTR_BODY(locker, m_created_tmp_disk_tables, count);
 }
 
 static void inc_statement_created_tmp_tables_v1(PSI_statement_locker *locker,
-                                                ulonglong count)
+                                                ulong count)
 {
   INC_STATEMENT_ATTR_BODY(locker, m_created_tmp_tables, count);
 }
 
 static void inc_statement_select_full_join_v1(PSI_statement_locker *locker,
-                                              ulonglong count)
+                                              ulong count)
 {
   INC_STATEMENT_ATTR_BODY(locker, m_select_full_join, count);
 }
 
 static void inc_statement_select_full_range_join_v1(PSI_statement_locker *locker,
-                                                    ulonglong count)
+                                                    ulong count)
 {
   INC_STATEMENT_ATTR_BODY(locker, m_select_full_range_join, count);
 }
 
 static void inc_statement_select_range_v1(PSI_statement_locker *locker,
-                                          ulonglong count)
+                                          ulong count)
 {
   INC_STATEMENT_ATTR_BODY(locker, m_select_range, count);
 }
 
 static void inc_statement_select_range_check_v1(PSI_statement_locker *locker,
-                                                ulonglong count)
+                                                ulong count)
 {
   INC_STATEMENT_ATTR_BODY(locker, m_select_range_check, count);
 }
 
 static void inc_statement_select_scan_v1(PSI_statement_locker *locker,
-                                         ulonglong count)
+                                         ulong count)
 {
   INC_STATEMENT_ATTR_BODY(locker, m_select_scan, count);
 }
 
 static void inc_statement_sort_merge_passes_v1(PSI_statement_locker *locker,
-                                               ulonglong count)
+                                               ulong count)
 {
   INC_STATEMENT_ATTR_BODY(locker, m_sort_merge_passes, count);
 }
 
 static void inc_statement_sort_range_v1(PSI_statement_locker *locker,
-                                        ulonglong count)
+                                        ulong count)
 {
   INC_STATEMENT_ATTR_BODY(locker, m_sort_range, count);
 }
 
 static void inc_statement_sort_rows_v1(PSI_statement_locker *locker,
-                                       ulonglong count)
+                                       ulong count)
 {
   INC_STATEMENT_ATTR_BODY(locker, m_sort_rows, count);
 }
 
 static void inc_statement_sort_scan_v1(PSI_statement_locker *locker,
-                                       ulonglong count)
+                                       ulong count)
 {
   INC_STATEMENT_ATTR_BODY(locker, m_sort_scan, count);
 }

=== modified file 'storage/perfschema/pfs_account.cc'
--- a/storage/perfschema/pfs_account.cc	2011-08-10 06:26:45 +0000
+++ b/storage/perfschema/pfs_account.cc	2011-08-25 07:53:21 +0000
@@ -122,6 +122,7 @@ void cleanup_account(void)
   account_max= 0;
 }
 
+C_MODE_START
 static uchar *account_hash_get_key(const uchar *entry, size_t *length,
                                 my_bool)
 {
@@ -136,6 +137,7 @@ static uchar *account_hash_get_key(const
   result= account->m_key.m_hash_key;
   return const_cast<uchar*> (reinterpret_cast<const uchar*> (result));
 }
+C_MODE_END
 
 /**
   Initialize the user hash.

=== modified file 'storage/perfschema/pfs_host.cc'
--- a/storage/perfschema/pfs_host.cc	2011-08-10 06:26:45 +0000
+++ b/storage/perfschema/pfs_host.cc	2011-08-25 07:53:21 +0000
@@ -123,6 +123,7 @@ void cleanup_host(void)
   host_max= 0;
 }
 
+C_MODE_START
 static uchar *host_hash_get_key(const uchar *entry, size_t *length,
                                 my_bool)
 {
@@ -137,6 +138,7 @@ static uchar *host_hash_get_key(const uc
   result= host->m_key.m_hash_key;
   return const_cast<uchar*> (reinterpret_cast<const uchar*> (result));
 }
+C_MODE_END
 
 /**
   Initialize the host hash.

=== modified file 'storage/perfschema/pfs_instr.cc'
--- a/storage/perfschema/pfs_instr.cc	2011-08-18 12:27:21 +0000
+++ b/storage/perfschema/pfs_instr.cc	2011-08-25 07:53:21 +0000
@@ -162,10 +162,6 @@ static PFS_events_statements *thread_sta
 static LF_HASH filename_hash;
 /** True if filename_hash is initialized. */
 static bool filename_hash_inited= false;
-C_MODE_START
-/** Get hash table key for instrumented files. */
-static uchar *filename_hash_get_key(const uchar *, size_t *, my_bool);
-C_MODE_END
 
 /**
   Initialize all the instruments instance buffers.
@@ -471,8 +467,8 @@ void cleanup_instruments(void)
   global_instr_class_statements_array= NULL;
 }
 
-extern "C"
-{
+C_MODE_START
+/** Get hash table key for instrumented files. */
 static uchar *filename_hash_get_key(const uchar *entry, size_t *length,
                                     my_bool)
 {
@@ -487,7 +483,7 @@ static uchar *filename_hash_get_key(cons
   result= file->m_filename;
   return const_cast<uchar*> (reinterpret_cast<const uchar*> (result));
 }
-}
+C_MODE_END
 
 /**
   Initialize the file name hash.
@@ -1681,16 +1677,12 @@ void aggregate_all_stages(PFS_stage_stat
   PFS_stage_stat *from;
   PFS_stage_stat *from_last;
   PFS_stage_stat *to_1;
-  PFS_stage_stat *to_1_last;
   PFS_stage_stat *to_2;
-  PFS_stage_stat *to_2_last;
 
   from= from_array;
   from_last= from_array + stage_class_max;
   to_1= to_array_1;
-  to_1_last= to_array_1 + stage_class_max;
   to_2= to_array_2;
-  to_2_last= to_array_2 + stage_class_max;
 
   for ( ; from < from_last ; from++, to_1++, to_2++)
   {
@@ -1731,16 +1723,12 @@ void aggregate_all_statements(PFS_statem
   PFS_statement_stat *from;
   PFS_statement_stat *from_last;
   PFS_statement_stat *to_1;
-  PFS_statement_stat *to_1_last;
   PFS_statement_stat *to_2;
-  PFS_statement_stat *to_2_last;
 
   from= from_array;
   from_last= from_array + statement_class_max;
   to_1= to_array_1;
-  to_1_last= to_array_1 + statement_class_max;
   to_2= to_array_2;
-  to_2_last= to_array_2 + statement_class_max;
 
   for ( ; from < from_last ; from++, to_1++, to_2++)
   {

=== modified file 'storage/perfschema/pfs_instr_class.cc'
--- a/storage/perfschema/pfs_instr_class.cc	2011-08-11 03:11:58 +0000
+++ b/storage/perfschema/pfs_instr_class.cc	2011-08-25 07:53:21 +0000
@@ -136,10 +136,6 @@ PFS_instr_class global_idle_class;
 static LF_HASH table_share_hash;
 /** True if table_share_hash is initialized. */
 static bool table_share_hash_inited= false;
-C_MODE_START
-/** Get hash table key for instrumented tables. */
-static uchar *table_share_hash_get_key(const uchar *, size_t *, my_bool);
-C_MODE_END
 
 static volatile uint32 file_class_dirty_count= 0;
 static volatile uint32 file_class_allocated_count= 0;
@@ -331,9 +327,8 @@ void cleanup_table_share(void)
   table_share_max= 0;
 }
 
-/**
-  get_key function for @c table_share_hash.
-*/
+C_MODE_START
+/** get_key function for @c table_share_hash. */
 static uchar *table_share_hash_get_key(const uchar *entry, size_t *length,
                                        my_bool)
 {
@@ -348,6 +343,7 @@ static uchar *table_share_hash_get_key(c
   result= &share->m_key.m_hash_key[0];
   return const_cast<uchar*> (reinterpret_cast<const uchar*> (result));
 }
+C_MODE_END
 
 /** Initialize the table share hash table. */
 int init_table_share_hash(void)

=== modified file 'storage/perfschema/pfs_setup_actor.cc'
--- a/storage/perfschema/pfs_setup_actor.cc	2011-08-10 07:06:02 +0000
+++ b/storage/perfschema/pfs_setup_actor.cc	2011-08-25 07:53:21 +0000
@@ -77,6 +77,7 @@ void cleanup_setup_actor(void)
   setup_actor_max= 0;
 }
 
+C_MODE_START
 static uchar *setup_actor_hash_get_key(const uchar *entry, size_t *length,
                                        my_bool)
 {
@@ -91,6 +92,7 @@ static uchar *setup_actor_hash_get_key(c
   result= setup_actor->m_key.m_hash_key;
   return const_cast<uchar*> (reinterpret_cast<const uchar*> (result));
 }
+C_MODE_END
 
 /**
   Initialize the setup actor hash.

=== modified file 'storage/perfschema/pfs_setup_object.cc'
--- a/storage/perfschema/pfs_setup_object.cc	2011-08-10 07:06:02 +0000
+++ b/storage/perfschema/pfs_setup_object.cc	2011-08-25 07:53:21 +0000
@@ -72,6 +72,7 @@ void cleanup_setup_object(void)
   setup_object_max= 0;
 }
 
+C_MODE_START
 static uchar *setup_object_hash_get_key(const uchar *entry, size_t *length,
                                         my_bool)
 {
@@ -86,6 +87,7 @@ static uchar *setup_object_hash_get_key(
   result= setup_object->m_key.m_hash_key;
   return const_cast<uchar*> (reinterpret_cast<const uchar*> (result));
 }
+C_MODE_END
 
 /**
   Initialize the setup objects hash.

=== modified file 'storage/perfschema/pfs_user.cc'
--- a/storage/perfschema/pfs_user.cc	2011-08-10 06:26:45 +0000
+++ b/storage/perfschema/pfs_user.cc	2011-08-25 07:53:21 +0000
@@ -123,6 +123,7 @@ void cleanup_user(void)
   user_max= 0;
 }
 
+C_MODE_START
 static uchar *user_hash_get_key(const uchar *entry, size_t *length,
                                 my_bool)
 {
@@ -137,6 +138,7 @@ static uchar *user_hash_get_key(const uc
   result= user->m_key.m_hash_key;
   return const_cast<uchar*> (reinterpret_cast<const uchar*> (result));
 }
+C_MODE_END
 
 /**
   Initialize the user hash.

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (marc.alff:3406) Marc Alff25 Aug