Skip to content

Commit 8cf80c2

Browse files
marcalffmarcalff
committed
Build cleanup
1 parent 6feba13 commit 8cf80c2

File tree

3 files changed

+88
-111
lines changed

3 files changed

+88
-111
lines changed

‎include/mysql/psi/mysql_socket.h

-41
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,6 @@ inline_mysql_end_socket_wait(struct PSI_socket_locker *locker, size_t byte_count
342342
#define mysql_socket_sendmsg(FD, M, FL)
343343
#define mysql_socket_recvmsg(FD, M, FL)
344344
#define mysql_socket_sockatmark(FD)
345-
#define mysql_socket_isfdtype(FD, FT)
346345
#define mysql_socket_socketpair(K, D, T, P, FDS)
347346

348347
#else
@@ -371,14 +370,6 @@ inline_mysql_end_socket_wait(struct PSI_socket_locker *locker, size_t byte_count
371370
inline_mysql_socket_sockatmark(FD)
372371
#endif
373372

374-
#ifdef HAVE_PSI_INTERFACE
375-
#define mysql_socket_isfdtype(FD, FT) \
376-
inline_mysql_socket_isfdtype(__FILE__, __LINE__, FD, FT)
377-
#else
378-
#define mysql_socket_isfdtype(FD, FT) \
379-
inline_mysql_socket_isfdtype(FD, FT)
380-
#endif
381-
382373
#ifdef HAVE_PSI_INTERFACE
383374
#define mysql_socket_socketpair(K, D, T, P, FDS) \
384375
inline_mysql_socket_socketpair(K, D, T, P, FDS)
@@ -1027,38 +1018,6 @@ inline_mysql_socket_sockatmark
10271018
return result;
10281019
}
10291020

1030-
/** mysql_socket_isfdtype */
1031-
1032-
static inline int
1033-
inline_mysql_socket_isfdtype
1034-
(
1035-
#ifdef HAVE_PSI_INTERFACE
1036-
const char *src_file, uint src_line,
1037-
#endif
1038-
MYSQL_SOCKET mysql_socket, int fdtype)
1039-
{
1040-
int result;
1041-
#ifdef HAVE_PSI_INTERFACE
1042-
struct PSI_socket_locker *locker= NULL;
1043-
PSI_socket_locker_state state;
1044-
1045-
if (likely(PSI_server != NULL && mysql_socket.m_psi != NULL))
1046-
{
1047-
locker= PSI_server->get_thread_socket_locker(&state, mysql_socket.m_psi, PSI_SOCKET_STAT);
1048-
if (likely(locker !=NULL))
1049-
PSI_server->start_socket_wait(locker, (size_t)0, src_file, src_line);
1050-
}
1051-
#endif
1052-
1053-
result= isfdtype(mysql_socket.fd, fdtype);
1054-
1055-
#ifdef HAVE_PSI_INTERFACE
1056-
if (likely(locker != NULL))
1057-
PSI_server->end_socket_wait(locker, (size_t)0);
1058-
#endif
1059-
return result;
1060-
}
1061-
10621021
/** mysql_socket_socketpair */
10631022

10641023
static inline int

‎mysql-test/suite/perfschema/r/pfs_upgrade_lc2.result

+85-70
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,23 @@ ERROR 1050 (42S01) at line 177: Table 'events_waits_summary_global_by_event_name
1818
ERROR 1050 (42S01) at line 186: Table 'file_instances' already exists
1919
ERROR 1050 (42S01) at line 197: Table 'file_summary_by_event_name' already exists
2020
ERROR 1050 (42S01) at line 209: Table 'file_summary_by_instance' already exists
21-
ERROR 1050 (42S01) at line 218: Table 'mutex_instances' already exists
22-
ERROR 1050 (42S01) at line 232: Table 'objects_summary_global_by_type' already exists
23-
ERROR 1050 (42S01) at line 242: Table 'performance_timers' already exists
24-
ERROR 1050 (42S01) at line 252: Table 'rwlock_instances' already exists
25-
ERROR 1050 (42S01) at line 261: Table 'setup_actors' already exists
26-
ERROR 1050 (42S01) at line 269: Table 'setup_consumers' already exists
27-
ERROR 1050 (42S01) at line 278: Table 'setup_instruments' already exists
28-
ERROR 1050 (42S01) at line 288: Table 'setup_objects' already exists
29-
ERROR 1050 (42S01) at line 296: Table 'setup_timers' already exists
30-
ERROR 1050 (42S01) at line 341: Table 'table_io_waits_summary_by_index_usage' already exists
31-
ERROR 1050 (42S01) at line 385: Table 'table_io_waits_summary_by_table' already exists
32-
ERROR 1050 (42S01) at line 464: Table 'table_lock_waits_summary_by_table' already exists
33-
ERROR 1050 (42S01) at line 484: Table 'threads' already exists
34-
ERROR 1644 (HY000) at line 904: Unexpected content found in the performance_schema database.
21+
ERROR 1050 (42S01) at line 221: Table 'socket_instances' already exists
22+
ERROR 1050 (42S01) at line 288: Table 'socket_summary_by_instance' already exists
23+
ERROR 1050 (42S01) at line 353: Table 'socket_summary_by_event_name' already exists
24+
ERROR 1050 (42S01) at line 362: Table 'mutex_instances' already exists
25+
ERROR 1050 (42S01) at line 376: Table 'objects_summary_global_by_type' already exists
26+
ERROR 1050 (42S01) at line 386: Table 'performance_timers' already exists
27+
ERROR 1050 (42S01) at line 396: Table 'rwlock_instances' already exists
28+
ERROR 1050 (42S01) at line 405: Table 'setup_actors' already exists
29+
ERROR 1050 (42S01) at line 413: Table 'setup_consumers' already exists
30+
ERROR 1050 (42S01) at line 422: Table 'setup_instruments' already exists
31+
ERROR 1050 (42S01) at line 432: Table 'setup_objects' already exists
32+
ERROR 1050 (42S01) at line 440: Table 'setup_timers' already exists
33+
ERROR 1050 (42S01) at line 485: Table 'table_io_waits_summary_by_index_usage' already exists
34+
ERROR 1050 (42S01) at line 529: Table 'table_io_waits_summary_by_table' already exists
35+
ERROR 1050 (42S01) at line 608: Table 'table_lock_waits_summary_by_table' already exists
36+
ERROR 1050 (42S01) at line 628: Table 'threads' already exists
37+
ERROR 1644 (HY000) at line 1048: Unexpected content found in the performance_schema database.
3538
FATAL ERROR: Upgrade failed
3639
show tables like "user_table";
3740
Tables_in_performance_schema (user_table)
@@ -54,20 +57,23 @@ ERROR 1050 (42S01) at line 177: Table 'events_waits_summary_global_by_event_name
5457
ERROR 1050 (42S01) at line 186: Table 'file_instances' already exists
5558
ERROR 1050 (42S01) at line 197: Table 'file_summary_by_event_name' already exists
5659
ERROR 1050 (42S01) at line 209: Table 'file_summary_by_instance' already exists
57-
ERROR 1050 (42S01) at line 218: Table 'mutex_instances' already exists
58-
ERROR 1050 (42S01) at line 232: Table 'objects_summary_global_by_type' already exists
59-
ERROR 1050 (42S01) at line 242: Table 'performance_timers' already exists
60-
ERROR 1050 (42S01) at line 252: Table 'rwlock_instances' already exists
61-
ERROR 1050 (42S01) at line 261: Table 'setup_actors' already exists
62-
ERROR 1050 (42S01) at line 269: Table 'setup_consumers' already exists
63-
ERROR 1050 (42S01) at line 278: Table 'setup_instruments' already exists
64-
ERROR 1050 (42S01) at line 288: Table 'setup_objects' already exists
65-
ERROR 1050 (42S01) at line 296: Table 'setup_timers' already exists
66-
ERROR 1050 (42S01) at line 341: Table 'table_io_waits_summary_by_index_usage' already exists
67-
ERROR 1050 (42S01) at line 385: Table 'table_io_waits_summary_by_table' already exists
68-
ERROR 1050 (42S01) at line 464: Table 'table_lock_waits_summary_by_table' already exists
69-
ERROR 1050 (42S01) at line 484: Table 'threads' already exists
70-
ERROR 1644 (HY000) at line 904: Unexpected content found in the performance_schema database.
60+
ERROR 1050 (42S01) at line 221: Table 'socket_instances' already exists
61+
ERROR 1050 (42S01) at line 288: Table 'socket_summary_by_instance' already exists
62+
ERROR 1050 (42S01) at line 353: Table 'socket_summary_by_event_name' already exists
63+
ERROR 1050 (42S01) at line 362: Table 'mutex_instances' already exists
64+
ERROR 1050 (42S01) at line 376: Table 'objects_summary_global_by_type' already exists
65+
ERROR 1050 (42S01) at line 386: Table 'performance_timers' already exists
66+
ERROR 1050 (42S01) at line 396: Table 'rwlock_instances' already exists
67+
ERROR 1050 (42S01) at line 405: Table 'setup_actors' already exists
68+
ERROR 1050 (42S01) at line 413: Table 'setup_consumers' already exists
69+
ERROR 1050 (42S01) at line 422: Table 'setup_instruments' already exists
70+
ERROR 1050 (42S01) at line 432: Table 'setup_objects' already exists
71+
ERROR 1050 (42S01) at line 440: Table 'setup_timers' already exists
72+
ERROR 1050 (42S01) at line 485: Table 'table_io_waits_summary_by_index_usage' already exists
73+
ERROR 1050 (42S01) at line 529: Table 'table_io_waits_summary_by_table' already exists
74+
ERROR 1050 (42S01) at line 608: Table 'table_lock_waits_summary_by_table' already exists
75+
ERROR 1050 (42S01) at line 628: Table 'threads' already exists
76+
ERROR 1644 (HY000) at line 1048: Unexpected content found in the performance_schema database.
7177
FATAL ERROR: Upgrade failed
7278
show tables like "user_view";
7379
Tables_in_performance_schema (user_view)
@@ -88,20 +94,23 @@ ERROR 1050 (42S01) at line 177: Table 'events_waits_summary_global_by_event_name
8894
ERROR 1050 (42S01) at line 186: Table 'file_instances' already exists
8995
ERROR 1050 (42S01) at line 197: Table 'file_summary_by_event_name' already exists
9096
ERROR 1050 (42S01) at line 209: Table 'file_summary_by_instance' already exists
91-
ERROR 1050 (42S01) at line 218: Table 'mutex_instances' already exists
92-
ERROR 1050 (42S01) at line 232: Table 'objects_summary_global_by_type' already exists
93-
ERROR 1050 (42S01) at line 242: Table 'performance_timers' already exists
94-
ERROR 1050 (42S01) at line 252: Table 'rwlock_instances' already exists
95-
ERROR 1050 (42S01) at line 261: Table 'setup_actors' already exists
96-
ERROR 1050 (42S01) at line 269: Table 'setup_consumers' already exists
97-
ERROR 1050 (42S01) at line 278: Table 'setup_instruments' already exists
98-
ERROR 1050 (42S01) at line 288: Table 'setup_objects' already exists
99-
ERROR 1050 (42S01) at line 296: Table 'setup_timers' already exists
100-
ERROR 1050 (42S01) at line 341: Table 'table_io_waits_summary_by_index_usage' already exists
101-
ERROR 1050 (42S01) at line 385: Table 'table_io_waits_summary_by_table' already exists
102-
ERROR 1050 (42S01) at line 464: Table 'table_lock_waits_summary_by_table' already exists
103-
ERROR 1050 (42S01) at line 484: Table 'threads' already exists
104-
ERROR 1644 (HY000) at line 904: Unexpected content found in the performance_schema database.
97+
ERROR 1050 (42S01) at line 221: Table 'socket_instances' already exists
98+
ERROR 1050 (42S01) at line 288: Table 'socket_summary_by_instance' already exists
99+
ERROR 1050 (42S01) at line 353: Table 'socket_summary_by_event_name' already exists
100+
ERROR 1050 (42S01) at line 362: Table 'mutex_instances' already exists
101+
ERROR 1050 (42S01) at line 376: Table 'objects_summary_global_by_type' already exists
102+
ERROR 1050 (42S01) at line 386: Table 'performance_timers' already exists
103+
ERROR 1050 (42S01) at line 396: Table 'rwlock_instances' already exists
104+
ERROR 1050 (42S01) at line 405: Table 'setup_actors' already exists
105+
ERROR 1050 (42S01) at line 413: Table 'setup_consumers' already exists
106+
ERROR 1050 (42S01) at line 422: Table 'setup_instruments' already exists
107+
ERROR 1050 (42S01) at line 432: Table 'setup_objects' already exists
108+
ERROR 1050 (42S01) at line 440: Table 'setup_timers' already exists
109+
ERROR 1050 (42S01) at line 485: Table 'table_io_waits_summary_by_index_usage' already exists
110+
ERROR 1050 (42S01) at line 529: Table 'table_io_waits_summary_by_table' already exists
111+
ERROR 1050 (42S01) at line 608: Table 'table_lock_waits_summary_by_table' already exists
112+
ERROR 1050 (42S01) at line 628: Table 'threads' already exists
113+
ERROR 1644 (HY000) at line 1048: Unexpected content found in the performance_schema database.
105114
FATAL ERROR: Upgrade failed
106115
select name from mysql.proc where db='performance_schema';
107116
name
@@ -122,20 +131,23 @@ ERROR 1050 (42S01) at line 177: Table 'events_waits_summary_global_by_event_name
122131
ERROR 1050 (42S01) at line 186: Table 'file_instances' already exists
123132
ERROR 1050 (42S01) at line 197: Table 'file_summary_by_event_name' already exists
124133
ERROR 1050 (42S01) at line 209: Table 'file_summary_by_instance' already exists
125-
ERROR 1050 (42S01) at line 218: Table 'mutex_instances' already exists
126-
ERROR 1050 (42S01) at line 232: Table 'objects_summary_global_by_type' already exists
127-
ERROR 1050 (42S01) at line 242: Table 'performance_timers' already exists
128-
ERROR 1050 (42S01) at line 252: Table 'rwlock_instances' already exists
129-
ERROR 1050 (42S01) at line 261: Table 'setup_actors' already exists
130-
ERROR 1050 (42S01) at line 269: Table 'setup_consumers' already exists
131-
ERROR 1050 (42S01) at line 278: Table 'setup_instruments' already exists
132-
ERROR 1050 (42S01) at line 288: Table 'setup_objects' already exists
133-
ERROR 1050 (42S01) at line 296: Table 'setup_timers' already exists
134-
ERROR 1050 (42S01) at line 341: Table 'table_io_waits_summary_by_index_usage' already exists
135-
ERROR 1050 (42S01) at line 385: Table 'table_io_waits_summary_by_table' already exists
136-
ERROR 1050 (42S01) at line 464: Table 'table_lock_waits_summary_by_table' already exists
137-
ERROR 1050 (42S01) at line 484: Table 'threads' already exists
138-
ERROR 1644 (HY000) at line 904: Unexpected content found in the performance_schema database.
134+
ERROR 1050 (42S01) at line 221: Table 'socket_instances' already exists
135+
ERROR 1050 (42S01) at line 288: Table 'socket_summary_by_instance' already exists
136+
ERROR 1050 (42S01) at line 353: Table 'socket_summary_by_event_name' already exists
137+
ERROR 1050 (42S01) at line 362: Table 'mutex_instances' already exists
138+
ERROR 1050 (42S01) at line 376: Table 'objects_summary_global_by_type' already exists
139+
ERROR 1050 (42S01) at line 386: Table 'performance_timers' already exists
140+
ERROR 1050 (42S01) at line 396: Table 'rwlock_instances' already exists
141+
ERROR 1050 (42S01) at line 405: Table 'setup_actors' already exists
142+
ERROR 1050 (42S01) at line 413: Table 'setup_consumers' already exists
143+
ERROR 1050 (42S01) at line 422: Table 'setup_instruments' already exists
144+
ERROR 1050 (42S01) at line 432: Table 'setup_objects' already exists
145+
ERROR 1050 (42S01) at line 440: Table 'setup_timers' already exists
146+
ERROR 1050 (42S01) at line 485: Table 'table_io_waits_summary_by_index_usage' already exists
147+
ERROR 1050 (42S01) at line 529: Table 'table_io_waits_summary_by_table' already exists
148+
ERROR 1050 (42S01) at line 608: Table 'table_lock_waits_summary_by_table' already exists
149+
ERROR 1050 (42S01) at line 628: Table 'threads' already exists
150+
ERROR 1644 (HY000) at line 1048: Unexpected content found in the performance_schema database.
139151
FATAL ERROR: Upgrade failed
140152
select name from mysql.proc where db='performance_schema';
141153
name
@@ -156,20 +168,23 @@ ERROR 1050 (42S01) at line 177: Table 'events_waits_summary_global_by_event_name
156168
ERROR 1050 (42S01) at line 186: Table 'file_instances' already exists
157169
ERROR 1050 (42S01) at line 197: Table 'file_summary_by_event_name' already exists
158170
ERROR 1050 (42S01) at line 209: Table 'file_summary_by_instance' already exists
159-
ERROR 1050 (42S01) at line 218: Table 'mutex_instances' already exists
160-
ERROR 1050 (42S01) at line 232: Table 'objects_summary_global_by_type' already exists
161-
ERROR 1050 (42S01) at line 242: Table 'performance_timers' already exists
162-
ERROR 1050 (42S01) at line 252: Table 'rwlock_instances' already exists
163-
ERROR 1050 (42S01) at line 261: Table 'setup_actors' already exists
164-
ERROR 1050 (42S01) at line 269: Table 'setup_consumers' already exists
165-
ERROR 1050 (42S01) at line 278: Table 'setup_instruments' already exists
166-
ERROR 1050 (42S01) at line 288: Table 'setup_objects' already exists
167-
ERROR 1050 (42S01) at line 296: Table 'setup_timers' already exists
168-
ERROR 1050 (42S01) at line 341: Table 'table_io_waits_summary_by_index_usage' already exists
169-
ERROR 1050 (42S01) at line 385: Table 'table_io_waits_summary_by_table' already exists
170-
ERROR 1050 (42S01) at line 464: Table 'table_lock_waits_summary_by_table' already exists
171-
ERROR 1050 (42S01) at line 484: Table 'threads' already exists
172-
ERROR 1644 (HY000) at line 904: Unexpected content found in the performance_schema database.
171+
ERROR 1050 (42S01) at line 221: Table 'socket_instances' already exists
172+
ERROR 1050 (42S01) at line 288: Table 'socket_summary_by_instance' already exists
173+
ERROR 1050 (42S01) at line 353: Table 'socket_summary_by_event_name' already exists
174+
ERROR 1050 (42S01) at line 362: Table 'mutex_instances' already exists
175+
ERROR 1050 (42S01) at line 376: Table 'objects_summary_global_by_type' already exists
176+
ERROR 1050 (42S01) at line 386: Table 'performance_timers' already exists
177+
ERROR 1050 (42S01) at line 396: Table 'rwlock_instances' already exists
178+
ERROR 1050 (42S01) at line 405: Table 'setup_actors' already exists
179+
ERROR 1050 (42S01) at line 413: Table 'setup_consumers' already exists
180+
ERROR 1050 (42S01) at line 422: Table 'setup_instruments' already exists
181+
ERROR 1050 (42S01) at line 432: Table 'setup_objects' already exists
182+
ERROR 1050 (42S01) at line 440: Table 'setup_timers' already exists
183+
ERROR 1050 (42S01) at line 485: Table 'table_io_waits_summary_by_index_usage' already exists
184+
ERROR 1050 (42S01) at line 529: Table 'table_io_waits_summary_by_table' already exists
185+
ERROR 1050 (42S01) at line 608: Table 'table_lock_waits_summary_by_table' already exists
186+
ERROR 1050 (42S01) at line 628: Table 'threads' already exists
187+
ERROR 1644 (HY000) at line 1048: Unexpected content found in the performance_schema database.
173188
FATAL ERROR: Upgrade failed
174189
select name from mysql.event where db='performance_schema';
175190
name

‎mysql-test/suite/perfschema/r/schema_lc2.result

+3
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ setup_consumers
2626
setup_instruments
2727
setup_objects
2828
setup_timers
29+
socket_instances
30+
socket_summary_by_event_name
31+
socket_summary_by_instance
2932
table_io_waits_summary_by_index_usage
3033
table_io_waits_summary_by_table
3134
table_lock_waits_summary_by_table

0 commit comments

Comments
 (0)