From cd5a6304b981d456ac7cd3dfb2ebc3ccf9bfede7 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Mon, 29 Oct 2012 16:30:06 +0100 Subject: [PATCH] P_S test failures on 32-bit platforms: always use intptr type when casting a pointer to an integer to avoid sign expansion. or, at least, cast identically in socket_summary_by_instance and socket_instances --- storage/perfschema/table_socket_summary_by_instance.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/storage/perfschema/table_socket_summary_by_instance.cc b/storage/perfschema/table_socket_summary_by_instance.cc index 5b177cb3dce..784c83fedfa 100644 --- a/storage/perfschema/table_socket_summary_by_instance.cc +++ b/storage/perfschema/table_socket_summary_by_instance.cc @@ -286,7 +286,7 @@ int table_socket_summary_by_instance::read_row_values(TABLE *table, m_row.m_event_name.set_field(f); break; case 1: /* OBJECT_INSTANCE */ - set_field_ulonglong(f, (ulonglong)m_row.m_identity); + set_field_ulonglong(f, (intptr)m_row.m_identity); break; case 2:/* COUNT_STAR */