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

Merge branch 'merge-perfschema-5.6' into 10.0

Browse Source
This commit is contained in:
Sergei Golubchik
2015-10-09 18:24:17 +02:00
parent 01be663c50 1b41eed5d1
commit 2ca4141af1
5 changed files with 75 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
mysql-test/suite/perfschema/r/misc.result
View File

@ -92,3 +92,18 @@ object_schema object_name index_name count_fetch count_insert count_update count
test t_60905 i 2 0 0 1
test t_60905 NULL 5 5 0 1
DROP TABLE t_60905;
use test;
truncate performance_schema.events_statements_history;
truncate performance_schema.events_statements_history_long;
select * from t1;
ERROR 42S02: Table 'test.t1' doesn't exist
select mysql_errno, returned_sqlstate, message_text, errors, warnings
from performance_schema.events_statements_history where errors > 0;
mysql_errno returned_sqlstate message_text errors warnings
1146 42S02 Table 'test.t1' doesn't exist 1 0
select mysql_errno, returned_sqlstate, message_text, errors, warnings from
performance_schema.events_statements_history_long where errors > 0;
mysql_errno returned_sqlstate message_text errors warnings
1146 42S02 Table 'test.t1' doesn't exist 1 0

20
mysql-test/suite/perfschema/t/misc.test
View File

@ -169,3 +169,23 @@ SELECT object_schema,
DROP TABLE t_60905;
#
# Bug#11929832 - EVENTS_STATEMENTS_HISTORY HAS ERRORS=0 WHEN THERE ARE ERRORS
#
# Verify that SQL errors are properly counted.
use test;
truncate performance_schema.events_statements_history;
truncate performance_schema.events_statements_history_long;
--error ER_NO_SUCH_TABLE
select * from t1;
--echo
select mysql_errno, returned_sqlstate, message_text, errors, warnings
from performance_schema.events_statements_history where errors > 0;
--echo
select mysql_errno, returned_sqlstate, message_text, errors, warnings from
performance_schema.events_statements_history_long where errors > 0;

2
storage/perfschema/ha_perfschema.cc
View File

@ -205,7 +205,7 @@ maria_declare_plugin(perfschema)
0x0001,
pfs_status_vars,
NULL,
"5.6.26",
"5.6.27",
MariaDB_PLUGIN_MATURITY_STABLE
}
maria_declare_plugin_end;

1
storage/perfschema/pfs.cc
View File

@ -4832,6 +4832,7 @@ static void end_statement_v1(PSI_statement_locker *locker, void *stmt_da)
memcpy(pfs->m_message_text, da->message(), MYSQL_ERRMSG_SIZE);
pfs->m_message_text[MYSQL_ERRMSG_SIZE]= 0;
pfs->m_sql_errno= da->sql_errno();
pfs->m_error_count++;
memcpy(pfs->m_sqlstate, da->get_sqlstate(), SQLSTATE_LENGTH);
break;
case Diagnostics_area::DA_DISABLED:

40
storage/perfschema/pfs_timer.cc
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
/* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -124,6 +124,42 @@ void init_timers(void)
Pick best replacements.
*/
/*
For WAIT, the cycle timer is used by default. However, it is not available
on all architectures. Fall back to the nanosecond timer in this case. It is
unlikely that neither cycle nor nanosecond are available, but we continue
probing less resolution timers anyway for consistency with other events.
*/
if (cycle_to_pico != 0)
{
/* Normal case. */
wait_timer= TIMER_NAME_CYCLE;
}
else if (nanosec_to_pico != 0)
{
/* Robustness, no known cases. */
wait_timer= TIMER_NAME_NANOSEC;
}
else if (microsec_to_pico != 0)
{
/* Robustness, no known cases. */
wait_timer= TIMER_NAME_MICROSEC;
}
else if (millisec_to_pico != 0)
{
/* Robustness, no known cases. */
wait_timer= TIMER_NAME_MILLISEC;
}
else
{
/*
Will never be reached on any architecture, but must provide a default if
no other timers are available.
*/
wait_timer= TIMER_NAME_TICK;
}
/*
For STAGE and STATEMENT, a timer with a fixed frequency is better.
The prefered timer is nanosecond, or lower resolutions.
@ -174,7 +210,7 @@ void init_timers(void)
else if (millisec_to_pico != 0)
{
/* Robustness, no known cases. */
idle_timer= TIMER_NAME_MILLISEC;
wait_timer= TIMER_NAME_MILLISEC;
}
else if (tick_to_pico != 0)
{