mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-16 20:07:13 +02:00
Code Issues Projects Releases Packages Wiki Activity

Temporary commit of 10.0-merge

Browse source
This commit is contained in:
Michael Widenius 2013-03-26 00:03:13 +02:00
commit 068c61978e
649 changed files with 90817 additions and 25330 deletions
Download patch file Download diff file Expand all files Collapse all files

53
mysys/psi_noop.c
View file

@ -119,7 +119,8 @@ static void destroy_cond_noop(PSI_cond* cond NNN)
}
static PSI_socket*
init_socket_noop(PSI_socket_key key NNN, const my_socket *fd NNN)
init_socket_noop(PSI_socket_key key NNN, const my_socket *fd NNN,
const struct sockaddr *addr NNN, socklen_t addr_len NNN)
{
return NULL;
}
@ -188,12 +189,12 @@ static int spawn_thread_noop(PSI_thread_key key NNN,
static PSI_thread*
new_thread_noop(PSI_thread_key key NNN,
const void *identity NNN, ulong thread_id NNN)
const void *identity NNN, ulonglong thread_id NNN)
{
return NULL;
}
static void set_thread_id_noop(PSI_thread *thread NNN, unsigned long id NNN)
static void set_thread_id_noop(PSI_thread *thread NNN, ulonglong id NNN)
{
return;
}
@ -401,18 +402,19 @@ static void end_table_lock_wait_noop(PSI_table_locker* locker NNN)
return;
}
static PSI_file* start_file_open_wait_noop(PSI_file_locker *locker NNN,
const char *src_file NNN,
uint src_line NNN)
{
return NULL;
}
static void end_file_open_wait_noop(PSI_file_locker *locker NNN)
static void start_file_open_wait_noop(PSI_file_locker *locker NNN,
const char *src_file NNN,
uint src_line NNN)
{
return;
}
static PSI_file* end_file_open_wait_noop(PSI_file_locker *locker NNN,
void *result NNN)
{
return NULL;
}
static void end_file_open_wait_and_bind_to_descriptor_noop
(PSI_file_locker *locker NNN, File file NNN)
{
@ -433,6 +435,19 @@ static void end_file_wait_noop(PSI_file_locker *locker NNN,
return;
}
static void start_file_close_wait_noop(PSI_file_locker *locker NNN,
const char *src_file NNN,
uint src_line NNN)
{
return;
}
static void end_file_close_wait_noop(PSI_file_locker *locker NNN,
int result NNN)
{
return;
}
static void start_stage_noop(PSI_stage_key key NNN,
const char *src_file NNN, int src_line NNN)
{
@ -446,7 +461,8 @@ static void end_stage_noop(void)
static PSI_statement_locker*
get_thread_statement_locker_noop(PSI_statement_locker_state *state NNN,
PSI_statement_key key NNN)
PSI_statement_key key NNN,
const void *charset NNN)
{
return NULL;
}
@ -621,6 +637,14 @@ digest_add_token_noop(PSI_digest_locker *locker NNN,
return NULL;
}
static int
set_thread_connect_attrs_noop(const char *buffer __attribute__((unused)),
uint length __attribute__((unused)),
const void *from_cs __attribute__((unused)))
{
return 0;
}
static PSI PSI_noop=
{
register_mutex_noop,
@ -687,6 +711,8 @@ static PSI PSI_noop=
end_file_open_wait_and_bind_to_descriptor_noop,
start_file_wait_noop,
end_file_wait_noop,
start_file_close_wait_noop,
end_file_close_wait_noop,
start_stage_noop,
end_stage_noop,
get_thread_statement_locker_noop,
@ -716,7 +742,8 @@ static PSI PSI_noop=
set_socket_info_noop,
set_socket_thread_owner_noop,
digest_start_noop,
digest_add_token_noop
digest_add_token_noop,
set_thread_connect_attrs_noop
};
/**