database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

5.6.26

Browse Source
This commit is contained in:
Sergei Golubchik
2015-08-03 13:05:40 +02:00
parent 3c3724991e
commit 167c540048
115 changed files with 496 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
storage/perfschema/table_events_statements.cc
View File

@@ -306,6 +306,7 @@ void table_events_statements_common::make_row_part_1(PFS_events_statements *stat
{
const char *base;
const char *safe_source_file;
ulonglong timer_end;
m_row_exists= false;
@@ -320,7 +321,16 @@ void table_events_statements_common::make_row_part_1(PFS_events_statements *stat
m_row.m_nesting_event_id= statement->m_nesting_event_id;
m_row.m_nesting_event_type= statement->m_nesting_event_type;
m_normalizer->to_pico(statement->m_timer_start, statement->m_timer_end,
if (m_row.m_end_event_id == 0)
{
timer_end= get_timer_raw_value(statement_timer);
}
else
{
timer_end= statement->m_timer_end;
}
m_normalizer->to_pico(statement->m_timer_start, timer_end,
& m_row.m_timer_start, & m_row.m_timer_end, & m_row.m_timer_wait);
m_row.m_lock_time= statement->m_lock_time * MICROSEC_TO_PICOSEC;
@@ -340,8 +350,8 @@ void table_events_statements_common::make_row_part_1(PFS_events_statements *stat
return;
base= base_name(safe_source_file);
m_row.m_source_length= my_snprintf(m_row.m_source, sizeof(m_row.m_source),
"%s:%d", base, statement->m_source_line);
m_row.m_source_length= (uint)my_snprintf(m_row.m_source, sizeof(m_row.m_source),
"%s:%d", base, statement->m_source_line);
if (m_row.m_source_length > sizeof(m_row.m_source))
m_row.m_source_length= sizeof(m_row.m_source);
@@ -382,7 +392,7 @@ void table_events_statements_common::make_row_part_2(const sql_digest_storage *d
/*
Filling up statement digest information.
*/
uint safe_byte_count= digest->m_byte_count;
size_t safe_byte_count= digest->m_byte_count;
if (safe_byte_count > 0 &&
safe_byte_count <= pfs_max_digest_length)
{
@@ -519,7 +529,7 @@ int table_events_statements_common::read_row_values(TABLE *table,
f->set_null();
break;
case 19: /* MESSAGE_TEXT */
len= strlen(m_row.m_message_text);
len= (uint)strlen(m_row.m_message_text);
if (len)
set_field_varchar_utf8(f, m_row.m_message_text, len);
else
@@ -881,7 +891,7 @@ int table_events_statements_history_long::rnd_init(bool scan)
int table_events_statements_history_long::rnd_next(void)
{
PFS_events_statements *statement;
uint limit;
size_t limit;
if (events_statements_history_long_size == 0)
return HA_ERR_END_OF_FILE;
@@ -910,7 +920,7 @@ int table_events_statements_history_long::rnd_next(void)
int table_events_statements_history_long::rnd_pos(const void *pos)
{
PFS_events_statements *statement;
uint limit;
size_t limit;
if (events_statements_history_long_size == 0)
return HA_ERR_RECORD_DELETED;