1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge from mysql-5.5-bugteam to mysql-5.5-runtime

Browse Source 
Text conflict in mysql-test/suite/perfschema/r/dml_setup_instruments.result
Text conflict in mysql-test/suite/perfschema/r/global_read_lock.result
Text conflict in mysql-test/suite/perfschema/r/server_init.result
Text conflict in mysql-test/suite/perfschema/t/global_read_lock.test
Text conflict in mysql-test/suite/perfschema/t/server_init.test
This commit is contained in:
Jon Olav Hauglid 2010-11-12 12:23:17 +01:00
commit f11b9a88eb
244 changed files with 2466 additions and 22232 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmake/configure.pl
View File

@ -185,6 +185,11 @@ foreach my $option (@ARGV)
($option =~ /enable/ ? "1" : "0"); ($option =~ /enable/ ? "1" : "0");
next; next;
} }
if ($option =~ /with-comment=/)
{
$cmakeargs = $cmakeargs." \"-DWITH_COMMENT=".substr($option,13)."\"";
next;
}
$option = uc($option); $option = uc($option);
$option =~ s/-/_/g; $option =~ s/-/_/g;

2
cmake/install_layout.cmake
View File

@ -86,7 +86,7 @@ IF(UNIX)
SET(CMAKE_INSTALL_PREFIX ${default_prefix} SET(CMAKE_INSTALL_PREFIX ${default_prefix}
CACHE PATH "install prefix" FORCE) CACHE PATH "install prefix" FORCE)
ENDIF() ENDIF()
SET(VALID_INSTALL_LAYOUTS "RPM" "STANDALONE" "DEB" "SVR5") SET(VALID_INSTALL_LAYOUTS "RPM" "STANDALONE" "DEB" "SVR4")
LIST(FIND VALID_INSTALL_LAYOUTS "${INSTALL_LAYOUT}" ind) LIST(FIND VALID_INSTALL_LAYOUTS "${INSTALL_LAYOUT}" ind)
IF(ind EQUAL -1) IF(ind EQUAL -1)
MESSAGE(FATAL_ERROR "Invalid INSTALL_LAYOUT parameter:${INSTALL_LAYOUT}." MESSAGE(FATAL_ERROR "Invalid INSTALL_LAYOUT parameter:${INSTALL_LAYOUT}."

9
include/mysql/client_plugin.h
View File

@ -79,8 +79,7 @@ struct st_mysql_client_plugin_AUTHENTICATION
/** /**
loads a plugin and initializes it loads a plugin and initializes it
@param mysql MYSQL structure. only MYSQL_PLUGIN_DIR option value is used, @param mysql MYSQL structure.
and last_errno/last_error, for error reporting
@param name a name of the plugin to load @param name a name of the plugin to load
@param type type of plugin that should be loaded, -1 to disable type check @param type type of plugin that should be loaded, -1 to disable type check
@param argc number of arguments to pass to the plugin initialization @param argc number of arguments to pass to the plugin initialization
@ -100,8 +99,7 @@ mysql_load_plugin(struct st_mysql *mysql, const char *name, int type,
This is the same as mysql_load_plugin, but take va_list instead of This is the same as mysql_load_plugin, but take va_list instead of
a list of arguments. a list of arguments.
@param mysql MYSQL structure. only MYSQL_PLUGIN_DIR option value is used, @param mysql MYSQL structure.
and last_errno/last_error, for error reporting
@param name a name of the plugin to load @param name a name of the plugin to load
@param type type of plugin that should be loaded, -1 to disable type check @param type type of plugin that should be loaded, -1 to disable type check
@param argc number of arguments to pass to the plugin initialization @param argc number of arguments to pass to the plugin initialization
@ -118,8 +116,7 @@ mysql_load_plugin_v(struct st_mysql *mysql, const char *name, int type,
/** /**
finds an already loaded plugin by name, or loads it, if necessary finds an already loaded plugin by name, or loads it, if necessary
@param mysql MYSQL structure. only MYSQL_PLUGIN_DIR option value is used, @param mysql MYSQL structure.
and last_errno/last_error, for error reporting
@param name a name of the plugin to load @param name a name of the plugin to load
@param type type of plugin that should be loaded @param type type of plugin that should be loaded

5
mysql-test/collections/mysql-5.5-bugteam.daily Normal file
View File

@ -0,0 +1,5 @@
perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=n_mix --vardir=var-n_mix --mysqld=--binlog-format=mixed
perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=ps_row --vardir=var-ps_row --ps-protocol --mysqld=--binlog-format=row
perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=embedded --vardir=var-emebbed --embedded
perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=funcs_1 --vardir=var-funcs_1 --suite=funcs_1
perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=rpl_binlog_row --vardir=var-rpl_binlog_row --mysqld=--binlog-format=row --suite=rpl,binlog --skip-ndb

4
mysql-test/collections/mysql-5.5-bugteam.push Normal file
View File

@ -0,0 +1,4 @@
perl mysql-test-run.pl --timer --force --parallel=auto --comment=n_mix --vardir=var-n_mix --mysqld=--binlog-format=mixed --experimental=collections/default.experimental --skip-ndb --skip-test-list=collections/disabled-per-push.list
perl mysql-test-run.pl --timer --force --parallel=auto --comment=main_ps_row --vardir=var-main-ps_row --suite=main --ps-protocol --mysqld=--binlog-format=row --experimental=collections/default.experimental --skip-ndb --skip-test-list=collections/disabled-per-push.list
perl mysql-test-run.pl --timer --force --parallel=auto --comment=main_embedded --vardir=var-main_emebbed --suite=main --embedded --experimental=collections/default.experimental --skip-ndb
perl mysql-test-run.pl --timer --force --parallel=auto --comment=funcs_1 --vardir=var-funcs_1 --suite=funcs_1 --experimental=collections/default.experimental --skip-ndb

21
mysql-test/lib/mtr_cases.pm
View File

@ -177,8 +177,6 @@ sub collect_test_cases ($$$$) {
if ( $opt_reorder && !$quick_collect) if ( $opt_reorder && !$quick_collect)
{ {
# Reorder the test cases in an order that will make them faster to run # Reorder the test cases in an order that will make them faster to run
my %sort_criteria;
# Make a mapping of test name to a string that represents how that test # Make a mapping of test name to a string that represents how that test
# should be sorted among the other tests. Put the most important criterion # should be sorted among the other tests. Put the most important criterion
# first, then a sub-criterion, then sub-sub-criterion, etc. # first, then a sub-criterion, then sub-sub-criterion, etc.
@ -190,24 +188,31 @@ sub collect_test_cases ($$$$) {
# Append the criteria for sorting, in order of importance. # Append the criteria for sorting, in order of importance.
# #
push(@criteria, "ndb=" . ($tinfo->{'ndb_test'} ? "A" : "B")); push(@criteria, "ndb=" . ($tinfo->{'ndb_test'} ? "A" : "B"));
push(@criteria, $tinfo->{template_path});
# Group test with equal options together. # Group test with equal options together.
# Ending with "~" makes empty sort later than filled # Ending with "~" makes empty sort later than filled
my $opts= $tinfo->{'master_opt'} ? $tinfo->{'master_opt'} : []; my $opts= $tinfo->{'master_opt'} ? $tinfo->{'master_opt'} : [];
push(@criteria, join("!", sort @{$opts}) . "~"); push(@criteria, join("!", sort @{$opts}) . "~");
# Add slave opts if any
if ($tinfo->{'slave_opt'})
{
push(@criteria, join("!", sort @{$tinfo->{'slave_opt'}}));
}
# This sorts tests with force-restart *before* identical tests
push(@criteria, $tinfo->{force_restart} ? "force-restart" : "no-restart");
$sort_criteria{$tinfo->{name}} = join(" ", @criteria); $tinfo->{criteria}= join(" ", @criteria);
} }
@$cases = sort { @$cases = sort {$a->{criteria} cmp $b->{criteria}; } @$cases;
$sort_criteria{$a->{'name'}} . $a->{'name'} cmp
$sort_criteria{$b->{'name'}} . $b->{'name'}; } @$cases;
# For debugging the sort-order # For debugging the sort-order
# foreach my $tinfo (@$cases) # foreach my $tinfo (@$cases)
# { # {
# print("$sort_criteria{$tinfo->{'name'}} -> \t$tinfo->{'name'}\n"); # my $tname= $tinfo->{name} . ' ' . $tinfo->{combination};
# my $crit= $tinfo->{criteria};
# print("$tname\n\t$crit\n");
# } # }
} }
if (defined $print_testcases){ if (defined $print_testcases){

60
mysql-test/mysql-test-run.pl
View File

@ -704,22 +704,40 @@ sub run_test_server ($$$) {
next; next;
} }
# Prefer same configuration, or just use next if --noreorder
if (!$opt_reorder or (defined $result and
$result->{template_path} eq $t->{template_path}))
{
#mtr_report("Test uses same config => good match");
# Test uses same config => good match
$next= splice(@$tests, $i, 1);
last;
}
# Second best choice is the first that does not fulfill # Second best choice is the first that does not fulfill
# any of the above conditions # any of the above conditions
if (!defined $second_best){ if (!defined $second_best){
#mtr_report("Setting second_best to $i"); #mtr_report("Setting second_best to $i");
$second_best= $i; $second_best= $i;
} }
# Smart allocation of next test within this thread.
if ($opt_reorder and $opt_parallel > 1 and defined $result)
{
my $wid= $result->{worker};
# Reserved for other thread, try next
next if (defined $t->{reserved} and $t->{reserved} != $wid);
if (! defined $t->{reserved})
{
# Force-restart not relevant when comparing *next* test
$t->{criteria} =~ s/force-restart$/no-restart/;
my $criteria= $t->{criteria};
# Reserve similar tests for this worker, but not too many
my $maxres= (@$tests - $i) / $opt_parallel + 1;
for (my $j= $i+1; $j <= $i + $maxres; $j++)
{
my $tt= $tests->[$j];
last unless defined $tt;
last if $tt->{criteria} ne $criteria;
$tt->{reserved}= $wid;
}
}
}
# At this point we have found next suitable test
$next= splice(@$tests, $i, 1);
last;
} }
# Use second best choice if no other test has been found # Use second best choice if no other test has been found
@ -728,10 +746,12 @@ sub run_test_server ($$$) {
mtr_error("Internal error, second best too large($second_best)") mtr_error("Internal error, second best too large($second_best)")
if $second_best > $#$tests; if $second_best > $#$tests;
$next= splice(@$tests, $second_best, 1); $next= splice(@$tests, $second_best, 1);
delete $next->{reserved};
} }
if ($next) { if ($next) {
#$next->print_test(); # We don't need this any more
delete $next->{criteria};
$next->write_test($sock, 'TESTCASE'); $next->write_test($sock, 'TESTCASE');
$running{$next->key()}= $next; $running{$next->key()}= $next;
$num_ndb_tests++ if ($next->{ndb_test}); $num_ndb_tests++ if ($next->{ndb_test});
@ -816,6 +836,11 @@ sub run_worker ($) {
delete($test->{'comment'}); delete($test->{'comment'});
delete($test->{'logfile'}); delete($test->{'logfile'});
# A sanity check. Should this happen often we need to look at it.
if (defined $test->{reserved} && $test->{reserved} != $thread_num) {
my $tres= $test->{reserved};
mtr_warning("Test reserved for w$tres picked up by w$thread_num");
}
$test->{worker} = $thread_num if $opt_parallel > 1; $test->{worker} = $thread_num if $opt_parallel > 1;
run_testcase($test); run_testcase($test);
@ -894,7 +919,7 @@ sub command_line_setup {
'ssl|with-openssl' => \$opt_ssl, 'ssl|with-openssl' => \$opt_ssl,
'skip-ssl' => \$opt_skip_ssl, 'skip-ssl' => \$opt_skip_ssl,
'compress' => \$opt_compress, 'compress' => \$opt_compress,
'vs-config' => \$opt_vs_config, 'vs-config=s' => \$opt_vs_config,
# Max number of parallel threads to use # Max number of parallel threads to use
'parallel=s' => \$opt_parallel, 'parallel=s' => \$opt_parallel,
@ -4741,17 +4766,6 @@ sub server_need_restart {
} }
} }
# Temporary re-enable the "always restart slave" hack
# this should be removed asap, but will require that each rpl
# testcase cleanup better after itself - ie. stop and reset
# replication
# Use the "#!use-slave-opt" marker to detect that this is a "slave"
# server
if ( $server->option("#!use-slave-opt") ){
mtr_verbose_restart($server, "Always restart slave(s)");
return 1;
}
my $is_mysqld= grep ($server eq $_, mysqlds()); my $is_mysqld= grep ($server eq $_, mysqlds());
if ($is_mysqld) if ($is_mysqld)
{ {

14
mysql-test/r/ctype_utf8.result
View File

@ -2040,6 +2040,20 @@ predicted_order hex(utf8_encoding)
100 E0B78AE2808DE0B6BA 100 E0B78AE2808DE0B6BA
101 E0B78AE2808DE0B6BB 101 E0B78AE2808DE0B6BB
DROP TABLE t1; DROP TABLE t1;
SET NAMES utf8 COLLATE utf8_sinhala_ci;
CREATE TABLE t1 (s1 VARCHAR(10) COLLATE utf8_sinhala_ci);
INSERT INTO t1 VALUES ('a'),('ae'),('af');
SELECT s1,hex(s1) FROM t1 ORDER BY s1;
s1 hex(s1)
a 61
ae 6165
af 6166
SELECT * FROM t1 ORDER BY s1;
s1
a
ae
af
DROP TABLE t1;
End of 5.4 tests End of 5.4 tests
# #
# Start of 5.5 tests # Start of 5.5 tests

36
mysql-test/r/sp-bugs.result
View File

@ -75,4 +75,40 @@ CALL p1 ();
ERROR HY000: Trigger does not exist ERROR HY000: Trigger does not exist
DROP TABLE t1; DROP TABLE t1;
DROP PROCEDURE p1; DROP PROCEDURE p1;
#
# Bug#54375: Error in stored procedure leaves connection
# in different default schema
#
SET @@SQL_MODE = 'STRICT_ALL_TABLES';
DROP DATABASE IF EXISTS db1;
CREATE DATABASE db1;
USE db1;
DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (c1 int NOT NULL PRIMARY KEY);
INSERT INTO t1 VALUES (1);
CREATE FUNCTION f1 (
some_value int
)
RETURNS smallint
DETERMINISTIC
BEGIN
INSERT INTO t1 SET c1 = some_value;
RETURN(LAST_INSERT_ID());
END$$
DROP DATABASE IF EXISTS db2;
CREATE DATABASE db2;
USE db2;
SELECT DATABASE();
DATABASE()
db2
SELECT db1.f1(1);
ERROR 23000: Duplicate entry '1' for key 'PRIMARY'
SELECT DATABASE();
DATABASE()
db2
USE test;
DROP FUNCTION db1.f1;
DROP TABLE db1.t1;
DROP DATABASE db1;
DROP DATABASE db2;
End of 5.1 tests End of 5.1 tests

12
mysql-test/r/subselect.result
View File

@ -5005,3 +5005,15 @@ SELECT * FROM t2 UNION SELECT * FROM t2
ORDER BY (SELECT * FROM t1 WHERE MATCH(a) AGAINST ('+abc' IN BOOLEAN MODE)); ORDER BY (SELECT * FROM t1 WHERE MATCH(a) AGAINST ('+abc' IN BOOLEAN MODE));
DROP TABLE t1,t2; DROP TABLE t1,t2;
End of 5.1 tests End of 5.1 tests
#
# Bug #57704: Cleanup code dies with void TABLE::set_keyread(bool):
# Assertion `file' failed.
#
CREATE TABLE t1 (a INT);
SELECT 1 FROM
(SELECT ROW(
(SELECT 1 FROM t1 RIGHT JOIN
(SELECT 1 FROM t1, t1 t2) AS d ON 1),
1) FROM t1) AS e;
ERROR 21000: Operand should contain 1 column(s)
DROP TABLE t1;

1
mysql-test/suite/binlog/t/binlog_index-master.opt Normal file
View File

@ -0,0 +1 @@
--force-restart

1
mysql-test/suite/binlog/t/binlog_stm_binlog-master.opt
View File

@ -1 +1,2 @@
--max_binlog_size=4096 --default-storage-engine=MyISAM --max_binlog_size=4096 --default-storage-engine=MyISAM
--force-restart

1
mysql-test/suite/binlog/t/binlog_stm_do_db-master.opt
View File

@ -1 +1,2 @@
--binlog-do-db=b42829 --binlog-do-db=b42829
--force-restart

20
mysql-test/suite/ibmdb2i/include/have_i54.inc
View File

@ -1,20 +0,0 @@
# Check for IBM i 6.1 or later
--disable_query_log
system uname -rv > $MYSQLTEST_VARDIR/tmp/version;
--disable_warnings
drop table if exists uname_vr;
--enable_warnings
create temporary table uname_vr (r int, v int);
--disable_warnings
eval LOAD DATA INFILE "$MYSQLTEST_VARDIR/tmp/version" into table uname_vr fields terminated by ' ';
--enable_warnings
let $ok = `select count(*) from uname_vr where v = 5 and r = 4`;
drop table uname_vr;
remove_file $MYSQLTEST_VARDIR/tmp/version;
--enable_query_log
if (!$ok)
{
skip "Need IBM i 5.4 or later";
}

20
mysql-test/suite/ibmdb2i/include/have_i61.inc
View File

@ -1,20 +0,0 @@
# Check for IBM i 6.1 or later
--disable_query_log
system uname -rv > $MYSQLTEST_VARDIR/tmp/version;
--disable_warnings
drop table if exists uname_vr;
--enable_warnings
create temporary table uname_vr (r int, v int);
--disable_warnings
eval LOAD DATA INFILE "$MYSQLTEST_VARDIR/tmp/version" into table uname_vr fields terminated by ' ';
--enable_warnings
let $ok = `select count(*) from uname_vr where v > 5`;
drop table uname_vr;
remove_file $MYSQLTEST_VARDIR/tmp/version;
--enable_query_log
if (!$ok)
{
skip "Need IBM i 6.1 or later";
}

6
mysql-test/suite/ibmdb2i/include/have_ibmdb2i.inc
View File

@ -1,6 +0,0 @@
if (!`SELECT count(*) FROM information_schema.engines WHERE
(support = 'YES' OR support = 'DEFAULT') AND
engine = 'ibmdb2i'`)
{
skip Need ibmdb2i engine;
}

11
mysql-test/suite/ibmdb2i/r/ibmdb2i_bug_44020.result
View File

@ -1,11 +0,0 @@
create schema `A12345_@$#`;
create table `A12345_@$#`.t1 (i int) engine=ibmdb2i;
show create table `A12345_@$#`.t1;
Table Create Table
t1 CREATE TABLE `t1` (
`i` int(11) DEFAULT NULL
) ENGINE=IBMDB2I DEFAULT CHARSET=latin1
select * from `A12345_@$#`.t1;
i
drop table `A12345_@$#`.t1;
drop schema `A12345_@$#`;

4
mysql-test/suite/ibmdb2i/r/ibmdb2i_bug_44025.result
View File

@ -1,4 +0,0 @@
create table t1 (c char(10) collate utf8_swedish_ci, index(c)) engine=ibmdb2i;
drop table t1;
create table t1 (c char(10) collate ucs2_swedish_ci, index(c)) engine=ibmdb2i;
drop table t1;

4
mysql-test/suite/ibmdb2i/r/ibmdb2i_bug_44232.result
View File

@ -1,4 +0,0 @@
create table t1 (c char(1) character set armscii8) engine=ibmdb2i;
ERROR HY000: Can't create table 'test.t1' (errno: 2504)
create table t1 (c char(1) character set eucjpms ) engine=ibmdb2i;
ERROR HY000: Can't create table 'test.t1' (errno: 2504)

18
mysql-test/suite/ibmdb2i/r/ibmdb2i_bug_44610.result
View File

@ -1,18 +0,0 @@
create table ABC (i int) engine=ibmdb2i;
drop table ABC;
create table `1234567890ABC` (i int) engine=ibmdb2i;
drop table `1234567890ABC`;
create table `!@#$%` (i int) engine=ibmdb2i;
drop table `!@#$%`;
create table `ABCD#########` (i int) engine=ibmdb2i;
drop table `ABCD#########`;
create table `_` (i int) engine=ibmdb2i;
drop table `_`;
create table `abc##def` (i int) engine=ibmdb2i;
drop table `abc##def`;
set names utf8;
create table İ (s1 int) engine=ibmdb2i;
drop table İ;
create table İİ (s1 int) engine=ibmdb2i;
drop table İİ;
set names latin1;

33
mysql-test/suite/ibmdb2i/r/ibmdb2i_bug_45196.result
View File

@ -1,33 +0,0 @@
drop table if exists t1;
create table t1 (c char(10), index(c)) collate ucs2_czech_ci engine=ibmdb2i;
insert into t1 values ("ch"),("h"),("i");
select * from t1 order by c;
c
h
ch
i
drop table t1;
create table t1 (c char(10), index(c)) collate utf8_czech_ci engine=ibmdb2i;
insert into t1 values ("ch"),("h"),("i");
select * from t1 order by c;
c
h
ch
i
drop table t1;
create table t1 (c char(10), index(c)) collate ucs2_danish_ci engine=ibmdb2i;
insert into t1 values("abc"),("abcd"),("aaaa");
select c from t1 order by c;
c
abc
abcd
aaaa
drop table t1;
create table t1 (c char(10), index(c)) collate utf8_danish_ci engine=ibmdb2i;
insert into t1 values("abc"),("abcd"),("aaaa");
select c from t1 order by c;
c
abc
abcd
aaaa
drop table t1;

7
mysql-test/suite/ibmdb2i/r/ibmdb2i_bug_45793.result
View File

@ -1,7 +0,0 @@
drop table if exists t1;
create table t1 (c char(10), index(c)) charset macce engine=ibmdb2i;
insert into t1 values ("test");
select * from t1 order by c;
c
test
drop table t1;

20
mysql-test/suite/ibmdb2i/r/ibmdb2i_bug_45983.result
View File

@ -1,20 +0,0 @@
set ibmdb2i_create_index_option=1;
drop schema if exists test1;
create schema test1;
use test1;
CREATE TABLE t1 (f int primary key, index(f)) engine=ibmdb2i;
drop table t1;
CREATE TABLE t1 (f char(10) collate utf8_bin primary key, index(f)) engine=ibmdb2i;
drop table t1;
CREATE TABLE t1 (f char(10) collate latin1_swedish_ci primary key, index(f)) engine=ibmdb2i;
drop table t1;
CREATE TABLE t1 (f char(10) collate latin1_swedish_ci primary key, i int, index i(i,f)) engine=ibmdb2i;
drop table t1;
create table fd (SQSSEQ CHAR(10)) engine=ibmdb2i;
select * from fd;
SQSSEQ
*HEX
*HEX
*HEX
*HEX
drop table fd;

9
mysql-test/suite/ibmdb2i/r/ibmdb2i_bug_49329.result
View File

@ -1,9 +0,0 @@
create table ABC (i int) engine=ibmdb2i;
insert into ABC values(1);
create table abc (i int) engine=ibmdb2i;
insert into abc values (2);
select * from ABC;
i
1
drop table ABC;
drop table abc;

1204
mysql-test/suite/ibmdb2i/r/ibmdb2i_collations.result
View File

File diff suppressed because it is too large Load Diff

9
mysql-test/suite/ibmdb2i/t/ibmdb2i_bug_44020.test
View File

@ -1,9 +0,0 @@
source suite/ibmdb2i/include/have_ibmdb2i.inc;
source include/have_case_sensitive_file_system.inc;
create schema `A12345_@$#`;
create table `A12345_@$#`.t1 (i int) engine=ibmdb2i;
show create table `A12345_@$#`.t1;
select * from `A12345_@$#`.t1;
drop table `A12345_@$#`.t1;
drop schema `A12345_@$#`;

9
mysql-test/suite/ibmdb2i/t/ibmdb2i_bug_44025.test
View File

@ -1,9 +0,0 @@
source suite/ibmdb2i/include/have_ibmdb2i.inc;
source suite/ibmdb2i/include/have_i61.inc;
create table t1 (c char(10) collate utf8_swedish_ci, index(c)) engine=ibmdb2i;
drop table t1;
create table t1 (c char(10) collate ucs2_swedish_ci, index(c)) engine=ibmdb2i;
drop table t1;

8
mysql-test/suite/ibmdb2i/t/ibmdb2i_bug_44232.test
View File

@ -1,8 +0,0 @@
--source suite/ibmdb2i/include/have_ibmdb2i.inc
--source suite/ibmdb2i/include/have_i54.inc
--error 1005
create table t1 (c char(1) character set armscii8) engine=ibmdb2i;
--error 1005
create table t1 (c char(1) character set eucjpms ) engine=ibmdb2i;

28
mysql-test/suite/ibmdb2i/t/ibmdb2i_bug_44610.test
View File

@ -1,28 +0,0 @@
source suite/ibmdb2i/include/have_ibmdb2i.inc;
# Test RCDFMT generation for a variety of kinds of table names
create table ABC (i int) engine=ibmdb2i;
drop table ABC;
create table `1234567890ABC` (i int) engine=ibmdb2i;
drop table `1234567890ABC`;
create table `!@#$%` (i int) engine=ibmdb2i;
drop table `!@#$%`;
create table `ABCD#########` (i int) engine=ibmdb2i;
drop table `ABCD#########`;
create table `_` (i int) engine=ibmdb2i;
drop table `_`;
create table `abc##def` (i int) engine=ibmdb2i;
drop table `abc##def`;
set names utf8;
create table İ (s1 int) engine=ibmdb2i;
drop table İ;
create table İİ (s1 int) engine=ibmdb2i;
drop table İİ;
set names latin1;

26
mysql-test/suite/ibmdb2i/t/ibmdb2i_bug_45196.test
View File

@ -1,26 +0,0 @@
source suite/ibmdb2i/include/have_ibmdb2i.inc;
source suite/ibmdb2i/include/have_i61.inc;
--disable_warnings
drop table if exists t1;
--enable_warnings
create table t1 (c char(10), index(c)) collate ucs2_czech_ci engine=ibmdb2i;
insert into t1 values ("ch"),("h"),("i");
select * from t1 order by c;
drop table t1;
create table t1 (c char(10), index(c)) collate utf8_czech_ci engine=ibmdb2i;
insert into t1 values ("ch"),("h"),("i");
select * from t1 order by c;
drop table t1;
create table t1 (c char(10), index(c)) collate ucs2_danish_ci engine=ibmdb2i;
insert into t1 values("abc"),("abcd"),("aaaa");
select c from t1 order by c;
drop table t1;
create table t1 (c char(10), index(c)) collate utf8_danish_ci engine=ibmdb2i;
insert into t1 values("abc"),("abcd"),("aaaa");
select c from t1 order by c;
drop table t1;

11
mysql-test/suite/ibmdb2i/t/ibmdb2i_bug_45793.test
View File

@ -1,11 +0,0 @@
source suite/ibmdb2i/include/have_ibmdb2i.inc;
source suite/ibmdb2i/include/have_i61.inc;
--disable_warnings
drop table if exists t1;
--enable_warnings
create table t1 (c char(10), index(c)) charset macce engine=ibmdb2i;
insert into t1 values ("test");
select * from t1 order by c;
drop table t1;

47
mysql-test/suite/ibmdb2i/t/ibmdb2i_bug_45983.test
View File

@ -1,47 +0,0 @@
source suite/ibmdb2i/include/have_ibmdb2i.inc;
# Confirm that ibmdb2i_create_index_option causes additional *HEX sorted indexes to be created for all non-binary keys.
set ibmdb2i_create_index_option=1;
--disable_warnings
drop schema if exists test1;
create schema test1;
use test1;
--enable_warnings
--disable_abort_on_error
--error 0,255
exec system "DLTF QGPL/FDOUT" > /dev/null;
--enable_abort_on_error
#No additional index because no string fields in key
CREATE TABLE t1 (f int primary key, index(f)) engine=ibmdb2i;
--error 255
exec system "DSPFD FILE(\"test1\"/PRIM0001) TYPE(*SEQ) OUTPUT(*OUTFILE) OUTFILE(QGPL/FDOUT) OUTMBR(*FIRST *ADD)" > /dev/null;
--error 255
exec system "DSPFD FILE(\"test1\"/\"f___H_t1\") TYPE(*SEQ) OUTPUT(*OUTFILE) OUTFILE(QGPL/FDOUT) OUTMBR(*FIRST *ADD)" > /dev/null;
drop table t1;
#No additional index because binary sorting
CREATE TABLE t1 (f char(10) collate utf8_bin primary key, index(f)) engine=ibmdb2i;
--error 255
exec system "DSPFD FILE(\"test1\"/PRIM0001) TYPE(*SEQ) OUTPUT(*OUTFILE) OUTFILE(QGPL/FDOUT) OUTMBR(*FIRST *ADD)" > /dev/null;
--error 255
exec system "DSPFD FILE(\"test1\"/\"f___H_t1\") TYPE(*SEQ) OUTPUT(*OUTFILE) OUTFILE(QGPL/FDOUT) OUTMBR(*FIRST *ADD)" > /dev/null;
drop table t1;
CREATE TABLE t1 (f char(10) collate latin1_swedish_ci primary key, index(f)) engine=ibmdb2i;
exec system "DSPFD FILE(\"test1\"/PRIM0001) TYPE(*SEQ) OUTPUT(*OUTFILE) OUTFILE(QGPL/FDOUT) OUTMBR(*FIRST *ADD)" > /dev/null;
exec system "DSPFD FILE(\"test1\"/\"f___H_t1\") TYPE(*SEQ) OUTPUT(*OUTFILE) OUTFILE(QGPL/FDOUT) OUTMBR(*FIRST *ADD)" > /dev/null;
drop table t1;
CREATE TABLE t1 (f char(10) collate latin1_swedish_ci primary key, i int, index i(i,f)) engine=ibmdb2i;
exec system "DSPFD FILE(\"test1\"/PRIM0001) TYPE(*SEQ) OUTPUT(*OUTFILE) OUTFILE(QGPL/FDOUT) OUTMBR(*FIRST *ADD)" > /dev/null;
exec system "DSPFD FILE(\"test1\"/\"i___H_t1\") TYPE(*SEQ) OUTPUT(*OUTFILE) OUTFILE(QGPL/FDOUT) OUTMBR(*FIRST *ADD)" > /dev/null;
drop table t1;
create table fd (SQSSEQ CHAR(10)) engine=ibmdb2i;
system system "CPYF FROMFILE(QGPL/FDOUT) TOFILE(\"test1\"/\"fd\") mbropt(*replace) fmtopt(*drop *map)" > /dev/null;
select * from fd;
drop table fd;

10
mysql-test/suite/ibmdb2i/t/ibmdb2i_bug_49329.test
View File

@ -1,10 +0,0 @@
source suite/ibmdb2i/include/have_ibmdb2i.inc;
source include/have_case_sensitive_file_system.inc;
create table ABC (i int) engine=ibmdb2i;
insert into ABC values(1);
create table abc (i int) engine=ibmdb2i;
insert into abc values (2);
select * from ABC;
drop table ABC;
drop table abc;

44
mysql-test/suite/ibmdb2i/t/ibmdb2i_collations.test
View File

@ -1,44 +0,0 @@
source suite/ibmdb2i/include/have_ibmdb2i.inc;
source suite/ibmdb2i/include/have_i61.inc;
--disable_warnings
drop table if exists t1, ffd, fd;
--enable_warnings
--disable_abort_on_error
--error 0,255
exec system "DLTF QGPL/FFDOUT" > /dev/null;
--error 0,255
exec system "DLTF QGPL/FDOUT" > /dev/null;
--enable_abort_on_error
let $count= query_get_value(select count(*) from information_schema.COLLATIONS where COLLATION_NAME <> "binary", count(*),1);
while ($count)
{
let $collation = query_get_value(select COLLATION_NAME from information_schema.COLLATIONS where COLLATION_NAME <> "binary" order by COLLATION_NAME desc, COLLATION_NAME, $count);
error 0,1005,2504,2028;
eval CREATE TABLE t1 ($collation integer, c char(10), v varchar(20), index(c), index(v)) collate $collation engine=ibmdb2i;
if (!$mysql_errno)
{
insert into t1 (c,v) values ("abc","def"),("abcd", "def"),("abcde","defg"),("aaaa","bbbb");
insert into t1 select * from t1;
explain select c,v from t1 force index(c) where c like "ab%";
explain select c,v from t1 force index(v) where v like "de%";
drop table t1;
eval create table t1 ($collation char(10) primary key) collate $collation engine=ibmdb2i;
system system "DSPFFD FILE(\"test\"/\"t1\") OUTPUT(*OUTFILE) OUTFILE(QGPL/FFDOUT) OUTMBR(*FIRST *ADD)" > /dev/null;
system system "DSPFD FILE(\"test\"/\"t1\") TYPE(*SEQ) OUTPUT(*OUTFILE) OUTFILE(QGPL/FDOUT) OUTMBR(*FIRST *ADD)" > /dev/null;
drop table t1;
}
dec $count;
}
create table ffd (WHCHD1 CHAR(20), WHCSID decimal(5,0)) engine=ibmdb2i;
system system "CPYF FROMFILE(QGPL/FFDOUT) TOFILE(\"test\"/\"ffd\") mbropt(*replace) fmtopt(*drop *map)" > /dev/null;
create table fd (SQSSEQ CHAR(10)) engine=ibmdb2i;
system system "CPYF FROMFILE(QGPL/FDOUT) TOFILE(\"test\"/\"fd\") mbropt(*replace) fmtopt(*drop *map)" > /dev/null;
create temporary table intermed (row integer key auto_increment, cs char(30), ccsid integer);
insert into intermed (cs, ccsid) select * from ffd;
create temporary table intermed2 (row integer key auto_increment, srtseq char(10));
insert into intermed2 (srtseq) select * from fd;
select ccsid, cs, srtseq from intermed inner join intermed2 on intermed.row = intermed2.row;
drop table ffd, fd;

12
mysql-test/suite/perfschema/include/binlog_common.inc
View File

@ -17,12 +17,12 @@
RESET MASTER; RESET MASTER;
select count(*) > 0 from performance_schema.SETUP_INSTRUMENTS; select count(*) > 0 from performance_schema.setup_instruments;
update performance_schema.SETUP_INSTRUMENTS set enabled='NO' update performance_schema.setup_instruments set enabled='NO'
where name like "wait/synch/rwlock/%"; where name like "wait/synch/rwlock/%";
select count(*) > 0 from performance_schema.EVENTS_WAITS_CURRENT; select count(*) > 0 from performance_schema.events_waits_current;
--disable_warnings --disable_warnings
drop table if exists test.t1; drop table if exists test.t1;
@ -33,16 +33,16 @@ create table test.t1 (thread_id integer);
create table test.t2 (name varchar(128)); create table test.t2 (name varchar(128));
insert into test.t1 insert into test.t1
select thread_id from performance_schema.EVENTS_WAITS_CURRENT; select thread_id from performance_schema.events_waits_current;
insert into test.t2 insert into test.t2
select name from performance_schema.SETUP_INSTRUMENTS select name from performance_schema.setup_instruments
where name like "wait/synch/rwlock/%"; where name like "wait/synch/rwlock/%";
drop table test.t1; drop table test.t1;
drop table test.t2; drop table test.t2;
update performance_schema.SETUP_INSTRUMENTS set enabled='YES' update performance_schema.setup_instruments set enabled='YES'
where name like "wait/synch/rwlock/%"; where name like "wait/synch/rwlock/%";
--source include/show_binlog_events.inc --source include/show_binlog_events.inc

2
mysql-test/suite/perfschema/include/cleanup_helper.inc
View File

@ -15,7 +15,7 @@
# Tests for PERFORMANCE_SCHEMA # Tests for PERFORMANCE_SCHEMA
update performance_schema.SETUP_INSTRUMENTS set enabled='YES'; update performance_schema.setup_instruments set enabled='YES';
disconnect con1; disconnect con1;
disconnect con2; disconnect con2;

97
mysql-test/suite/perfschema/include/privilege.inc
View File

@ -32,48 +32,48 @@ drop table if exists test.t1;
## drop table performance_schema.t1; ## drop table performance_schema.t1;
## ##
## --error ER_DBACCESS_DENIED_ERROR ## --error ER_DBACCESS_DENIED_ERROR
## create table performance_schema.SETUP_INSTRUMENTS(a int); ## create table performance_schema.setup_instruments(a int);
## ##
## --error ER_DBACCESS_DENIED_ERROR ## --error ER_DBACCESS_DENIED_ERROR
## create table performance_schema.EVENTS_WAITS_CURRENT(a int); ## create table performance_schema.events_waits_current(a int);
## ##
## --error ER_DBACCESS_DENIED_ERROR ## --error ER_DBACCESS_DENIED_ERROR
## create table performance_schema.FILE_INSTANCES(a int); ## create table performance_schema.file_instances(a int);
## ##
## --error ER_DBACCESS_DENIED_ERROR ## --error ER_DBACCESS_DENIED_ERROR
## drop table performance_schema.SETUP_INSTRUMENTS; ## drop table performance_schema.setup_instruments;
## ##
## --error ER_DBACCESS_DENIED_ERROR ## --error ER_DBACCESS_DENIED_ERROR
## drop table performance_schema.EVENTS_WAITS_CURRENT; ## drop table performance_schema.events_waits_current;
## ##
## --error ER_DBACCESS_DENIED_ERROR ## --error ER_DBACCESS_DENIED_ERROR
## drop table performance_schema.FILE_INSTANCES; ## drop table performance_schema.file_instances;
--error ER_DBACCESS_DENIED_ERROR --error ER_DBACCESS_DENIED_ERROR
rename table performance_schema.SETUP_INSTRUMENTS to test.t1; rename table performance_schema.setup_instruments to test.t1;
--error ER_DBACCESS_DENIED_ERROR --error ER_DBACCESS_DENIED_ERROR
rename table performance_schema.EVENTS_WAITS_CURRENT to test.t1; rename table performance_schema.events_waits_current to test.t1;
--error ER_DBACCESS_DENIED_ERROR --error ER_DBACCESS_DENIED_ERROR
rename table performance_schema.FILE_INSTANCES to test.t1; rename table performance_schema.file_instances to test.t1;
--error ER_DBACCESS_DENIED_ERROR --error ER_DBACCESS_DENIED_ERROR
rename table performance_schema.SETUP_INSTRUMENTS to performance_schema.t1; rename table performance_schema.setup_instruments to performance_schema.t1;
--error ER_DBACCESS_DENIED_ERROR --error ER_DBACCESS_DENIED_ERROR
rename table performance_schema.EVENTS_WAITS_CURRENT to performance_schema.t1; rename table performance_schema.events_waits_current to performance_schema.t1;
--error ER_DBACCESS_DENIED_ERROR --error ER_DBACCESS_DENIED_ERROR
rename table performance_schema.FILE_INSTANCES to performance_schema.t1; rename table performance_schema.file_instances to performance_schema.t1;
--error ER_DBACCESS_DENIED_ERROR --error ER_DBACCESS_DENIED_ERROR
rename table performance_schema.SETUP_INSTRUMENTS rename table performance_schema.setup_instruments
to performance_schema.EVENTS_WAITS_CURRENT; to performance_schema.events_waits_current;
--error ER_DBACCESS_DENIED_ERROR --error ER_DBACCESS_DENIED_ERROR
rename table performance_schema.EVENTS_WAITS_CURRENT rename table performance_schema.events_waits_current
to performance_schema.SETUP_INSTRUMENTS; to performance_schema.setup_instruments;
--error ER_DBACCESS_DENIED_ERROR --error ER_DBACCESS_DENIED_ERROR
create procedure performance_schema.my_proc() begin end; create procedure performance_schema.my_proc() begin end;
@ -87,108 +87,93 @@ do begin end;
--error ER_DBACCESS_DENIED_ERROR --error ER_DBACCESS_DENIED_ERROR
create trigger performance_schema.bi_setup_instruments create trigger performance_schema.bi_setup_instruments
before insert on performance_schema.SETUP_INSTRUMENTS before insert on performance_schema.setup_instruments
for each row begin end; for each row begin end;
--error ER_DBACCESS_DENIED_ERROR --error ER_DBACCESS_DENIED_ERROR
create trigger performance_schema.bi_events_waits_current create trigger performance_schema.bi_events_waits_current
before insert on performance_schema.EVENTS_WAITS_CURRENT before insert on performance_schema.events_waits_current
for each row begin end; for each row begin end;
--error ER_DBACCESS_DENIED_ERROR --error ER_DBACCESS_DENIED_ERROR
create trigger performance_schema.bi_file_instances create trigger performance_schema.bi_file_instances
before insert on performance_schema.FILE_INSTANCES before insert on performance_schema.file_instances
for each row begin end; for each row begin end;
--error ER_WRONG_PERFSCHEMA_USAGE --error ER_WRONG_PERFSCHEMA_USAGE
create table test.t1(a int) engine=PERFORMANCE_SCHEMA; create table test.t1(a int) engine=PERFORMANCE_SCHEMA;
--error ER_WRONG_PERFSCHEMA_USAGE --error ER_WRONG_PERFSCHEMA_USAGE
create table test.t1 like performance_schema.SETUP_INSTRUMENTS; create table test.t1 like performance_schema.setup_instruments;
--error ER_WRONG_PERFSCHEMA_USAGE --error ER_WRONG_PERFSCHEMA_USAGE
create table test.t1 like performance_schema.EVENTS_WAITS_CURRENT; create table test.t1 like performance_schema.events_waits_current;
--error ER_WRONG_PERFSCHEMA_USAGE --error ER_WRONG_PERFSCHEMA_USAGE
create table test.t1 like performance_schema.FILE_INSTANCES; create table test.t1 like performance_schema.file_instances;
--replace_result '\'setup_instruments' '\'SETUP_INSTRUMENTS'
--error ER_TABLEACCESS_DENIED_ERROR --error ER_TABLEACCESS_DENIED_ERROR
insert into performance_schema.SETUP_INSTRUMENTS insert into performance_schema.setup_instruments
set name="foo"; set name="foo";
--replace_result '\'events_waits_current' '\'EVENTS_WAITS_CURRENT'
--error ER_TABLEACCESS_DENIED_ERROR --error ER_TABLEACCESS_DENIED_ERROR
insert into performance_schema.EVENTS_WAITS_CURRENT insert into performance_schema.events_waits_current
set name="foo"; set name="foo";
--replace_result '\'file_instances' '\'FILE_INSTANCES'
--error ER_TABLEACCESS_DENIED_ERROR --error ER_TABLEACCESS_DENIED_ERROR
insert into performance_schema.FILE_INSTANCES insert into performance_schema.file_instances
set name="foo"; set name="foo";
--replace_result '\'setup_instruments' '\'SETUP_INSTRUMENTS'
--error ER_TABLEACCESS_DENIED_ERROR --error ER_TABLEACCESS_DENIED_ERROR
delete from performance_schema.SETUP_INSTRUMENTS; delete from performance_schema.setup_instruments;
--replace_result '\'events_waits_current' '\'EVENTS_WAITS_CURRENT'
--error ER_TABLEACCESS_DENIED_ERROR --error ER_TABLEACCESS_DENIED_ERROR
delete from performance_schema.EVENTS_WAITS_CURRENT; delete from performance_schema.events_waits_current;
--replace_result '\'file_instances' '\'FILE_INSTANCES'
--error ER_TABLEACCESS_DENIED_ERROR --error ER_TABLEACCESS_DENIED_ERROR
delete from performance_schema.FILE_INSTANCES; delete from performance_schema.file_instances;
lock table performance_schema.SETUP_INSTRUMENTS read; lock table performance_schema.setup_instruments read;
unlock tables; unlock tables;
lock table performance_schema.SETUP_INSTRUMENTS write; lock table performance_schema.setup_instruments write;
unlock tables; unlock tables;
--replace_result '\'events_waits_current' '\'EVENTS_WAITS_CURRENT'
--error ER_TABLEACCESS_DENIED_ERROR --error ER_TABLEACCESS_DENIED_ERROR
lock table performance_schema.EVENTS_WAITS_CURRENT read; lock table performance_schema.events_waits_current read;
unlock tables; unlock tables;
--replace_result '\'events_waits_current' '\'EVENTS_WAITS_CURRENT'
--error ER_TABLEACCESS_DENIED_ERROR --error ER_TABLEACCESS_DENIED_ERROR
lock table performance_schema.EVENTS_WAITS_CURRENT write; lock table performance_schema.events_waits_current write;
unlock tables; unlock tables;
--replace_result '\'file_instances' '\'FILE_INSTANCES'
--error ER_TABLEACCESS_DENIED_ERROR --error ER_TABLEACCESS_DENIED_ERROR
lock table performance_schema.FILE_INSTANCES read; lock table performance_schema.file_instances read;
unlock tables; unlock tables;
--replace_result '\'file_instances' '\'FILE_INSTANCES'
--error ER_TABLEACCESS_DENIED_ERROR --error ER_TABLEACCESS_DENIED_ERROR
lock table performance_schema.FILE_INSTANCES write; lock table performance_schema.file_instances write;
unlock tables; unlock tables;
--echo # --echo #
--echo # WL#4818, NFS2: Can use grants to give normal user access --echo # WL#4818, NFS2: Can use grants to give normal user access
--echo # to view data from _CURRENT and _HISTORY tables --echo # to view data from _current and _history tables
--echo # --echo #
--echo # Should work as pfs_user_1 and pfs_user_2, but not as pfs_user_3. --echo # Should work as pfs_user_1 and pfs_user_2, but not as pfs_user_3.
--echo # (Except for EVENTS_WAITS_CURRENT, which is granted.) --echo # (Except for events_waits_current, which is granted.)
# Errors here will be caught by the diff afterwards # Errors here will be caught by the diff afterwards
--disable_abort_on_error --disable_abort_on_error
--replace_result '\'events_waits_history' '\'EVENTS_WAITS_HISTORY' SELECT "can select" FROM performance_schema.events_waits_history LIMIT 1;
SELECT "can select" FROM performance_schema.EVENTS_WAITS_HISTORY LIMIT 1;
--replace_result '\'events_waits_history_long' '\'EVENTS_WAITS_HISTORY_LONG' SELECT "can select" FROM performance_schema.events_waits_history_long LIMIT 1;
SELECT "can select" FROM performance_schema.EVENTS_WAITS_HISTORY_LONG LIMIT 1;
--replace_result '\'events_waits_current' '\'EVENTS_WAITS_CURRENT' SELECT "can select" FROM performance_schema.events_waits_current LIMIT 1;
SELECT "can select" FROM performance_schema.EVENTS_WAITS_CURRENT LIMIT 1;
--replace_result '\'events_waits_summary_by_instance' '\'EVENTS_WAITS_SUMMARY_BY_INSTANCE' SELECT "can select" FROM performance_schema.events_waits_summary_by_instance LIMIT 1;
SELECT "can select" FROM performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE LIMIT 1;
--replace_result '\'file_summary_by_instance' '\'FILE_SUMMARY_BY_INSTANCE' SELECT "can select" FROM performance_schema.file_summary_by_instance LIMIT 1;
SELECT "can select" FROM performance_schema.FILE_SUMMARY_BY_INSTANCE LIMIT 1;
--enable_abort_on_error --enable_abort_on_error

14
mysql-test/suite/perfschema/include/setup_helper.inc
View File

@ -19,23 +19,23 @@ let $MYSQLD_DATADIR= `select @@datadir`;
let $MYSQLD_TMPDIR= `select @@tmpdir`; let $MYSQLD_TMPDIR= `select @@tmpdir`;
--disable_query_log --disable_query_log
update performance_schema.SETUP_INSTRUMENTS set enabled='NO'; update performance_schema.setup_instruments set enabled='NO';
update performance_schema.SETUP_CONSUMERS set enabled='YES'; update performance_schema.setup_consumers set enabled='YES';
--enable_query_log --enable_query_log
connect (con1, localhost, root, , ); connect (con1, localhost, root, , );
let $con1_THREAD_ID=`select thread_id from performance_schema.THREADS let $con1_THREAD_ID=`select thread_id from performance_schema.threads
where PROCESSLIST_ID = connection_id()`; where PROCESSLIST_ID = connection_id()`;
connect (con2, localhost, root, , ); connect (con2, localhost, root, , );
let $con2_THREAD_ID=`select thread_id from performance_schema.THREADS let $con2_THREAD_ID=`select thread_id from performance_schema.threads
where PROCESSLIST_ID = connection_id()`; where PROCESSLIST_ID = connection_id()`;
connect (con3, localhost, root, , ); connect (con3, localhost, root, , );
let $con3_THREAD_ID=`select thread_id from performance_schema.THREADS let $con3_THREAD_ID=`select thread_id from performance_schema.threads
where PROCESSLIST_ID = connection_id()`; where PROCESSLIST_ID = connection_id()`;
connection default; connection default;
@ -45,10 +45,10 @@ prepare stmt_dump_events from
"select event_name, "select event_name,
left(source, locate(\":\", source)) as short_source, left(source, locate(\":\", source)) as short_source,
operation, number_of_bytes operation, number_of_bytes
from performance_schema.EVENTS_WAITS_HISTORY_LONG from performance_schema.events_waits_history_long
where thread_id=? order by event_id;"; where thread_id=? order by event_id;";
prepare stmt_dump_thread from prepare stmt_dump_thread from
"select name from performance_schema.THREADS where thread_id=? ;"; "select name from performance_schema.threads where thread_id=? ;";
--enable_query_log --enable_query_log

42
mysql-test/suite/perfschema/include/start_server_common.inc
View File

@ -17,31 +17,31 @@
show databases; show databases;
select count(*) from performance_schema.PERFORMANCE_TIMERS; select count(*) from performance_schema.performance_timers;
select count(*) from performance_schema.SETUP_CONSUMERS; select count(*) from performance_schema.setup_consumers;
select count(*) > 0 from performance_schema.SETUP_INSTRUMENTS; select count(*) > 0 from performance_schema.setup_instruments;
select count(*) from performance_schema.SETUP_TIMERS; select count(*) from performance_schema.setup_timers;
# Make sure we don't crash, no matter what the starting parameters are # Make sure we don't crash, no matter what the starting parameters are
--disable_result_log --disable_result_log
select * from performance_schema.COND_INSTANCES; select * from performance_schema.cond_instances;
select * from performance_schema.EVENTS_WAITS_CURRENT; select * from performance_schema.events_waits_current;
select * from performance_schema.EVENTS_WAITS_HISTORY; select * from performance_schema.events_waits_history;
select * from performance_schema.EVENTS_WAITS_HISTORY_LONG; select * from performance_schema.events_waits_history_long;
select * from performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE; select * from performance_schema.events_waits_summary_by_instance;
select * from performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME; select * from performance_schema.events_waits_summary_by_thread_by_event_name;
select * from performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME; select * from performance_schema.events_waits_summary_global_by_event_name;
select * from performance_schema.FILE_INSTANCES; select * from performance_schema.file_instances;
select * from performance_schema.FILE_SUMMARY_BY_EVENT_NAME; select * from performance_schema.file_summary_by_event_name;
select * from performance_schema.FILE_SUMMARY_BY_INSTANCE; select * from performance_schema.file_summary_by_instance;
select * from performance_schema.MUTEX_INSTANCES; select * from performance_schema.mutex_instances;
select * from performance_schema.PERFORMANCE_TIMERS; select * from performance_schema.performance_timers;
select * from performance_schema.RWLOCK_INSTANCES; select * from performance_schema.rwlock_instances;
select * from performance_schema.SETUP_CONSUMERS; select * from performance_schema.setup_consumers;
select * from performance_schema.SETUP_INSTRUMENTS; select * from performance_schema.setup_instruments;
select * from performance_schema.SETUP_TIMERS; select * from performance_schema.setup_timers;
select * from performance_schema.THREADS; select * from performance_schema.threads;
--enable_result_log --enable_result_log
# This has a stable output, printing the result: # This has a stable output, printing the result:

66
mysql-test/suite/perfschema/r/aggregate.result
View File

@ -1,87 +1,87 @@
"General cleanup" "General cleanup"
drop table if exists t1; drop table if exists t1;
update performance_schema.SETUP_INSTRUMENTS set enabled = 'NO'; update performance_schema.setup_instruments set enabled = 'NO';
update performance_schema.SETUP_CONSUMERS set enabled = 'NO'; update performance_schema.setup_consumers set enabled = 'NO';
truncate table performance_schema.FILE_SUMMARY_BY_EVENT_NAME; truncate table performance_schema.file_summary_by_event_name;
truncate table performance_schema.FILE_SUMMARY_BY_INSTANCE; truncate table performance_schema.file_summary_by_instance;
truncate table performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME; truncate table performance_schema.events_waits_summary_global_by_event_name;
truncate table performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE; truncate table performance_schema.events_waits_summary_by_instance;
truncate table performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME; truncate table performance_schema.events_waits_summary_by_thread_by_event_name;
update performance_schema.SETUP_CONSUMERS set enabled = 'YES'; update performance_schema.setup_consumers set enabled = 'YES';
update performance_schema.SETUP_INSTRUMENTS update performance_schema.setup_instruments
set enabled = 'YES', timed = 'YES'; set enabled = 'YES', timed = 'YES';
create table t1 ( create table t1 (
id INT PRIMARY KEY, id INT PRIMARY KEY,
b CHAR(100) DEFAULT 'initial value') b CHAR(100) DEFAULT 'initial value')
ENGINE=MyISAM; ENGINE=MyISAM;
insert into t1 (id) values (1), (2), (3), (4), (5), (6), (7), (8); insert into t1 (id) values (1), (2), (3), (4), (5), (6), (7), (8);
update performance_schema.SETUP_INSTRUMENTS SET enabled = 'NO'; update performance_schema.setup_instruments SET enabled = 'NO';
update performance_schema.SETUP_CONSUMERS set enabled = 'NO'; update performance_schema.setup_consumers set enabled = 'NO';
set @dump_all=FALSE; set @dump_all=FALSE;
"Verifying file aggregate consistency" "Verifying file aggregate consistency"
SELECT EVENT_NAME, e.COUNT_READ, SUM(i.COUNT_READ) SELECT EVENT_NAME, e.COUNT_READ, SUM(i.COUNT_READ)
FROM performance_schema.FILE_SUMMARY_BY_EVENT_NAME AS e FROM performance_schema.file_summary_by_event_name AS e
JOIN performance_schema.FILE_SUMMARY_BY_INSTANCE AS i USING (EVENT_NAME) JOIN performance_schema.file_summary_by_instance AS i USING (EVENT_NAME)
GROUP BY EVENT_NAME GROUP BY EVENT_NAME
HAVING (e.COUNT_READ <> SUM(i.COUNT_READ)) HAVING (e.COUNT_READ <> SUM(i.COUNT_READ))
OR @dump_all; OR @dump_all;
EVENT_NAME COUNT_READ SUM(i.COUNT_READ) EVENT_NAME COUNT_READ SUM(i.COUNT_READ)
SELECT EVENT_NAME, e.COUNT_WRITE, SUM(i.COUNT_WRITE) SELECT EVENT_NAME, e.COUNT_WRITE, SUM(i.COUNT_WRITE)
FROM performance_schema.FILE_SUMMARY_BY_EVENT_NAME AS e FROM performance_schema.file_summary_by_event_name AS e
JOIN performance_schema.FILE_SUMMARY_BY_INSTANCE AS i USING (EVENT_NAME) JOIN performance_schema.file_summary_by_instance AS i USING (EVENT_NAME)
GROUP BY EVENT_NAME GROUP BY EVENT_NAME
HAVING (e.COUNT_WRITE <> SUM(i.COUNT_WRITE)) HAVING (e.COUNT_WRITE <> SUM(i.COUNT_WRITE))
OR @dump_all; OR @dump_all;
EVENT_NAME COUNT_WRITE SUM(i.COUNT_WRITE) EVENT_NAME COUNT_WRITE SUM(i.COUNT_WRITE)
SELECT EVENT_NAME, e.SUM_NUMBER_OF_BYTES_READ, SUM(i.SUM_NUMBER_OF_BYTES_READ) SELECT EVENT_NAME, e.SUM_NUMBER_OF_BYTES_READ, SUM(i.SUM_NUMBER_OF_BYTES_READ)
FROM performance_schema.FILE_SUMMARY_BY_EVENT_NAME AS e FROM performance_schema.file_summary_by_event_name AS e
JOIN performance_schema.FILE_SUMMARY_BY_INSTANCE AS i USING (EVENT_NAME) JOIN performance_schema.file_summary_by_instance AS i USING (EVENT_NAME)
GROUP BY EVENT_NAME GROUP BY EVENT_NAME
HAVING (e.SUM_NUMBER_OF_BYTES_READ <> SUM(i.SUM_NUMBER_OF_BYTES_READ)) HAVING (e.SUM_NUMBER_OF_BYTES_READ <> SUM(i.SUM_NUMBER_OF_BYTES_READ))
OR @dump_all; OR @dump_all;
EVENT_NAME SUM_NUMBER_OF_BYTES_READ SUM(i.SUM_NUMBER_OF_BYTES_READ) EVENT_NAME SUM_NUMBER_OF_BYTES_READ SUM(i.SUM_NUMBER_OF_BYTES_READ)
SELECT EVENT_NAME, e.SUM_NUMBER_OF_BYTES_WRITE, SUM(i.SUM_NUMBER_OF_BYTES_WRITE) SELECT EVENT_NAME, e.SUM_NUMBER_OF_BYTES_WRITE, SUM(i.SUM_NUMBER_OF_BYTES_WRITE)
FROM performance_schema.FILE_SUMMARY_BY_EVENT_NAME AS e FROM performance_schema.file_summary_by_event_name AS e
JOIN performance_schema.FILE_SUMMARY_BY_INSTANCE AS i USING (EVENT_NAME) JOIN performance_schema.file_summary_by_instance AS i USING (EVENT_NAME)
GROUP BY EVENT_NAME GROUP BY EVENT_NAME
HAVING (e.SUM_NUMBER_OF_BYTES_WRITE <> SUM(i.SUM_NUMBER_OF_BYTES_WRITE)) HAVING (e.SUM_NUMBER_OF_BYTES_WRITE <> SUM(i.SUM_NUMBER_OF_BYTES_WRITE))
OR @dump_all; OR @dump_all;
EVENT_NAME SUM_NUMBER_OF_BYTES_WRITE SUM(i.SUM_NUMBER_OF_BYTES_WRITE) EVENT_NAME SUM_NUMBER_OF_BYTES_WRITE SUM(i.SUM_NUMBER_OF_BYTES_WRITE)
"Verifying waits aggregate consistency (instance)" "Verifying waits aggregate consistency (instance)"
SELECT EVENT_NAME, e.SUM_TIMER_WAIT, SUM(i.SUM_TIMER_WAIT) SELECT EVENT_NAME, e.SUM_TIMER_WAIT, SUM(i.SUM_TIMER_WAIT)
FROM performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME AS e FROM performance_schema.events_waits_summary_global_by_event_name AS e
JOIN performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE AS i USING (EVENT_NAME) JOIN performance_schema.events_waits_summary_by_instance AS i USING (EVENT_NAME)
GROUP BY EVENT_NAME GROUP BY EVENT_NAME
HAVING (e.SUM_TIMER_WAIT < SUM(i.SUM_TIMER_WAIT)) HAVING (e.SUM_TIMER_WAIT < SUM(i.SUM_TIMER_WAIT))
OR @dump_all; OR @dump_all;
EVENT_NAME SUM_TIMER_WAIT SUM(i.SUM_TIMER_WAIT) EVENT_NAME SUM_TIMER_WAIT SUM(i.SUM_TIMER_WAIT)
SELECT EVENT_NAME, e.MIN_TIMER_WAIT, MIN(i.MIN_TIMER_WAIT) SELECT EVENT_NAME, e.MIN_TIMER_WAIT, MIN(i.MIN_TIMER_WAIT)
FROM performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME AS e FROM performance_schema.events_waits_summary_global_by_event_name AS e
JOIN performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE AS i USING (EVENT_NAME) JOIN performance_schema.events_waits_summary_by_instance AS i USING (EVENT_NAME)
GROUP BY EVENT_NAME GROUP BY EVENT_NAME
HAVING (e.MIN_TIMER_WAIT > MIN(i.MIN_TIMER_WAIT)) HAVING (e.MIN_TIMER_WAIT > MIN(i.MIN_TIMER_WAIT))
AND (MIN(i.MIN_TIMER_WAIT) != 0) AND (MIN(i.MIN_TIMER_WAIT) != 0)
OR @dump_all; OR @dump_all;
EVENT_NAME MIN_TIMER_WAIT MIN(i.MIN_TIMER_WAIT) EVENT_NAME MIN_TIMER_WAIT MIN(i.MIN_TIMER_WAIT)
SELECT EVENT_NAME, e.MAX_TIMER_WAIT, MAX(i.MAX_TIMER_WAIT) SELECT EVENT_NAME, e.MAX_TIMER_WAIT, MAX(i.MAX_TIMER_WAIT)
FROM performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME AS e FROM performance_schema.events_waits_summary_global_by_event_name AS e
JOIN performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE AS i USING (EVENT_NAME) JOIN performance_schema.events_waits_summary_by_instance AS i USING (EVENT_NAME)
GROUP BY EVENT_NAME GROUP BY EVENT_NAME
HAVING (e.MAX_TIMER_WAIT < MAX(i.MAX_TIMER_WAIT)) HAVING (e.MAX_TIMER_WAIT < MAX(i.MAX_TIMER_WAIT))
OR @dump_all; OR @dump_all;
EVENT_NAME MAX_TIMER_WAIT MAX(i.MAX_TIMER_WAIT) EVENT_NAME MAX_TIMER_WAIT MAX(i.MAX_TIMER_WAIT)
"Verifying waits aggregate consistency (thread)" "Verifying waits aggregate consistency (thread)"
SELECT EVENT_NAME, e.SUM_TIMER_WAIT, SUM(t.SUM_TIMER_WAIT) SELECT EVENT_NAME, e.SUM_TIMER_WAIT, SUM(t.SUM_TIMER_WAIT)
FROM performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME AS e FROM performance_schema.events_waits_summary_global_by_event_name AS e
JOIN performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME AS t JOIN performance_schema.events_waits_summary_by_thread_by_event_name AS t
USING (EVENT_NAME) USING (EVENT_NAME)
GROUP BY EVENT_NAME GROUP BY EVENT_NAME
HAVING (e.SUM_TIMER_WAIT < SUM(t.SUM_TIMER_WAIT)) HAVING (e.SUM_TIMER_WAIT < SUM(t.SUM_TIMER_WAIT))
OR @dump_all; OR @dump_all;
EVENT_NAME SUM_TIMER_WAIT SUM(t.SUM_TIMER_WAIT) EVENT_NAME SUM_TIMER_WAIT SUM(t.SUM_TIMER_WAIT)
SELECT EVENT_NAME, e.MIN_TIMER_WAIT, MIN(t.MIN_TIMER_WAIT) SELECT EVENT_NAME, e.MIN_TIMER_WAIT, MIN(t.MIN_TIMER_WAIT)
FROM performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME AS e FROM performance_schema.events_waits_summary_global_by_event_name AS e
JOIN performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME AS t JOIN performance_schema.events_waits_summary_by_thread_by_event_name AS t
USING (EVENT_NAME) USING (EVENT_NAME)
GROUP BY EVENT_NAME GROUP BY EVENT_NAME
HAVING (e.MIN_TIMER_WAIT > MIN(t.MIN_TIMER_WAIT)) HAVING (e.MIN_TIMER_WAIT > MIN(t.MIN_TIMER_WAIT))
@ -89,14 +89,14 @@ AND (MIN(t.MIN_TIMER_WAIT) != 0)
OR @dump_all; OR @dump_all;
EVENT_NAME MIN_TIMER_WAIT MIN(t.MIN_TIMER_WAIT) EVENT_NAME MIN_TIMER_WAIT MIN(t.MIN_TIMER_WAIT)
SELECT EVENT_NAME, e.MAX_TIMER_WAIT, MAX(t.MAX_TIMER_WAIT) SELECT EVENT_NAME, e.MAX_TIMER_WAIT, MAX(t.MAX_TIMER_WAIT)
FROM performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME AS e FROM performance_schema.events_waits_summary_global_by_event_name AS e
JOIN performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME AS t JOIN performance_schema.events_waits_summary_by_thread_by_event_name AS t
USING (EVENT_NAME) USING (EVENT_NAME)
GROUP BY EVENT_NAME GROUP BY EVENT_NAME
HAVING (e.MAX_TIMER_WAIT < MAX(t.MAX_TIMER_WAIT)) HAVING (e.MAX_TIMER_WAIT < MAX(t.MAX_TIMER_WAIT))
OR @dump_all; OR @dump_all;
EVENT_NAME MAX_TIMER_WAIT MAX(t.MAX_TIMER_WAIT) EVENT_NAME MAX_TIMER_WAIT MAX(t.MAX_TIMER_WAIT)
update performance_schema.SETUP_CONSUMERS set enabled = 'YES'; update performance_schema.setup_consumers set enabled = 'YES';
update performance_schema.SETUP_INSTRUMENTS update performance_schema.setup_instruments
set enabled = 'YES', timed = 'YES'; set enabled = 'YES', timed = 'YES';
drop table test.t1; drop table test.t1;

16
mysql-test/suite/perfschema/r/binlog_mix.result
View File

@ -1,11 +1,11 @@
set binlog_format=mixed; set binlog_format=mixed;
RESET MASTER; RESET MASTER;
select count(*) > 0 from performance_schema.SETUP_INSTRUMENTS; select count(*) > 0 from performance_schema.setup_instruments;
count(*) > 0 count(*) > 0
1 1
update performance_schema.SETUP_INSTRUMENTS set enabled='NO' update performance_schema.setup_instruments set enabled='NO'
where name like "wait/synch/rwlock/%"; where name like "wait/synch/rwlock/%";
select count(*) > 0 from performance_schema.EVENTS_WAITS_CURRENT; select count(*) > 0 from performance_schema.events_waits_current;
count(*) > 0 count(*) > 0
1 1
drop table if exists test.t1; drop table if exists test.t1;
@ -13,18 +13,18 @@ drop table if exists test.t2;
create table test.t1 (thread_id integer); create table test.t1 (thread_id integer);
create table test.t2 (name varchar(128)); create table test.t2 (name varchar(128));
insert into test.t1 insert into test.t1
select thread_id from performance_schema.EVENTS_WAITS_CURRENT; select thread_id from performance_schema.events_waits_current;
insert into test.t2 insert into test.t2
select name from performance_schema.SETUP_INSTRUMENTS select name from performance_schema.setup_instruments
where name like "wait/synch/rwlock/%"; where name like "wait/synch/rwlock/%";
drop table test.t1; drop table test.t1;
drop table test.t2; drop table test.t2;
update performance_schema.SETUP_INSTRUMENTS set enabled='YES' update performance_schema.setup_instruments set enabled='YES'
where name like "wait/synch/rwlock/%"; where name like "wait/synch/rwlock/%";
show binlog events from <binlog_start>; show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Query # # BEGIN master-bin.000001 # Query # # BEGIN
master-bin.000001 # Table_map # # table_id: # (performance_schema.SETUP_INSTRUMENTS) master-bin.000001 # Table_map # # table_id: # (performance_schema.setup_instruments)
master-bin.000001 # Update_rows # # table_id: # master-bin.000001 # Update_rows # # table_id: #
master-bin.000001 # Update_rows # # table_id: # flags: STMT_END_F master-bin.000001 # Update_rows # # table_id: # flags: STMT_END_F
master-bin.000001 # Query # # COMMIT master-bin.000001 # Query # # COMMIT
@ -43,7 +43,7 @@ master-bin.000001 # Query # # COMMIT
master-bin.000001 # Query # # use `test`; DROP TABLE `t1` /* generated by server */ master-bin.000001 # Query # # use `test`; DROP TABLE `t1` /* generated by server */
master-bin.000001 # Query # # use `test`; DROP TABLE `t2` /* generated by server */ master-bin.000001 # Query # # use `test`; DROP TABLE `t2` /* generated by server */
master-bin.000001 # Query # # BEGIN master-bin.000001 # Query # # BEGIN
master-bin.000001 # Table_map # # table_id: # (performance_schema.SETUP_INSTRUMENTS) master-bin.000001 # Table_map # # table_id: # (performance_schema.setup_instruments)
master-bin.000001 # Update_rows # # table_id: # master-bin.000001 # Update_rows # # table_id: #
master-bin.000001 # Update_rows # # table_id: # flags: STMT_END_F master-bin.000001 # Update_rows # # table_id: # flags: STMT_END_F
master-bin.000001 # Query # # COMMIT master-bin.000001 # Query # # COMMIT

16
mysql-test/suite/perfschema/r/binlog_row.result
View File

@ -1,11 +1,11 @@
set binlog_format=row; set binlog_format=row;
RESET MASTER; RESET MASTER;
select count(*) > 0 from performance_schema.SETUP_INSTRUMENTS; select count(*) > 0 from performance_schema.setup_instruments;
count(*) > 0 count(*) > 0
1 1
update performance_schema.SETUP_INSTRUMENTS set enabled='NO' update performance_schema.setup_instruments set enabled='NO'
where name like "wait/synch/rwlock/%"; where name like "wait/synch/rwlock/%";
select count(*) > 0 from performance_schema.EVENTS_WAITS_CURRENT; select count(*) > 0 from performance_schema.events_waits_current;
count(*) > 0 count(*) > 0
1 1
drop table if exists test.t1; drop table if exists test.t1;
@ -13,18 +13,18 @@ drop table if exists test.t2;
create table test.t1 (thread_id integer); create table test.t1 (thread_id integer);
create table test.t2 (name varchar(128)); create table test.t2 (name varchar(128));
insert into test.t1 insert into test.t1
select thread_id from performance_schema.EVENTS_WAITS_CURRENT; select thread_id from performance_schema.events_waits_current;
insert into test.t2 insert into test.t2
select name from performance_schema.SETUP_INSTRUMENTS select name from performance_schema.setup_instruments
where name like "wait/synch/rwlock/%"; where name like "wait/synch/rwlock/%";
drop table test.t1; drop table test.t1;
drop table test.t2; drop table test.t2;
update performance_schema.SETUP_INSTRUMENTS set enabled='YES' update performance_schema.setup_instruments set enabled='YES'
where name like "wait/synch/rwlock/%"; where name like "wait/synch/rwlock/%";
show binlog events from <binlog_start>; show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Query # # BEGIN master-bin.000001 # Query # # BEGIN
master-bin.000001 # Table_map # # table_id: # (performance_schema.SETUP_INSTRUMENTS) master-bin.000001 # Table_map # # table_id: # (performance_schema.setup_instruments)
master-bin.000001 # Update_rows # # table_id: # master-bin.000001 # Update_rows # # table_id: #
master-bin.000001 # Update_rows # # table_id: # flags: STMT_END_F master-bin.000001 # Update_rows # # table_id: # flags: STMT_END_F
master-bin.000001 # Query # # COMMIT master-bin.000001 # Query # # COMMIT
@ -43,7 +43,7 @@ master-bin.000001 # Query # # COMMIT
master-bin.000001 # Query # # use `test`; DROP TABLE `t1` /* generated by server */ master-bin.000001 # Query # # use `test`; DROP TABLE `t1` /* generated by server */
master-bin.000001 # Query # # use `test`; DROP TABLE `t2` /* generated by server */ master-bin.000001 # Query # # use `test`; DROP TABLE `t2` /* generated by server */
master-bin.000001 # Query # # BEGIN master-bin.000001 # Query # # BEGIN
master-bin.000001 # Table_map # # table_id: # (performance_schema.SETUP_INSTRUMENTS) master-bin.000001 # Table_map # # table_id: # (performance_schema.setup_instruments)
master-bin.000001 # Update_rows # # table_id: # master-bin.000001 # Update_rows # # table_id: #
master-bin.000001 # Update_rows # # table_id: # flags: STMT_END_F master-bin.000001 # Update_rows # # table_id: # flags: STMT_END_F
master-bin.000001 # Query # # COMMIT master-bin.000001 # Query # # COMMIT

20
mysql-test/suite/perfschema/r/binlog_stmt.result
View File

@ -1,14 +1,14 @@
set binlog_format=statement; set binlog_format=statement;
call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT"); call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
RESET MASTER; RESET MASTER;
select count(*) > 0 from performance_schema.SETUP_INSTRUMENTS; select count(*) > 0 from performance_schema.setup_instruments;
count(*) > 0 count(*) > 0
1 1
update performance_schema.SETUP_INSTRUMENTS set enabled='NO' update performance_schema.setup_instruments set enabled='NO'
where name like "wait/synch/rwlock/%"; where name like "wait/synch/rwlock/%";
Warnings: Warnings:
Note 1592 Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. The statement is unsafe because it uses the general log, slow query log, or performance_schema table(s). This is unsafe because system tables may differ on slaves. Note 1592 Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. The statement is unsafe because it uses the general log, slow query log, or performance_schema table(s). This is unsafe because system tables may differ on slaves.
select count(*) > 0 from performance_schema.EVENTS_WAITS_CURRENT; select count(*) > 0 from performance_schema.events_waits_current;
count(*) > 0 count(*) > 0
1 1
drop table if exists test.t1; drop table if exists test.t1;
@ -16,24 +16,24 @@ drop table if exists test.t2;
create table test.t1 (thread_id integer); create table test.t1 (thread_id integer);
create table test.t2 (name varchar(128)); create table test.t2 (name varchar(128));
insert into test.t1 insert into test.t1
select thread_id from performance_schema.EVENTS_WAITS_CURRENT; select thread_id from performance_schema.events_waits_current;
Warnings: Warnings:
Note 1592 Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. The statement is unsafe because it uses the general log, slow query log, or performance_schema table(s). This is unsafe because system tables may differ on slaves. Note 1592 Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. The statement is unsafe because it uses the general log, slow query log, or performance_schema table(s). This is unsafe because system tables may differ on slaves.
insert into test.t2 insert into test.t2
select name from performance_schema.SETUP_INSTRUMENTS select name from performance_schema.setup_instruments
where name like "wait/synch/rwlock/%"; where name like "wait/synch/rwlock/%";
Warnings: Warnings:
Note 1592 Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. The statement is unsafe because it uses the general log, slow query log, or performance_schema table(s). This is unsafe because system tables may differ on slaves. Note 1592 Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. The statement is unsafe because it uses the general log, slow query log, or performance_schema table(s). This is unsafe because system tables may differ on slaves.
drop table test.t1; drop table test.t1;
drop table test.t2; drop table test.t2;
update performance_schema.SETUP_INSTRUMENTS set enabled='YES' update performance_schema.setup_instruments set enabled='YES'
where name like "wait/synch/rwlock/%"; where name like "wait/synch/rwlock/%";
Warnings: Warnings:
Note 1592 Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. The statement is unsafe because it uses the general log, slow query log, or performance_schema table(s). This is unsafe because system tables may differ on slaves. Note 1592 Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. The statement is unsafe because it uses the general log, slow query log, or performance_schema table(s). This is unsafe because system tables may differ on slaves.
show binlog events from <binlog_start>; show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Query # # BEGIN master-bin.000001 # Query # # BEGIN
master-bin.000001 # Query # # use `test`; update performance_schema.SETUP_INSTRUMENTS set enabled='NO' master-bin.000001 # Query # # use `test`; update performance_schema.setup_instruments set enabled='NO'
where name like "wait/synch/rwlock/%" where name like "wait/synch/rwlock/%"
master-bin.000001 # Query # # COMMIT master-bin.000001 # Query # # COMMIT
master-bin.000001 # Query # # use `test`; DROP TABLE IF EXISTS `t1` /* generated by server */ master-bin.000001 # Query # # use `test`; DROP TABLE IF EXISTS `t1` /* generated by server */
@ -42,16 +42,16 @@ master-bin.000001 # Query # # use `test`; create table test.t1 (thread_id intege
master-bin.000001 # Query # # use `test`; create table test.t2 (name varchar(128)) master-bin.000001 # Query # # use `test`; create table test.t2 (name varchar(128))
master-bin.000001 # Query # # BEGIN master-bin.000001 # Query # # BEGIN
master-bin.000001 # Query # # use `test`; insert into test.t1 master-bin.000001 # Query # # use `test`; insert into test.t1
select thread_id from performance_schema.EVENTS_WAITS_CURRENT select thread_id from performance_schema.events_waits_current
master-bin.000001 # Query # # COMMIT master-bin.000001 # Query # # COMMIT
master-bin.000001 # Query # # BEGIN master-bin.000001 # Query # # BEGIN
master-bin.000001 # Query # # use `test`; insert into test.t2 master-bin.000001 # Query # # use `test`; insert into test.t2
select name from performance_schema.SETUP_INSTRUMENTS select name from performance_schema.setup_instruments
where name like "wait/synch/rwlock/%" where name like "wait/synch/rwlock/%"
master-bin.000001 # Query # # COMMIT master-bin.000001 # Query # # COMMIT
master-bin.000001 # Query # # use `test`; DROP TABLE `t1` /* generated by server */ master-bin.000001 # Query # # use `test`; DROP TABLE `t1` /* generated by server */
master-bin.000001 # Query # # use `test`; DROP TABLE `t2` /* generated by server */ master-bin.000001 # Query # # use `test`; DROP TABLE `t2` /* generated by server */
master-bin.000001 # Query # # BEGIN master-bin.000001 # Query # # BEGIN
master-bin.000001 # Query # # use `test`; update performance_schema.SETUP_INSTRUMENTS set enabled='YES' master-bin.000001 # Query # # use `test`; update performance_schema.setup_instruments set enabled='YES'
where name like "wait/synch/rwlock/%" where name like "wait/synch/rwlock/%"
master-bin.000001 # Query # # COMMIT master-bin.000001 # Query # # COMMIT

68
mysql-test/suite/perfschema/r/checksum.result
View File

@ -1,34 +1,34 @@
checksum table performance_schema.COND_INSTANCES; checksum table performance_schema.cond_instances;
checksum table performance_schema.EVENTS_WAITS_CURRENT; checksum table performance_schema.events_waits_current;
checksum table performance_schema.EVENTS_WAITS_HISTORY; checksum table performance_schema.events_waits_history;
checksum table performance_schema.EVENTS_WAITS_HISTORY_LONG; checksum table performance_schema.events_waits_history_long;
checksum table performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE; checksum table performance_schema.events_waits_summary_by_instance;
checksum table performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME; checksum table performance_schema.events_waits_summary_by_thread_by_event_name;
checksum table performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME; checksum table performance_schema.events_waits_summary_global_by_event_name;
checksum table performance_schema.FILE_INSTANCES; checksum table performance_schema.file_instances;
checksum table performance_schema.FILE_SUMMARY_BY_EVENT_NAME; checksum table performance_schema.file_summary_by_event_name;
checksum table performance_schema.FILE_SUMMARY_BY_INSTANCE; checksum table performance_schema.file_summary_by_instance;
checksum table performance_schema.MUTEX_INSTANCES; checksum table performance_schema.mutex_instances;
checksum table performance_schema.PERFORMANCE_TIMERS; checksum table performance_schema.performance_timers;
checksum table performance_schema.RWLOCK_INSTANCES; checksum table performance_schema.rwlock_instances;
checksum table performance_schema.SETUP_CONSUMERS; checksum table performance_schema.setup_consumers;
checksum table performance_schema.SETUP_INSTRUMENTS; checksum table performance_schema.setup_instruments;
checksum table performance_schema.SETUP_TIMERS; checksum table performance_schema.setup_timers;
checksum table performance_schema.THREADS; checksum table performance_schema.threads;
checksum table performance_schema.COND_INSTANCES extended; checksum table performance_schema.cond_instances extended;
checksum table performance_schema.EVENTS_WAITS_CURRENT extended; checksum table performance_schema.events_waits_current extended;
checksum table performance_schema.EVENTS_WAITS_HISTORY extended; checksum table performance_schema.events_waits_history extended;
checksum table performance_schema.EVENTS_WAITS_HISTORY_LONG extended; checksum table performance_schema.events_waits_history_long extended;
checksum table performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE extended; checksum table performance_schema.events_waits_summary_by_instance extended;
checksum table performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME extended; checksum table performance_schema.events_waits_summary_by_thread_by_event_name extended;
checksum table performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME extended; checksum table performance_schema.events_waits_summary_global_by_event_name extended;
checksum table performance_schema.FILE_INSTANCES extended; checksum table performance_schema.file_instances extended;
checksum table performance_schema.FILE_SUMMARY_BY_EVENT_NAME extended; checksum table performance_schema.file_summary_by_event_name extended;
checksum table performance_schema.FILE_SUMMARY_BY_INSTANCE extended; checksum table performance_schema.file_summary_by_instance extended;
checksum table performance_schema.MUTEX_INSTANCES extended; checksum table performance_schema.mutex_instances extended;
checksum table performance_schema.PERFORMANCE_TIMERS extended; checksum table performance_schema.performance_timers extended;
checksum table performance_schema.RWLOCK_INSTANCES extended; checksum table performance_schema.rwlock_instances extended;
checksum table performance_schema.SETUP_CONSUMERS extended; checksum table performance_schema.setup_consumers extended;
checksum table performance_schema.SETUP_INSTRUMENTS extended; checksum table performance_schema.setup_instruments extended;
checksum table performance_schema.SETUP_TIMERS extended; checksum table performance_schema.setup_timers extended;
checksum table performance_schema.THREADS extended; checksum table performance_schema.threads extended;

32
mysql-test/suite/perfschema/r/column_privilege.result
View File

@ -3,26 +3,26 @@ Grants for root@localhost
GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
GRANT PROXY ON ''@'' TO 'root'@'localhost' WITH GRANT OPTION GRANT PROXY ON ''@'' TO 'root'@'localhost' WITH GRANT OPTION
grant usage on *.* to 'pfs_user_5'@localhost with GRANT OPTION; grant usage on *.* to 'pfs_user_5'@localhost with GRANT OPTION;
grant SELECT(thread_id, event_id) on performance_schema.EVENTS_WAITS_CURRENT grant SELECT(thread_id, event_id) on performance_schema.events_waits_current
to 'pfs_user_5'@localhost; to 'pfs_user_5'@localhost;
grant UPDATE(enabled) on performance_schema.SETUP_INSTRUMENTS grant UPDATE(enabled) on performance_schema.setup_instruments
to 'pfs_user_5'@localhost; to 'pfs_user_5'@localhost;
flush privileges; flush privileges;
select thread_id from performance_schema.EVENTS_WAITS_CURRENT; select thread_id from performance_schema.events_waits_current;
select thread_id, event_id from performance_schema.EVENTS_WAITS_CURRENT; select thread_id, event_id from performance_schema.events_waits_current;
update performance_schema.SETUP_INSTRUMENTS set enabled='YES'; update performance_schema.setup_instruments set enabled='YES';
select event_name from performance_schema.EVENTS_WAITS_CURRENT; select event_name from performance_schema.events_waits_current;
ERROR 42000: SELECT command denied to user 'pfs_user_5'@'localhost' for column 'event_name' in table 'EVENTS_WAITS_CURRENT' ERROR 42000: SELECT command denied to user 'pfs_user_5'@'localhost' for column 'event_name' in table 'events_waits_current'
select thread_id, event_id, event_name select thread_id, event_id, event_name
from performance_schema.EVENTS_WAITS_CURRENT; from performance_schema.events_waits_current;
ERROR 42000: SELECT command denied to user 'pfs_user_5'@'localhost' for column 'event_name' in table 'EVENTS_WAITS_CURRENT' ERROR 42000: SELECT command denied to user 'pfs_user_5'@'localhost' for column 'event_name' in table 'events_waits_current'
update performance_schema.SETUP_INSTRUMENTS set name='illegal'; update performance_schema.setup_instruments set name='illegal';
ERROR 42000: UPDATE command denied to user 'pfs_user_5'@'localhost' for column 'name' in table 'SETUP_INSTRUMENTS' ERROR 42000: UPDATE command denied to user 'pfs_user_5'@'localhost' for column 'name' in table 'setup_instruments'
update performance_schema.SETUP_INSTRUMENTS set timed='NO'; update performance_schema.setup_instruments set timed='NO';
ERROR 42000: UPDATE command denied to user 'pfs_user_5'@'localhost' for column 'timed' in table 'SETUP_INSTRUMENTS' ERROR 42000: UPDATE command denied to user 'pfs_user_5'@'localhost' for column 'timed' in table 'setup_instruments'
REVOKE ALL PRIVILEGES, GRANT OPTION FROM 'pfs_user_5'@localhost; REVOKE ALL PRIVILEGES, GRANT OPTION FROM 'pfs_user_5'@localhost;
DROP USER 'pfs_user_5'@localhost; DROP USER 'pfs_user_5'@localhost;
flush privileges; flush privileges;
UPDATE performance_schema.SETUP_INSTRUMENTS SET enabled = 'YES', timed = 'YES'; UPDATE performance_schema.setup_instruments SET enabled = 'YES', timed = 'YES';
UPDATE performance_schema.SETUP_CONSUMERS SET enabled = 'YES'; UPDATE performance_schema.setup_consumers SET enabled = 'YES';
UPDATE performance_schema.SETUP_TIMERS SET timer_name = 'CYCLE'; UPDATE performance_schema.setup_timers SET timer_name = 'CYCLE';

8
mysql-test/suite/perfschema/r/ddl_cond_instances.result
View File

@ -1,8 +1,8 @@
alter table performance_schema.COND_INSTANCES add column foo integer; alter table performance_schema.cond_instances add column foo integer;
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
truncate table performance_schema.COND_INSTANCES; truncate table performance_schema.cond_instances;
ERROR HY000: Invalid performance_schema usage. ERROR HY000: Invalid performance_schema usage.
ALTER TABLE performance_schema.COND_INSTANCES ADD INDEX test_index(NAME); ALTER TABLE performance_schema.cond_instances ADD INDEX test_index(NAME);
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
CREATE UNIQUE INDEX test_index ON performance_schema.COND_INSTANCES(NAME); CREATE UNIQUE INDEX test_index ON performance_schema.cond_instances(NAME);
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'

8
mysql-test/suite/perfschema/r/ddl_events_waits_current.result
View File

@ -1,7 +1,7 @@
alter table performance_schema.EVENTS_WAITS_CURRENT add column foo integer; alter table performance_schema.events_waits_current add column foo integer;
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
truncate table performance_schema.EVENTS_WAITS_CURRENT; truncate table performance_schema.events_waits_current;
ALTER TABLE performance_schema.EVENTS_WAITS_CURRENT ADD INDEX test_index(EVENT_ID); ALTER TABLE performance_schema.events_waits_current ADD INDEX test_index(EVENT_ID);
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
CREATE UNIQUE INDEX test_index ON performance_schema.EVENTS_WAITS_CURRENT(EVENT_ID); CREATE UNIQUE INDEX test_index ON performance_schema.events_waits_current(EVENT_ID);
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'

8
mysql-test/suite/perfschema/r/ddl_events_waits_history.result
View File

@ -1,7 +1,7 @@
alter table performance_schema.EVENTS_WAITS_HISTORY add column foo integer; alter table performance_schema.events_waits_history add column foo integer;
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
truncate table performance_schema.EVENTS_WAITS_HISTORY; truncate table performance_schema.events_waits_history;
ALTER TABLE performance_schema.EVENTS_WAITS_HISTORY ADD INDEX test_index(EVENT_ID); ALTER TABLE performance_schema.events_waits_history ADD INDEX test_index(EVENT_ID);
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
CREATE UNIQUE INDEX test_index ON performance_schema.EVENTS_WAITS_HISTORY(EVENT_ID); CREATE UNIQUE INDEX test_index ON performance_schema.events_waits_history(EVENT_ID);
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'

8
mysql-test/suite/perfschema/r/ddl_events_waits_history_long.result
View File

@ -1,7 +1,7 @@
alter table performance_schema.EVENTS_WAITS_HISTORY_LONG add column foo integer; alter table performance_schema.events_waits_history_long add column foo integer;
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
truncate table performance_schema.EVENTS_WAITS_HISTORY_LONG; truncate table performance_schema.events_waits_history_long;
ALTER TABLE performance_schema.EVENTS_WAITS_HISTORY_LONG ADD INDEX test_index(EVENT_ID); ALTER TABLE performance_schema.events_waits_history_long ADD INDEX test_index(EVENT_ID);
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
CREATE UNIQUE INDEX test_index ON performance_schema.EVENTS_WAITS_HISTORY_LONG(EVENT_ID); CREATE UNIQUE INDEX test_index ON performance_schema.events_waits_history_long(EVENT_ID);
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'

8
mysql-test/suite/perfschema/r/ddl_ews_by_instance.result
View File

@ -1,7 +1,7 @@
alter table performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE add column foo integer; alter table performance_schema.events_waits_summary_by_instance add column foo integer;
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
truncate table performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE; truncate table performance_schema.events_waits_summary_by_instance;
ALTER TABLE performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE ADD INDEX test_index(EVENT_NAME); ALTER TABLE performance_schema.events_waits_summary_by_instance ADD INDEX test_index(EVENT_NAME);
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
CREATE UNIQUE INDEX test_index ON performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE(EVENT_NAME); CREATE UNIQUE INDEX test_index ON performance_schema.events_waits_summary_by_instance(EVENT_NAME);
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'

8
mysql-test/suite/perfschema/r/ddl_ews_by_thread_by_event_name.result
View File

@ -1,9 +1,9 @@
alter table performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME alter table performance_schema.events_waits_summary_by_thread_by_event_name
add column foo integer; add column foo integer;
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
truncate table performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME; truncate table performance_schema.events_waits_summary_by_thread_by_event_name;
ALTER TABLE performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME ADD INDEX test_index(THREAD_ID); ALTER TABLE performance_schema.events_waits_summary_by_thread_by_event_name ADD INDEX test_index(THREAD_ID);
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
CREATE UNIQUE INDEX test_index CREATE UNIQUE INDEX test_index
ON performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME(THREAD_ID); ON performance_schema.events_waits_summary_by_thread_by_event_name(THREAD_ID);
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'

8
mysql-test/suite/perfschema/r/ddl_ews_global_by_event_name.result
View File

@ -1,10 +1,10 @@
alter table performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME alter table performance_schema.events_waits_summary_global_by_event_name
add column foo integer; add column foo integer;
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
truncate table performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME; truncate table performance_schema.events_waits_summary_global_by_event_name;
ALTER TABLE performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME ALTER TABLE performance_schema.events_waits_summary_global_by_event_name
ADD INDEX test_index(EVENT_NAME); ADD INDEX test_index(EVENT_NAME);
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
CREATE UNIQUE INDEX test_index CREATE UNIQUE INDEX test_index
ON performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME(EVENT_NAME); ON performance_schema.events_waits_summary_global_by_event_name(EVENT_NAME);
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'

8
mysql-test/suite/perfschema/r/ddl_file_instances.result
View File

@ -1,8 +1,8 @@
alter table performance_schema.FILE_INSTANCES add column foo integer; alter table performance_schema.file_instances add column foo integer;
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
truncate table performance_schema.FILE_INSTANCES; truncate table performance_schema.file_instances;
ERROR HY000: Invalid performance_schema usage. ERROR HY000: Invalid performance_schema usage.
ALTER TABLE performance_schema.FILE_INSTANCES ADD INDEX test_index(FILE_NAME); ALTER TABLE performance_schema.file_instances ADD INDEX test_index(FILE_NAME);
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
CREATE UNIQUE INDEX test_index ON performance_schema.FILE_INSTANCES(FILE_NAME); CREATE UNIQUE INDEX test_index ON performance_schema.file_instances(FILE_NAME);
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'

8
mysql-test/suite/perfschema/r/ddl_fs_by_event_name.result
View File

@ -1,7 +1,7 @@
alter table performance_schema.FILE_SUMMARY_BY_EVENT_NAME add column foo integer; alter table performance_schema.file_summary_by_event_name add column foo integer;
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
truncate table performance_schema.FILE_SUMMARY_BY_EVENT_NAME; truncate table performance_schema.file_summary_by_event_name;
ALTER TABLE performance_schema.FILE_SUMMARY_BY_EVENT_NAME ADD INDEX test_index(NAME); ALTER TABLE performance_schema.file_summary_by_event_name ADD INDEX test_index(NAME);
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
CREATE UNIQUE INDEX test_index ON performance_schema.FILE_SUMMARY_BY_EVENT_NAME(NAME); CREATE UNIQUE INDEX test_index ON performance_schema.file_summary_by_event_name(NAME);
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'

8
mysql-test/suite/perfschema/r/ddl_fs_by_instance.result
View File

@ -1,7 +1,7 @@
alter table performance_schema.FILE_SUMMARY_BY_INSTANCE add column foo integer; alter table performance_schema.file_summary_by_instance add column foo integer;
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
truncate table performance_schema.FILE_SUMMARY_BY_INSTANCE; truncate table performance_schema.file_summary_by_instance;
ALTER TABLE performance_schema.FILE_SUMMARY_BY_INSTANCE ADD INDEX test_index(NAME); ALTER TABLE performance_schema.file_summary_by_instance ADD INDEX test_index(NAME);
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
CREATE UNIQUE INDEX test_index ON performance_schema.FILE_SUMMARY_BY_INSTANCE(NAME); CREATE UNIQUE INDEX test_index ON performance_schema.file_summary_by_instance(NAME);
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'

8
mysql-test/suite/perfschema/r/ddl_mutex_instances.result
View File

@ -1,8 +1,8 @@
alter table performance_schema.MUTEX_INSTANCES add column foo integer; alter table performance_schema.mutex_instances add column foo integer;
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
truncate table performance_schema.MUTEX_INSTANCES; truncate table performance_schema.mutex_instances;
ERROR HY000: Invalid performance_schema usage. ERROR HY000: Invalid performance_schema usage.
ALTER TABLE performance_schema.MUTEX_INSTANCES ADD INDEX test_index(NAME); ALTER TABLE performance_schema.mutex_instances ADD INDEX test_index(NAME);
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
CREATE UNIQUE INDEX test_index ON performance_schema.MUTEX_INSTANCES(NAME); CREATE UNIQUE INDEX test_index ON performance_schema.mutex_instances(NAME);
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'

8
mysql-test/suite/perfschema/r/ddl_performance_timers.result
View File

@ -1,8 +1,8 @@
alter table performance_schema.PERFORMANCE_TIMERS add column foo integer; alter table performance_schema.performance_timers add column foo integer;
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
truncate table performance_schema.PERFORMANCE_TIMERS; truncate table performance_schema.performance_timers;
ERROR HY000: Invalid performance_schema usage. ERROR HY000: Invalid performance_schema usage.
ALTER TABLE performance_schema.PERFORMANCE_TIMERS ADD INDEX test_index(TIMER_NAME); ALTER TABLE performance_schema.performance_timers ADD INDEX test_index(TIMER_NAME);
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
CREATE UNIQUE INDEX test_index ON performance_schema.PERFORMANCE_TIMERS(TIMER_NAME); CREATE UNIQUE INDEX test_index ON performance_schema.performance_timers(TIMER_NAME);
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'

8
mysql-test/suite/perfschema/r/ddl_rwlock_instances.result
View File

@ -1,8 +1,8 @@
alter table performance_schema.RWLOCK_INSTANCES add column foo integer; alter table performance_schema.rwlock_instances add column foo integer;
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
truncate table performance_schema.RWLOCK_INSTANCES; truncate table performance_schema.rwlock_instances;
ERROR HY000: Invalid performance_schema usage. ERROR HY000: Invalid performance_schema usage.
ALTER TABLE performance_schema.RWLOCK_INSTANCES ADD INDEX test_index(NAME); ALTER TABLE performance_schema.rwlock_instances ADD INDEX test_index(NAME);
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
CREATE UNIQUE INDEX test_index ON performance_schema.RWLOCK_INSTANCES(NAME); CREATE UNIQUE INDEX test_index ON performance_schema.rwlock_instances(NAME);
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'

8
mysql-test/suite/perfschema/r/ddl_setup_consumers.result
View File

@ -1,8 +1,8 @@
alter table performance_schema.SETUP_CONSUMERS add column foo integer; alter table performance_schema.setup_consumers add column foo integer;
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
truncate table performance_schema.SETUP_CONSUMERS; truncate table performance_schema.setup_consumers;
ERROR HY000: Invalid performance_schema usage. ERROR HY000: Invalid performance_schema usage.
ALTER TABLE performance_schema.SETUP_CONSUMERS ADD INDEX test_index(NAME); ALTER TABLE performance_schema.setup_consumers ADD INDEX test_index(NAME);
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
CREATE UNIQUE INDEX test_index ON performance_schema.SETUP_CONSUMERS(NAME); CREATE UNIQUE INDEX test_index ON performance_schema.setup_consumers(NAME);
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'

8
mysql-test/suite/perfschema/r/ddl_setup_instruments.result
View File

@ -1,8 +1,8 @@
alter table performance_schema.SETUP_INSTRUMENTS add column foo integer; alter table performance_schema.setup_instruments add column foo integer;
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
truncate table performance_schema.SETUP_INSTRUMENTS; truncate table performance_schema.setup_instruments;
ERROR HY000: Invalid performance_schema usage. ERROR HY000: Invalid performance_schema usage.
ALTER TABLE performance_schema.SETUP_INSTRUMENTS ADD INDEX test_index(NAME); ALTER TABLE performance_schema.setup_instruments ADD INDEX test_index(NAME);
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
CREATE UNIQUE INDEX test_index ON performance_schema.SETUP_INSTRUMENTS(NAME); CREATE UNIQUE INDEX test_index ON performance_schema.setup_instruments(NAME);
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'

8
mysql-test/suite/perfschema/r/ddl_setup_timers.result
View File

@ -1,8 +1,8 @@
alter table performance_schema.SETUP_TIMERS add column foo integer; alter table performance_schema.setup_timers add column foo integer;
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
truncate table performance_schema.SETUP_TIMERS; truncate table performance_schema.setup_timers;
ERROR HY000: Invalid performance_schema usage. ERROR HY000: Invalid performance_schema usage.
ALTER TABLE performance_schema.SETUP_TIMERS ADD INDEX test_index(NAME); ALTER TABLE performance_schema.setup_timers ADD INDEX test_index(NAME);
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
CREATE UNIQUE INDEX test_index ON performance_schema.SETUP_TIMERS(NAME); CREATE UNIQUE INDEX test_index ON performance_schema.setup_timers(NAME);
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'

8
mysql-test/suite/perfschema/r/ddl_threads.result
View File

@ -1,8 +1,8 @@
alter table performance_schema.THREADS add column foo integer; alter table performance_schema.threads add column foo integer;
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
truncate table performance_schema.THREADS; truncate table performance_schema.threads;
ERROR HY000: Invalid performance_schema usage. ERROR HY000: Invalid performance_schema usage.
ALTER TABLE performance_schema.THREADS ADD INDEX test_index(ID); ALTER TABLE performance_schema.threads ADD INDEX test_index(ID);
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
CREATE UNIQUE INDEX test_index ON performance_schema.THREADS(ID); CREATE UNIQUE INDEX test_index ON performance_schema.threads(ID);
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'

28
mysql-test/suite/perfschema/r/dml_cond_instances.result
View File

@ -1,23 +1,23 @@
select * from performance_schema.COND_INSTANCES limit 1; select * from performance_schema.cond_instances limit 1;
NAME OBJECT_INSTANCE_BEGIN NAME OBJECT_INSTANCE_BEGIN
# # # #
select * from performance_schema.COND_INSTANCES select * from performance_schema.cond_instances
where name='FOO'; where name='FOO';
NAME OBJECT_INSTANCE_BEGIN NAME OBJECT_INSTANCE_BEGIN
insert into performance_schema.COND_INSTANCES insert into performance_schema.cond_instances
set name='FOO', object_instance_begin=12; set name='FOO', object_instance_begin=12;
ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'COND_INSTANCES' ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'cond_instances'
update performance_schema.COND_INSTANCES update performance_schema.cond_instances
set name='FOO'; set name='FOO';
ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'COND_INSTANCES' ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'cond_instances'
delete from performance_schema.COND_INSTANCES delete from performance_schema.cond_instances
where name like "wait/%"; where name like "wait/%";
ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'COND_INSTANCES' ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'cond_instances'
delete from performance_schema.COND_INSTANCES; delete from performance_schema.cond_instances;
ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'COND_INSTANCES' ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'cond_instances'
LOCK TABLES performance_schema.COND_INSTANCES READ; LOCK TABLES performance_schema.cond_instances READ;
ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'COND_INSTANCES' ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'cond_instances'
UNLOCK TABLES; UNLOCK TABLES;
LOCK TABLES performance_schema.COND_INSTANCES WRITE; LOCK TABLES performance_schema.cond_instances WRITE;
ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'COND_INSTANCES' ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'cond_instances'
UNLOCK TABLES; UNLOCK TABLES;

32
mysql-test/suite/perfschema/r/dml_events_waits_current.result
View File

@ -1,28 +1,28 @@
select * from performance_schema.EVENTS_WAITS_CURRENT select * from performance_schema.events_waits_current
where event_name like 'Wait/Synch/%' limit 1; where event_name like 'Wait/Synch/%' limit 1;
THREAD_ID EVENT_ID EVENT_NAME SOURCE TIMER_START TIMER_END TIMER_WAIT SPINS OBJECT_SCHEMA OBJECT_NAME OBJECT_TYPE OBJECT_INSTANCE_BEGIN NESTING_EVENT_ID OPERATION NUMBER_OF_BYTES FLAGS THREAD_ID EVENT_ID EVENT_NAME SOURCE TIMER_START TIMER_END TIMER_WAIT SPINS OBJECT_SCHEMA OBJECT_NAME OBJECT_TYPE OBJECT_INSTANCE_BEGIN NESTING_EVENT_ID OPERATION NUMBER_OF_BYTES FLAGS
# # # # # # # # NULL NULL NULL # NULL # NULL 0 # # # # # # # # NULL NULL NULL # NULL # NULL 0
select * from performance_schema.EVENTS_WAITS_CURRENT select * from performance_schema.events_waits_current
where event_name='FOO'; where event_name='FOO';
THREAD_ID EVENT_ID EVENT_NAME SOURCE TIMER_START TIMER_END TIMER_WAIT SPINS OBJECT_SCHEMA OBJECT_NAME OBJECT_TYPE OBJECT_INSTANCE_BEGIN NESTING_EVENT_ID OPERATION NUMBER_OF_BYTES FLAGS THREAD_ID EVENT_ID EVENT_NAME SOURCE TIMER_START TIMER_END TIMER_WAIT SPINS OBJECT_SCHEMA OBJECT_NAME OBJECT_TYPE OBJECT_INSTANCE_BEGIN NESTING_EVENT_ID OPERATION NUMBER_OF_BYTES FLAGS
insert into performance_schema.EVENTS_WAITS_CURRENT insert into performance_schema.events_waits_current
set thread_id='1', event_id=1, set thread_id='1', event_id=1,
event_name='FOO', timer_start=1, timer_end=2, timer_wait=3; event_name='FOO', timer_start=1, timer_end=2, timer_wait=3;
ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_CURRENT' ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_waits_current'
update performance_schema.EVENTS_WAITS_CURRENT update performance_schema.events_waits_current
set timer_start=12; set timer_start=12;
ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_CURRENT' ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_waits_current'
update performance_schema.EVENTS_WAITS_CURRENT update performance_schema.events_waits_current
set timer_start=12 where thread_id=0; set timer_start=12 where thread_id=0;
ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_CURRENT' ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_waits_current'
delete from performance_schema.EVENTS_WAITS_CURRENT delete from performance_schema.events_waits_current
where thread_id=1; where thread_id=1;
ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_CURRENT' ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_waits_current'
delete from performance_schema.EVENTS_WAITS_CURRENT; delete from performance_schema.events_waits_current;
ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_CURRENT' ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_waits_current'
LOCK TABLES performance_schema.EVENTS_WAITS_CURRENT READ; LOCK TABLES performance_schema.events_waits_current READ;
ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_CURRENT' ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'events_waits_current'
UNLOCK TABLES; UNLOCK TABLES;
LOCK TABLES performance_schema.EVENTS_WAITS_CURRENT WRITE; LOCK TABLES performance_schema.events_waits_current WRITE;
ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_CURRENT' ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'events_waits_current'
UNLOCK TABLES; UNLOCK TABLES;

36
mysql-test/suite/perfschema/r/dml_events_waits_history.result
View File

@ -1,36 +1,36 @@
select * from performance_schema.EVENTS_WAITS_HISTORY select * from performance_schema.events_waits_history
where event_name like 'Wait/Synch/%' limit 1; where event_name like 'Wait/Synch/%' limit 1;
THREAD_ID EVENT_ID EVENT_NAME SOURCE TIMER_START TIMER_END TIMER_WAIT SPINS OBJECT_SCHEMA OBJECT_NAME OBJECT_TYPE OBJECT_INSTANCE_BEGIN NESTING_EVENT_ID OPERATION NUMBER_OF_BYTES FLAGS THREAD_ID EVENT_ID EVENT_NAME SOURCE TIMER_START TIMER_END TIMER_WAIT SPINS OBJECT_SCHEMA OBJECT_NAME OBJECT_TYPE OBJECT_INSTANCE_BEGIN NESTING_EVENT_ID OPERATION NUMBER_OF_BYTES FLAGS
# # # # # # # # NULL NULL NULL # NULL # NULL 0 # # # # # # # # NULL NULL NULL # NULL # NULL 0
select * from performance_schema.EVENTS_WAITS_HISTORY select * from performance_schema.events_waits_history
where event_name='FOO'; where event_name='FOO';
THREAD_ID EVENT_ID EVENT_NAME SOURCE TIMER_START TIMER_END TIMER_WAIT SPINS OBJECT_SCHEMA OBJECT_NAME OBJECT_TYPE OBJECT_INSTANCE_BEGIN NESTING_EVENT_ID OPERATION NUMBER_OF_BYTES FLAGS THREAD_ID EVENT_ID EVENT_NAME SOURCE TIMER_START TIMER_END TIMER_WAIT SPINS OBJECT_SCHEMA OBJECT_NAME OBJECT_TYPE OBJECT_INSTANCE_BEGIN NESTING_EVENT_ID OPERATION NUMBER_OF_BYTES FLAGS
select * from performance_schema.EVENTS_WAITS_HISTORY select * from performance_schema.events_waits_history
where event_name like 'Wait/Synch/%' order by timer_wait limit 1; where event_name like 'Wait/Synch/%' order by timer_wait limit 1;
THREAD_ID EVENT_ID EVENT_NAME SOURCE TIMER_START TIMER_END TIMER_WAIT SPINS OBJECT_SCHEMA OBJECT_NAME OBJECT_TYPE OBJECT_INSTANCE_BEGIN NESTING_EVENT_ID OPERATION NUMBER_OF_BYTES FLAGS THREAD_ID EVENT_ID EVENT_NAME SOURCE TIMER_START TIMER_END TIMER_WAIT SPINS OBJECT_SCHEMA OBJECT_NAME OBJECT_TYPE OBJECT_INSTANCE_BEGIN NESTING_EVENT_ID OPERATION NUMBER_OF_BYTES FLAGS
# # # # # # # # NULL NULL NULL # NULL # NULL 0 # # # # # # # # NULL NULL NULL # NULL # NULL 0
select * from performance_schema.EVENTS_WAITS_HISTORY select * from performance_schema.events_waits_history
where event_name like 'Wait/Synch/%' order by timer_wait desc limit 1; where event_name like 'Wait/Synch/%' order by timer_wait desc limit 1;
THREAD_ID EVENT_ID EVENT_NAME SOURCE TIMER_START TIMER_END TIMER_WAIT SPINS OBJECT_SCHEMA OBJECT_NAME OBJECT_TYPE OBJECT_INSTANCE_BEGIN NESTING_EVENT_ID OPERATION NUMBER_OF_BYTES FLAGS THREAD_ID EVENT_ID EVENT_NAME SOURCE TIMER_START TIMER_END TIMER_WAIT SPINS OBJECT_SCHEMA OBJECT_NAME OBJECT_TYPE OBJECT_INSTANCE_BEGIN NESTING_EVENT_ID OPERATION NUMBER_OF_BYTES FLAGS
# # # # # # # # NULL NULL NULL # NULL # NULL 0 # # # # # # # # NULL NULL NULL # NULL # NULL 0
insert into performance_schema.EVENTS_WAITS_HISTORY insert into performance_schema.events_waits_history
set thread_id='1', event_id=1, set thread_id='1', event_id=1,
event_name='FOO', timer_start=1, timer_end=2, timer_wait=3; event_name='FOO', timer_start=1, timer_end=2, timer_wait=3;
ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_HISTORY' ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_waits_history'
update performance_schema.EVENTS_WAITS_HISTORY update performance_schema.events_waits_history
set timer_start=12; set timer_start=12;
ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_HISTORY' ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_waits_history'
update performance_schema.EVENTS_WAITS_HISTORY update performance_schema.events_waits_history
set timer_start=12 where thread_id=0; set timer_start=12 where thread_id=0;
ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_HISTORY' ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_waits_history'
delete from performance_schema.EVENTS_WAITS_HISTORY delete from performance_schema.events_waits_history
where thread_id=1; where thread_id=1;
ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_HISTORY' ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_waits_history'
delete from performance_schema.EVENTS_WAITS_HISTORY; delete from performance_schema.events_waits_history;
ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_HISTORY' ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_waits_history'
LOCK TABLES performance_schema.EVENTS_WAITS_HISTORY READ; LOCK TABLES performance_schema.events_waits_history READ;
ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_HISTORY' ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'events_waits_history'
UNLOCK TABLES; UNLOCK TABLES;
LOCK TABLES performance_schema.EVENTS_WAITS_HISTORY WRITE; LOCK TABLES performance_schema.events_waits_history WRITE;
ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_HISTORY' ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'events_waits_history'
UNLOCK TABLES; UNLOCK TABLES;

36
mysql-test/suite/perfschema/r/dml_events_waits_history_long.result
View File

@ -1,36 +1,36 @@
select * from performance_schema.EVENTS_WAITS_HISTORY_LONG select * from performance_schema.events_waits_history_long
where event_name like 'Wait/Synch/%' limit 1; where event_name like 'Wait/Synch/%' limit 1;
THREAD_ID EVENT_ID EVENT_NAME SOURCE TIMER_START TIMER_END TIMER_WAIT SPINS OBJECT_SCHEMA OBJECT_NAME OBJECT_TYPE OBJECT_INSTANCE_BEGIN NESTING_EVENT_ID OPERATION NUMBER_OF_BYTES FLAGS THREAD_ID EVENT_ID EVENT_NAME SOURCE TIMER_START TIMER_END TIMER_WAIT SPINS OBJECT_SCHEMA OBJECT_NAME OBJECT_TYPE OBJECT_INSTANCE_BEGIN NESTING_EVENT_ID OPERATION NUMBER_OF_BYTES FLAGS
# # # # # # # # NULL NULL NULL # NULL # NULL 0 # # # # # # # # NULL NULL NULL # NULL # NULL 0
select * from performance_schema.EVENTS_WAITS_HISTORY_LONG select * from performance_schema.events_waits_history_long
where event_name='FOO'; where event_name='FOO';
THREAD_ID EVENT_ID EVENT_NAME SOURCE TIMER_START TIMER_END TIMER_WAIT SPINS OBJECT_SCHEMA OBJECT_NAME OBJECT_TYPE OBJECT_INSTANCE_BEGIN NESTING_EVENT_ID OPERATION NUMBER_OF_BYTES FLAGS THREAD_ID EVENT_ID EVENT_NAME SOURCE TIMER_START TIMER_END TIMER_WAIT SPINS OBJECT_SCHEMA OBJECT_NAME OBJECT_TYPE OBJECT_INSTANCE_BEGIN NESTING_EVENT_ID OPERATION NUMBER_OF_BYTES FLAGS
select * from performance_schema.EVENTS_WAITS_HISTORY_LONG select * from performance_schema.events_waits_history_long
where event_name like 'Wait/Synch/%' order by timer_wait limit 1; where event_name like 'Wait/Synch/%' order by timer_wait limit 1;
THREAD_ID EVENT_ID EVENT_NAME SOURCE TIMER_START TIMER_END TIMER_WAIT SPINS OBJECT_SCHEMA OBJECT_NAME OBJECT_TYPE OBJECT_INSTANCE_BEGIN NESTING_EVENT_ID OPERATION NUMBER_OF_BYTES FLAGS THREAD_ID EVENT_ID EVENT_NAME SOURCE TIMER_START TIMER_END TIMER_WAIT SPINS OBJECT_SCHEMA OBJECT_NAME OBJECT_TYPE OBJECT_INSTANCE_BEGIN NESTING_EVENT_ID OPERATION NUMBER_OF_BYTES FLAGS
# # # # # # # # NULL NULL NULL # NULL # NULL 0 # # # # # # # # NULL NULL NULL # NULL # NULL 0
select * from performance_schema.EVENTS_WAITS_HISTORY_LONG select * from performance_schema.events_waits_history_long
where event_name like 'Wait/Synch/%' order by timer_wait desc limit 1; where event_name like 'Wait/Synch/%' order by timer_wait desc limit 1;
THREAD_ID EVENT_ID EVENT_NAME SOURCE TIMER_START TIMER_END TIMER_WAIT SPINS OBJECT_SCHEMA OBJECT_NAME OBJECT_TYPE OBJECT_INSTANCE_BEGIN NESTING_EVENT_ID OPERATION NUMBER_OF_BYTES FLAGS THREAD_ID EVENT_ID EVENT_NAME SOURCE TIMER_START TIMER_END TIMER_WAIT SPINS OBJECT_SCHEMA OBJECT_NAME OBJECT_TYPE OBJECT_INSTANCE_BEGIN NESTING_EVENT_ID OPERATION NUMBER_OF_BYTES FLAGS
# # # # # # # # NULL NULL NULL # NULL # NULL 0 # # # # # # # # NULL NULL NULL # NULL # NULL 0
insert into performance_schema.EVENTS_WAITS_HISTORY_LONG insert into performance_schema.events_waits_history_long
set thread_id='1', event_id=1, set thread_id='1', event_id=1,
event_name='FOO', timer_start=1, timer_end=2, timer_wait=3; event_name='FOO', timer_start=1, timer_end=2, timer_wait=3;
ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_HISTORY_LONG' ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_waits_history_long'
update performance_schema.EVENTS_WAITS_HISTORY_LONG update performance_schema.events_waits_history_long
set timer_start=12; set timer_start=12;
ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_HISTORY_LONG' ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_waits_history_long'
update performance_schema.EVENTS_WAITS_HISTORY_LONG update performance_schema.events_waits_history_long
set timer_start=12 where thread_id=0; set timer_start=12 where thread_id=0;
ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_HISTORY_LONG' ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_waits_history_long'
delete from performance_schema.EVENTS_WAITS_HISTORY_LONG delete from performance_schema.events_waits_history_long
where thread_id=1; where thread_id=1;
ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_HISTORY_LONG' ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_waits_history_long'
delete from performance_schema.EVENTS_WAITS_HISTORY_LONG; delete from performance_schema.events_waits_history_long;
ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_HISTORY_LONG' ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_waits_history_long'
LOCK TABLES performance_schema.EVENTS_WAITS_HISTORY_LONG READ; LOCK TABLES performance_schema.events_waits_history_long READ;
ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_HISTORY_LONG' ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'events_waits_history_long'
UNLOCK TABLES; UNLOCK TABLES;
LOCK TABLES performance_schema.EVENTS_WAITS_HISTORY_LONG WRITE; LOCK TABLES performance_schema.events_waits_history_long WRITE;
ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_HISTORY_LONG' ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'events_waits_history_long'
UNLOCK TABLES; UNLOCK TABLES;

40
mysql-test/suite/perfschema/r/dml_ews_by_instance.result
View File

@ -1,45 +1,45 @@
select * from performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE select * from performance_schema.events_waits_summary_by_instance
where event_name like 'Wait/Synch/%' limit 1; where event_name like 'Wait/Synch/%' limit 1;
EVENT_NAME OBJECT_INSTANCE_BEGIN COUNT_STAR SUM_TIMER_WAIT MIN_TIMER_WAIT AVG_TIMER_WAIT MAX_TIMER_WAIT EVENT_NAME OBJECT_INSTANCE_BEGIN COUNT_STAR SUM_TIMER_WAIT MIN_TIMER_WAIT AVG_TIMER_WAIT MAX_TIMER_WAIT
# # # # # # # # # # # # # #
select * from performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE select * from performance_schema.events_waits_summary_by_instance
where event_name='FOO'; where event_name='FOO';
EVENT_NAME OBJECT_INSTANCE_BEGIN COUNT_STAR SUM_TIMER_WAIT MIN_TIMER_WAIT AVG_TIMER_WAIT MAX_TIMER_WAIT EVENT_NAME OBJECT_INSTANCE_BEGIN COUNT_STAR SUM_TIMER_WAIT MIN_TIMER_WAIT AVG_TIMER_WAIT MAX_TIMER_WAIT
select * from performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE select * from performance_schema.events_waits_summary_by_instance
order by count_star limit 1; order by count_star limit 1;
EVENT_NAME OBJECT_INSTANCE_BEGIN COUNT_STAR SUM_TIMER_WAIT MIN_TIMER_WAIT AVG_TIMER_WAIT MAX_TIMER_WAIT EVENT_NAME OBJECT_INSTANCE_BEGIN COUNT_STAR SUM_TIMER_WAIT MIN_TIMER_WAIT AVG_TIMER_WAIT MAX_TIMER_WAIT
# # # # # # # # # # # # # #
select * from performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE select * from performance_schema.events_waits_summary_by_instance
order by count_star desc limit 1; order by count_star desc limit 1;
EVENT_NAME OBJECT_INSTANCE_BEGIN COUNT_STAR SUM_TIMER_WAIT MIN_TIMER_WAIT AVG_TIMER_WAIT MAX_TIMER_WAIT EVENT_NAME OBJECT_INSTANCE_BEGIN COUNT_STAR SUM_TIMER_WAIT MIN_TIMER_WAIT AVG_TIMER_WAIT MAX_TIMER_WAIT
# # # # # # # # # # # # # #
select * from performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE select * from performance_schema.events_waits_summary_by_instance
where min_timer_wait > 0 order by count_star limit 1; where min_timer_wait > 0 order by count_star limit 1;
EVENT_NAME OBJECT_INSTANCE_BEGIN COUNT_STAR SUM_TIMER_WAIT MIN_TIMER_WAIT AVG_TIMER_WAIT MAX_TIMER_WAIT EVENT_NAME OBJECT_INSTANCE_BEGIN COUNT_STAR SUM_TIMER_WAIT MIN_TIMER_WAIT AVG_TIMER_WAIT MAX_TIMER_WAIT
# # # # # # # # # # # # # #
select * from performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE select * from performance_schema.events_waits_summary_by_instance
where min_timer_wait > 0 order by count_star desc limit 1; where min_timer_wait > 0 order by count_star desc limit 1;
EVENT_NAME OBJECT_INSTANCE_BEGIN COUNT_STAR SUM_TIMER_WAIT MIN_TIMER_WAIT AVG_TIMER_WAIT MAX_TIMER_WAIT EVENT_NAME OBJECT_INSTANCE_BEGIN COUNT_STAR SUM_TIMER_WAIT MIN_TIMER_WAIT AVG_TIMER_WAIT MAX_TIMER_WAIT
# # # # # # # # # # # # # #
insert into performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE insert into performance_schema.events_waits_summary_by_instance
set event_name='FOO', object_instance_begin=0, set event_name='FOO', object_instance_begin=0,
count_star=1, sum_timer_wait=2, min_timer_wait=3, count_star=1, sum_timer_wait=2, min_timer_wait=3,
avg_timer_wait=4, max_timer_wait=5; avg_timer_wait=4, max_timer_wait=5;
ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_SUMMARY_BY_INSTANCE' ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_waits_summary_by_instance'
update performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE update performance_schema.events_waits_summary_by_instance
set count_star=12; set count_star=12;
ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_SUMMARY_BY_INSTANCE' ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_waits_summary_by_instance'
update performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE update performance_schema.events_waits_summary_by_instance
set count_star=12 where event_name like "FOO"; set count_star=12 where event_name like "FOO";
ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_SUMMARY_BY_INSTANCE' ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_waits_summary_by_instance'
delete from performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE delete from performance_schema.events_waits_summary_by_instance
where count_star=1; where count_star=1;
ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_SUMMARY_BY_INSTANCE' ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_waits_summary_by_instance'
delete from performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE; delete from performance_schema.events_waits_summary_by_instance;
ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_SUMMARY_BY_INSTANCE' ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_waits_summary_by_instance'
LOCK TABLES performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE READ; LOCK TABLES performance_schema.events_waits_summary_by_instance READ;
ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_SUMMARY_BY_INSTANCE' ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'events_waits_summary_by_instance'
UNLOCK TABLES; UNLOCK TABLES;
LOCK TABLES performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE WRITE; LOCK TABLES performance_schema.events_waits_summary_by_instance WRITE;
ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_SUMMARY_BY_INSTANCE' ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'events_waits_summary_by_instance'
UNLOCK TABLES; UNLOCK TABLES;

32
mysql-test/suite/perfschema/r/dml_ews_by_thread_by_event_name.result
View File

@ -1,29 +1,29 @@
select * from performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME select * from performance_schema.events_waits_summary_by_thread_by_event_name
where event_name like 'Wait/Synch/%' limit 1; where event_name like 'Wait/Synch/%' limit 1;
THREAD_ID EVENT_NAME COUNT_STAR SUM_TIMER_WAIT MIN_TIMER_WAIT AVG_TIMER_WAIT MAX_TIMER_WAIT THREAD_ID EVENT_NAME COUNT_STAR SUM_TIMER_WAIT MIN_TIMER_WAIT AVG_TIMER_WAIT MAX_TIMER_WAIT
# # # # # # # # # # # # # #
select * from performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME select * from performance_schema.events_waits_summary_by_thread_by_event_name
where event_name='FOO'; where event_name='FOO';
THREAD_ID EVENT_NAME COUNT_STAR SUM_TIMER_WAIT MIN_TIMER_WAIT AVG_TIMER_WAIT MAX_TIMER_WAIT THREAD_ID EVENT_NAME COUNT_STAR SUM_TIMER_WAIT MIN_TIMER_WAIT AVG_TIMER_WAIT MAX_TIMER_WAIT
insert into performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME insert into performance_schema.events_waits_summary_by_thread_by_event_name
set event_name='FOO', thread_id=1, set event_name='FOO', thread_id=1,
count_star=1, sum_timer_wait=2, min_timer_wait=3, count_star=1, sum_timer_wait=2, min_timer_wait=3,
avg_timer_wait=4, max_timer_wait=5; avg_timer_wait=4, max_timer_wait=5;
ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME' ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_waits_summary_by_thread_by_event_name'
update performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME update performance_schema.events_waits_summary_by_thread_by_event_name
set count_star=12; set count_star=12;
ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME' ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_waits_summary_by_thread_by_event_name'
update performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME update performance_schema.events_waits_summary_by_thread_by_event_name
set count_star=12 where event_name like "FOO"; set count_star=12 where event_name like "FOO";
ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME' ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_waits_summary_by_thread_by_event_name'
delete from performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME delete from performance_schema.events_waits_summary_by_thread_by_event_name
where count_star=1; where count_star=1;
ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME' ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_waits_summary_by_thread_by_event_name'
delete from performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME; delete from performance_schema.events_waits_summary_by_thread_by_event_name;
ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME' ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_waits_summary_by_thread_by_event_name'
LOCK TABLES performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME READ; LOCK TABLES performance_schema.events_waits_summary_by_thread_by_event_name READ;
ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME' ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'events_waits_summary_by_thread_by_event_name'
UNLOCK TABLES; UNLOCK TABLES;
LOCK TABLES performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME WRITE; LOCK TABLES performance_schema.events_waits_summary_by_thread_by_event_name WRITE;
ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME' ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'events_waits_summary_by_thread_by_event_name'
UNLOCK TABLES; UNLOCK TABLES;

32
mysql-test/suite/perfschema/r/dml_ews_global_by_event_name.result
View File

@ -1,28 +1,28 @@
select * from performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME select * from performance_schema.events_waits_summary_global_by_event_name
where event_name like 'Wait/Synch/%' limit 1; where event_name like 'Wait/Synch/%' limit 1;
EVENT_NAME COUNT_STAR SUM_TIMER_WAIT MIN_TIMER_WAIT AVG_TIMER_WAIT MAX_TIMER_WAIT EVENT_NAME COUNT_STAR SUM_TIMER_WAIT MIN_TIMER_WAIT AVG_TIMER_WAIT MAX_TIMER_WAIT
# # # # # # # # # # # #
select * from performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME select * from performance_schema.events_waits_summary_global_by_event_name
where event_name='FOO'; where event_name='FOO';
EVENT_NAME COUNT_STAR SUM_TIMER_WAIT MIN_TIMER_WAIT AVG_TIMER_WAIT MAX_TIMER_WAIT EVENT_NAME COUNT_STAR SUM_TIMER_WAIT MIN_TIMER_WAIT AVG_TIMER_WAIT MAX_TIMER_WAIT
insert into performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME insert into performance_schema.events_waits_summary_global_by_event_name
set event_name='FOO', count_star=1, sum_timer_wait=2, min_timer_wait=3, set event_name='FOO', count_star=1, sum_timer_wait=2, min_timer_wait=3,
avg_timer_wait=4, max_timer_wait=5; avg_timer_wait=4, max_timer_wait=5;
ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME' ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_waits_summary_global_by_event_name'
update performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME update performance_schema.events_waits_summary_global_by_event_name
set count_star=12; set count_star=12;
ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME' ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_waits_summary_global_by_event_name'
update performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME update performance_schema.events_waits_summary_global_by_event_name
set count_star=12 where event_name like "FOO"; set count_star=12 where event_name like "FOO";
ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME' ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_waits_summary_global_by_event_name'
delete from performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME delete from performance_schema.events_waits_summary_global_by_event_name
where count_star=1; where count_star=1;
ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME' ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_waits_summary_global_by_event_name'
delete from performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME; delete from performance_schema.events_waits_summary_global_by_event_name;
ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME' ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_waits_summary_global_by_event_name'
LOCK TABLES performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME READ; LOCK TABLES performance_schema.events_waits_summary_global_by_event_name READ;
ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME' ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'events_waits_summary_global_by_event_name'
UNLOCK TABLES; UNLOCK TABLES;
LOCK TABLES performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME WRITE; LOCK TABLES performance_schema.events_waits_summary_global_by_event_name WRITE;
ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME' ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'events_waits_summary_global_by_event_name'
UNLOCK TABLES; UNLOCK TABLES;

28
mysql-test/suite/perfschema/r/dml_file_instances.result
View File

@ -1,23 +1,23 @@
select * from performance_schema.FILE_INSTANCES limit 1; select * from performance_schema.file_instances limit 1;
FILE_NAME EVENT_NAME OPEN_COUNT FILE_NAME EVENT_NAME OPEN_COUNT
# # # # # #
select * from performance_schema.FILE_INSTANCES select * from performance_schema.file_instances
where file_name='FOO'; where file_name='FOO';
FILE_NAME EVENT_NAME OPEN_COUNT FILE_NAME EVENT_NAME OPEN_COUNT
insert into performance_schema.FILE_INSTANCES insert into performance_schema.file_instances
set file_name='FOO', event_name='BAR', open_count=12; set file_name='FOO', event_name='BAR', open_count=12;
ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'FILE_INSTANCES' ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'file_instances'
update performance_schema.FILE_INSTANCES update performance_schema.file_instances
set file_name='FOO'; set file_name='FOO';
ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'FILE_INSTANCES' ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'file_instances'
delete from performance_schema.FILE_INSTANCES delete from performance_schema.file_instances
where event_name like "wait/%"; where event_name like "wait/%";
ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'FILE_INSTANCES' ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'file_instances'
delete from performance_schema.FILE_INSTANCES; delete from performance_schema.file_instances;
ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'FILE_INSTANCES' ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'file_instances'
LOCK TABLES performance_schema.FILE_INSTANCES READ; LOCK TABLES performance_schema.file_instances READ;
ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'FILE_INSTANCES' ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'file_instances'
UNLOCK TABLES; UNLOCK TABLES;
LOCK TABLES performance_schema.FILE_INSTANCES WRITE; LOCK TABLES performance_schema.file_instances WRITE;
ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'FILE_INSTANCES' ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'file_instances'
UNLOCK TABLES; UNLOCK TABLES;

32
mysql-test/suite/perfschema/r/dml_file_summary_by_event_name.result
View File

@ -1,28 +1,28 @@
select * from performance_schema.FILE_SUMMARY_BY_EVENT_NAME select * from performance_schema.file_summary_by_event_name
where event_name like 'Wait/io/%' limit 1; where event_name like 'Wait/io/%' limit 1;
EVENT_NAME COUNT_READ COUNT_WRITE SUM_NUMBER_OF_BYTES_READ SUM_NUMBER_OF_BYTES_WRITE EVENT_NAME COUNT_READ COUNT_WRITE SUM_NUMBER_OF_BYTES_READ SUM_NUMBER_OF_BYTES_WRITE
# # # # # # # # # #
select * from performance_schema.FILE_SUMMARY_BY_EVENT_NAME select * from performance_schema.file_summary_by_event_name
where event_name='FOO'; where event_name='FOO';
EVENT_NAME COUNT_READ COUNT_WRITE SUM_NUMBER_OF_BYTES_READ SUM_NUMBER_OF_BYTES_WRITE EVENT_NAME COUNT_READ COUNT_WRITE SUM_NUMBER_OF_BYTES_READ SUM_NUMBER_OF_BYTES_WRITE
insert into performance_schema.FILE_SUMMARY_BY_EVENT_NAME insert into performance_schema.file_summary_by_event_name
set event_name='FOO', count_read=1, count_write=2, set event_name='FOO', count_read=1, count_write=2,
sum_number_of_bytes_read=4, sum_number_of_bytes_write=5; sum_number_of_bytes_read=4, sum_number_of_bytes_write=5;
ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'FILE_SUMMARY_BY_EVENT_NAME' ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'file_summary_by_event_name'
update performance_schema.FILE_SUMMARY_BY_EVENT_NAME update performance_schema.file_summary_by_event_name
set count_read=12; set count_read=12;
ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'FILE_SUMMARY_BY_EVENT_NAME' ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'file_summary_by_event_name'
update performance_schema.FILE_SUMMARY_BY_EVENT_NAME update performance_schema.file_summary_by_event_name
set count_write=12 where event_name like "FOO"; set count_write=12 where event_name like "FOO";
ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'FILE_SUMMARY_BY_EVENT_NAME' ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'file_summary_by_event_name'
delete from performance_schema.FILE_SUMMARY_BY_EVENT_NAME delete from performance_schema.file_summary_by_event_name
where count_read=1; where count_read=1;
ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'FILE_SUMMARY_BY_EVENT_NAME' ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'file_summary_by_event_name'
delete from performance_schema.FILE_SUMMARY_BY_EVENT_NAME; delete from performance_schema.file_summary_by_event_name;
ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'FILE_SUMMARY_BY_EVENT_NAME' ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'file_summary_by_event_name'
LOCK TABLES performance_schema.FILE_SUMMARY_BY_EVENT_NAME READ; LOCK TABLES performance_schema.file_summary_by_event_name READ;
ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'FILE_SUMMARY_BY_EVENT_NAME' ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'file_summary_by_event_name'
UNLOCK TABLES; UNLOCK TABLES;
LOCK TABLES performance_schema.FILE_SUMMARY_BY_EVENT_NAME WRITE; LOCK TABLES performance_schema.file_summary_by_event_name WRITE;
ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'FILE_SUMMARY_BY_EVENT_NAME' ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'file_summary_by_event_name'
UNLOCK TABLES; UNLOCK TABLES;

32
mysql-test/suite/perfschema/r/dml_file_summary_by_instance.result
View File

@ -1,28 +1,28 @@
select * from performance_schema.FILE_SUMMARY_BY_INSTANCE select * from performance_schema.file_summary_by_instance
where event_name like 'Wait/io/%' limit 1; where event_name like 'Wait/io/%' limit 1;
FILE_NAME EVENT_NAME COUNT_READ COUNT_WRITE SUM_NUMBER_OF_BYTES_READ SUM_NUMBER_OF_BYTES_WRITE FILE_NAME EVENT_NAME COUNT_READ COUNT_WRITE SUM_NUMBER_OF_BYTES_READ SUM_NUMBER_OF_BYTES_WRITE
# # # # # # # # # # # #
select * from performance_schema.FILE_SUMMARY_BY_INSTANCE select * from performance_schema.file_summary_by_instance
where event_name='FOO'; where event_name='FOO';
FILE_NAME EVENT_NAME COUNT_READ COUNT_WRITE SUM_NUMBER_OF_BYTES_READ SUM_NUMBER_OF_BYTES_WRITE FILE_NAME EVENT_NAME COUNT_READ COUNT_WRITE SUM_NUMBER_OF_BYTES_READ SUM_NUMBER_OF_BYTES_WRITE
insert into performance_schema.FILE_SUMMARY_BY_INSTANCE insert into performance_schema.file_summary_by_instance
set event_name='FOO', count_read=1, count_write=2, set event_name='FOO', count_read=1, count_write=2,
sum_number_of_bytes_read=4, sum_number_of_bytes_write=5; sum_number_of_bytes_read=4, sum_number_of_bytes_write=5;
ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'FILE_SUMMARY_BY_INSTANCE' ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'file_summary_by_instance'
update performance_schema.FILE_SUMMARY_BY_INSTANCE update performance_schema.file_summary_by_instance
set count_read=12; set count_read=12;
ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'FILE_SUMMARY_BY_INSTANCE' ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'file_summary_by_instance'
update performance_schema.FILE_SUMMARY_BY_INSTANCE update performance_schema.file_summary_by_instance
set count_write=12 where event_name like "FOO"; set count_write=12 where event_name like "FOO";
ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'FILE_SUMMARY_BY_INSTANCE' ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'file_summary_by_instance'
delete from performance_schema.FILE_SUMMARY_BY_INSTANCE delete from performance_schema.file_summary_by_instance
where count_read=1; where count_read=1;
ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'FILE_SUMMARY_BY_INSTANCE' ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'file_summary_by_instance'
delete from performance_schema.FILE_SUMMARY_BY_INSTANCE; delete from performance_schema.file_summary_by_instance;
ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'FILE_SUMMARY_BY_INSTANCE' ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'file_summary_by_instance'
LOCK TABLES performance_schema.FILE_SUMMARY_BY_INSTANCE READ; LOCK TABLES performance_schema.file_summary_by_instance READ;
ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'FILE_SUMMARY_BY_INSTANCE' ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'file_summary_by_instance'
UNLOCK TABLES; UNLOCK TABLES;
LOCK TABLES performance_schema.FILE_SUMMARY_BY_INSTANCE WRITE; LOCK TABLES performance_schema.file_summary_by_instance WRITE;
ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'FILE_SUMMARY_BY_INSTANCE' ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'file_summary_by_instance'
UNLOCK TABLES; UNLOCK TABLES;

28
mysql-test/suite/perfschema/r/dml_mutex_instances.result
View File

@ -1,23 +1,23 @@
select * from performance_schema.MUTEX_INSTANCES limit 1; select * from performance_schema.mutex_instances limit 1;
NAME OBJECT_INSTANCE_BEGIN LOCKED_BY_THREAD_ID NAME OBJECT_INSTANCE_BEGIN LOCKED_BY_THREAD_ID
# # # # # #
select * from performance_schema.MUTEX_INSTANCES select * from performance_schema.mutex_instances
where name='FOO'; where name='FOO';
NAME OBJECT_INSTANCE_BEGIN LOCKED_BY_THREAD_ID NAME OBJECT_INSTANCE_BEGIN LOCKED_BY_THREAD_ID
insert into performance_schema.MUTEX_INSTANCES insert into performance_schema.mutex_instances
set name='FOO', object_instance_begin=12; set name='FOO', object_instance_begin=12;
ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'MUTEX_INSTANCES' ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'mutex_instances'
update performance_schema.MUTEX_INSTANCES update performance_schema.mutex_instances
set name='FOO'; set name='FOO';
ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'MUTEX_INSTANCES' ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'mutex_instances'
delete from performance_schema.MUTEX_INSTANCES delete from performance_schema.mutex_instances
where name like "wait/%"; where name like "wait/%";
ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'MUTEX_INSTANCES' ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'mutex_instances'
delete from performance_schema.MUTEX_INSTANCES; delete from performance_schema.mutex_instances;
ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'MUTEX_INSTANCES' ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'mutex_instances'
LOCK TABLES performance_schema.MUTEX_INSTANCES READ; LOCK TABLES performance_schema.mutex_instances READ;
ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'MUTEX_INSTANCES' ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'mutex_instances'
UNLOCK TABLES; UNLOCK TABLES;
LOCK TABLES performance_schema.MUTEX_INSTANCES WRITE; LOCK TABLES performance_schema.mutex_instances WRITE;
ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'MUTEX_INSTANCES' ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'mutex_instances'
UNLOCK TABLES; UNLOCK TABLES;

28
mysql-test/suite/perfschema/r/dml_performance_timers.result
View File

@ -1,29 +1,29 @@
select * from performance_schema.PERFORMANCE_TIMERS; select * from performance_schema.performance_timers;
TIMER_NAME TIMER_FREQUENCY TIMER_RESOLUTION TIMER_OVERHEAD TIMER_NAME TIMER_FREQUENCY TIMER_RESOLUTION TIMER_OVERHEAD
CYCLE <frequency> <resolution> <overhead> CYCLE <frequency> <resolution> <overhead>
NANOSECOND <frequency> <resolution> <overhead> NANOSECOND <frequency> <resolution> <overhead>
MICROSECOND <frequency> <resolution> <overhead> MICROSECOND <frequency> <resolution> <overhead>
MILLISECOND <frequency> <resolution> <overhead> MILLISECOND <frequency> <resolution> <overhead>
TICK <frequency> <resolution> <overhead> TICK <frequency> <resolution> <overhead>
select * from performance_schema.PERFORMANCE_TIMERS select * from performance_schema.performance_timers
where timer_name='CYCLE'; where timer_name='CYCLE';
TIMER_NAME TIMER_FREQUENCY TIMER_RESOLUTION TIMER_OVERHEAD TIMER_NAME TIMER_FREQUENCY TIMER_RESOLUTION TIMER_OVERHEAD
CYCLE <frequency> <resolution> <overhead> CYCLE <frequency> <resolution> <overhead>
insert into performance_schema.PERFORMANCE_TIMERS insert into performance_schema.performance_timers
set timer_name='FOO', timer_frequency=1, set timer_name='FOO', timer_frequency=1,
timer_resolution=2, timer_overhead=3; timer_resolution=2, timer_overhead=3;
ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'PERFORMANCE_TIMERS' ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'performance_timers'
update performance_schema.PERFORMANCE_TIMERS update performance_schema.performance_timers
set timer_frequency=12 where timer_name='CYCLE'; set timer_frequency=12 where timer_name='CYCLE';
ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'PERFORMANCE_TIMERS' ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'performance_timers'
delete from performance_schema.PERFORMANCE_TIMERS; delete from performance_schema.performance_timers;
ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'PERFORMANCE_TIMERS' ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'performance_timers'
delete from performance_schema.PERFORMANCE_TIMERS delete from performance_schema.performance_timers
where timer_name='CYCLE'; where timer_name='CYCLE';
ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'PERFORMANCE_TIMERS' ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'performance_timers'
LOCK TABLES performance_schema.PERFORMANCE_TIMERS READ; LOCK TABLES performance_schema.performance_timers READ;
ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'PERFORMANCE_TIMERS' ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'performance_timers'
UNLOCK TABLES; UNLOCK TABLES;
LOCK TABLES performance_schema.PERFORMANCE_TIMERS WRITE; LOCK TABLES performance_schema.performance_timers WRITE;
ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'PERFORMANCE_TIMERS' ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'performance_timers'
UNLOCK TABLES; UNLOCK TABLES;

28
mysql-test/suite/perfschema/r/dml_rwlock_instances.result
View File

@ -1,23 +1,23 @@
select * from performance_schema.RWLOCK_INSTANCES limit 1; select * from performance_schema.rwlock_instances limit 1;
NAME OBJECT_INSTANCE_BEGIN WRITE_LOCKED_BY_THREAD_ID READ_LOCKED_BY_COUNT NAME OBJECT_INSTANCE_BEGIN WRITE_LOCKED_BY_THREAD_ID READ_LOCKED_BY_COUNT
# # # # # # # #
select * from performance_schema.RWLOCK_INSTANCES select * from performance_schema.rwlock_instances
where name='FOO'; where name='FOO';
NAME OBJECT_INSTANCE_BEGIN WRITE_LOCKED_BY_THREAD_ID READ_LOCKED_BY_COUNT NAME OBJECT_INSTANCE_BEGIN WRITE_LOCKED_BY_THREAD_ID READ_LOCKED_BY_COUNT
insert into performance_schema.RWLOCK_INSTANCES insert into performance_schema.rwlock_instances
set name='FOO', object_instance_begin=12; set name='FOO', object_instance_begin=12;
ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'RWLOCK_INSTANCES' ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'rwlock_instances'
update performance_schema.RWLOCK_INSTANCES update performance_schema.rwlock_instances
set name='FOO'; set name='FOO';
ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'RWLOCK_INSTANCES' ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'rwlock_instances'
delete from performance_schema.RWLOCK_INSTANCES delete from performance_schema.rwlock_instances
where name like "wait/%"; where name like "wait/%";
ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'RWLOCK_INSTANCES' ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'rwlock_instances'
delete from performance_schema.RWLOCK_INSTANCES; delete from performance_schema.rwlock_instances;
ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'RWLOCK_INSTANCES' ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'rwlock_instances'
LOCK TABLES performance_schema.RWLOCK_INSTANCES READ; LOCK TABLES performance_schema.rwlock_instances READ;
ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'RWLOCK_INSTANCES' ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'rwlock_instances'
UNLOCK TABLES; UNLOCK TABLES;
LOCK TABLES performance_schema.RWLOCK_INSTANCES WRITE; LOCK TABLES performance_schema.rwlock_instances WRITE;
ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'RWLOCK_INSTANCES' ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'rwlock_instances'
UNLOCK TABLES; UNLOCK TABLES;

28
mysql-test/suite/perfschema/r/dml_setup_consumers.result
View File

@ -1,4 +1,4 @@
select * from performance_schema.SETUP_CONSUMERS; select * from performance_schema.setup_consumers;
NAME ENABLED NAME ENABLED
events_waits_current YES events_waits_current YES
events_waits_history YES events_waits_history YES
@ -8,11 +8,11 @@ events_waits_summary_by_event_name YES
events_waits_summary_by_instance YES events_waits_summary_by_instance YES
file_summary_by_event_name YES file_summary_by_event_name YES
file_summary_by_instance YES file_summary_by_instance YES
select * from performance_schema.SETUP_CONSUMERS select * from performance_schema.setup_consumers
where name='events_waits_current'; where name='events_waits_current';
NAME ENABLED NAME ENABLED
events_waits_current YES events_waits_current YES
select * from performance_schema.SETUP_CONSUMERS select * from performance_schema.setup_consumers
where enabled='YES'; where enabled='YES';
NAME ENABLED NAME ENABLED
events_waits_current YES events_waits_current YES
@ -23,23 +23,23 @@ events_waits_summary_by_event_name YES
events_waits_summary_by_instance YES events_waits_summary_by_instance YES
file_summary_by_event_name YES file_summary_by_event_name YES
file_summary_by_instance YES file_summary_by_instance YES
select * from performance_schema.SETUP_CONSUMERS select * from performance_schema.setup_consumers
where enabled='NO'; where enabled='NO';
NAME ENABLED NAME ENABLED
insert into performance_schema.SETUP_CONSUMERS insert into performance_schema.setup_consumers
set name='FOO', enabled='YES'; set name='FOO', enabled='YES';
ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'SETUP_CONSUMERS' ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'setup_consumers'
update performance_schema.SETUP_CONSUMERS update performance_schema.setup_consumers
set name='FOO'; set name='FOO';
ERROR HY000: Invalid performance_schema usage. ERROR HY000: Invalid performance_schema usage.
update performance_schema.SETUP_CONSUMERS update performance_schema.setup_consumers
set enabled='YES'; set enabled='YES';
delete from performance_schema.SETUP_CONSUMERS; delete from performance_schema.setup_consumers;
ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'SETUP_CONSUMERS' ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'setup_consumers'
delete from performance_schema.SETUP_CONSUMERS delete from performance_schema.setup_consumers
where name='events_waits_current'; where name='events_waits_current';
ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'SETUP_CONSUMERS' ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'setup_consumers'
LOCK TABLES performance_schema.SETUP_CONSUMERS READ; LOCK TABLES performance_schema.setup_consumers READ;
UNLOCK TABLES; UNLOCK TABLES;
LOCK TABLES performance_schema.SETUP_CONSUMERS WRITE; LOCK TABLES performance_schema.setup_consumers WRITE;
UNLOCK TABLES; UNLOCK TABLES;

38
mysql-test/suite/perfschema/r/dml_setup_instruments.result
View File

@ -1,5 +1,5 @@
select * from performance_schema.SETUP_INSTRUMENTS; select * from performance_schema.setup_instruments;
select * from performance_schema.SETUP_INSTRUMENTS select * from performance_schema.setup_instruments
where name like 'Wait/Synch/Mutex/sql/%' where name like 'Wait/Synch/Mutex/sql/%'
and name not in ('wait/synch/mutex/sql/DEBUG_SYNC::mutex') and name not in ('wait/synch/mutex/sql/DEBUG_SYNC::mutex')
order by name limit 10; order by name limit 10;
@ -14,7 +14,7 @@ wait/synch/mutex/sql/LOCK_audit_mask YES YES
wait/synch/mutex/sql/LOCK_connection_count YES YES wait/synch/mutex/sql/LOCK_connection_count YES YES
wait/synch/mutex/sql/LOCK_crypt YES YES wait/synch/mutex/sql/LOCK_crypt YES YES
wait/synch/mutex/sql/LOCK_delayed_create YES YES wait/synch/mutex/sql/LOCK_delayed_create YES YES
select * from performance_schema.SETUP_INSTRUMENTS select * from performance_schema.setup_instruments
where name like 'Wait/Synch/Rwlock/sql/%' where name like 'Wait/Synch/Rwlock/sql/%'
and name not in ('wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock') and name not in ('wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock')
order by name limit 10; order by name limit 10;
@ -29,7 +29,7 @@ wait/synch/rwlock/sql/MDL_context::LOCK_waiting_for YES YES
wait/synch/rwlock/sql/MDL_lock::rwlock YES YES wait/synch/rwlock/sql/MDL_lock::rwlock YES YES
wait/synch/rwlock/sql/Query_cache_query::lock YES YES wait/synch/rwlock/sql/Query_cache_query::lock YES YES
wait/synch/rwlock/sql/THR_LOCK_servers YES YES wait/synch/rwlock/sql/THR_LOCK_servers YES YES
select * from performance_schema.SETUP_INSTRUMENTS select * from performance_schema.setup_instruments
where name like 'Wait/Synch/Cond/sql/%' where name like 'Wait/Synch/Cond/sql/%'
and name not in ( and name not in (
'wait/synch/cond/sql/COND_handler_count', 'wait/synch/cond/sql/COND_handler_count',
@ -46,29 +46,29 @@ wait/synch/cond/sql/COND_thread_count YES YES
wait/synch/cond/sql/Delayed_insert::cond YES YES wait/synch/cond/sql/Delayed_insert::cond YES YES
wait/synch/cond/sql/Delayed_insert::cond_client YES YES wait/synch/cond/sql/Delayed_insert::cond_client YES YES
wait/synch/cond/sql/Event_scheduler::COND_state YES YES wait/synch/cond/sql/Event_scheduler::COND_state YES YES
select * from performance_schema.SETUP_INSTRUMENTS select * from performance_schema.setup_instruments
where name='Wait'; where name='Wait';
select * from performance_schema.SETUP_INSTRUMENTS select * from performance_schema.setup_instruments
where enabled='YES'; where enabled='YES';
insert into performance_schema.SETUP_INSTRUMENTS insert into performance_schema.setup_instruments
set name='FOO', enabled='YES', timed='YES'; set name='FOO', enabled='YES', timed='YES';
ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'SETUP_INSTRUMENTS' ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'setup_instruments'
update performance_schema.SETUP_INSTRUMENTS update performance_schema.setup_instruments
set name='FOO'; set name='FOO';
ERROR HY000: Invalid performance_schema usage. ERROR HY000: Invalid performance_schema usage.
update performance_schema.SETUP_INSTRUMENTS update performance_schema.setup_instruments
set enabled='NO'; set enabled='NO';
update performance_schema.SETUP_INSTRUMENTS update performance_schema.setup_instruments
set timed='NO'; set timed='NO';
select * from performance_schema.SETUP_INSTRUMENTS; select * from performance_schema.setup_instruments;
update performance_schema.SETUP_INSTRUMENTS update performance_schema.setup_instruments
set enabled='YES', timed='YES'; set enabled='YES', timed='YES';
delete from performance_schema.SETUP_INSTRUMENTS; delete from performance_schema.setup_instruments;
ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'SETUP_INSTRUMENTS' ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'setup_instruments'
delete from performance_schema.SETUP_INSTRUMENTS delete from performance_schema.setup_instruments
where name like 'Wait/Synch/%'; where name like 'Wait/Synch/%';
ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'SETUP_INSTRUMENTS' ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'setup_instruments'
LOCK TABLES performance_schema.SETUP_INSTRUMENTS READ; LOCK TABLES performance_schema.setup_instruments READ;
UNLOCK TABLES; UNLOCK TABLES;
LOCK TABLES performance_schema.SETUP_INSTRUMENTS WRITE; LOCK TABLES performance_schema.setup_instruments WRITE;
UNLOCK TABLES; UNLOCK TABLES;

30
mysql-test/suite/perfschema/r/dml_setup_timers.result
View File

@ -1,33 +1,33 @@
select * from performance_schema.SETUP_TIMERS; select * from performance_schema.setup_timers;
NAME TIMER_NAME NAME TIMER_NAME
wait CYCLE wait CYCLE
select * from performance_schema.SETUP_TIMERS select * from performance_schema.setup_timers
where name='Wait'; where name='Wait';
NAME TIMER_NAME NAME TIMER_NAME
wait CYCLE wait CYCLE
select * from performance_schema.SETUP_TIMERS select * from performance_schema.setup_timers
where timer_name='CYCLE'; where timer_name='CYCLE';
NAME TIMER_NAME NAME TIMER_NAME
wait CYCLE wait CYCLE
insert into performance_schema.SETUP_TIMERS insert into performance_schema.setup_timers
set name='FOO', timer_name='CYCLE'; set name='FOO', timer_name='CYCLE';
ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'SETUP_TIMERS' ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'setup_timers'
update performance_schema.SETUP_TIMERS update performance_schema.setup_timers
set name='FOO'; set name='FOO';
ERROR HY000: Invalid performance_schema usage. ERROR HY000: Invalid performance_schema usage.
update performance_schema.SETUP_TIMERS update performance_schema.setup_timers
set timer_name='MILLISECOND'; set timer_name='MILLISECOND';
select * from performance_schema.SETUP_TIMERS; select * from performance_schema.setup_timers;
NAME TIMER_NAME NAME TIMER_NAME
wait MILLISECOND wait MILLISECOND
update performance_schema.SETUP_TIMERS update performance_schema.setup_timers
set timer_name='CYCLE'; set timer_name='CYCLE';
delete from performance_schema.SETUP_TIMERS; delete from performance_schema.setup_timers;
ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'SETUP_TIMERS' ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'setup_timers'
delete from performance_schema.SETUP_TIMERS delete from performance_schema.setup_timers
where name='Wait'; where name='Wait';
ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'SETUP_TIMERS' ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'setup_timers'
LOCK TABLES performance_schema.SETUP_TIMERS READ; LOCK TABLES performance_schema.setup_timers READ;
UNLOCK TABLES; UNLOCK TABLES;
LOCK TABLES performance_schema.SETUP_TIMERS WRITE; LOCK TABLES performance_schema.setup_timers WRITE;
UNLOCK TABLES; UNLOCK TABLES;

32
mysql-test/suite/perfschema/r/dml_threads.result
View File

@ -1,27 +1,27 @@
select * from performance_schema.THREADS select * from performance_schema.threads
where name like 'Thread/%' limit 1; where name like 'Thread/%' limit 1;
THREAD_ID PROCESSLIST_ID NAME THREAD_ID PROCESSLIST_ID NAME
# # # # # #
select * from performance_schema.THREADS select * from performance_schema.threads
where name='FOO'; where name='FOO';
THREAD_ID PROCESSLIST_ID NAME THREAD_ID PROCESSLIST_ID NAME
insert into performance_schema.THREADS insert into performance_schema.threads
set name='FOO', thread_id=1, processlist_id=2; set name='FOO', thread_id=1, processlist_id=2;
ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'THREADS' ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'threads'
update performance_schema.THREADS update performance_schema.threads
set thread_id=12; set thread_id=12;
ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'THREADS' ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'threads'
update performance_schema.THREADS update performance_schema.threads
set thread_id=12 where name like "FOO"; set thread_id=12 where name like "FOO";
ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'THREADS' ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'threads'
delete from performance_schema.THREADS delete from performance_schema.threads
where id=1; where id=1;
ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'THREADS' ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'threads'
delete from performance_schema.THREADS; delete from performance_schema.threads;
ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'THREADS' ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'threads'
LOCK TABLES performance_schema.THREADS READ; LOCK TABLES performance_schema.threads READ;
ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'THREADS' ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'threads'
UNLOCK TABLES; UNLOCK TABLES;
LOCK TABLES performance_schema.THREADS WRITE; LOCK TABLES performance_schema.threads WRITE;
ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'THREADS' ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'threads'
UNLOCK TABLES; UNLOCK TABLES;

48
mysql-test/suite/perfschema/r/func_file_io.result
View File

@ -1,18 +1,18 @@
UPDATE performance_schema.SETUP_INSTRUMENTS SET enabled = 'NO', timed = 'YES'; UPDATE performance_schema.setup_instruments SET enabled = 'NO', timed = 'YES';
UPDATE performance_schema.SETUP_INSTRUMENTS SET enabled = 'YES' UPDATE performance_schema.setup_instruments SET enabled = 'YES'
WHERE name LIKE 'wait/io/file/%'; WHERE name LIKE 'wait/io/file/%';
DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (id INT PRIMARY KEY, b CHAR(100) DEFAULT 'initial value') CREATE TABLE t1 (id INT PRIMARY KEY, b CHAR(100) DEFAULT 'initial value')
ENGINE=MyISAM; ENGINE=MyISAM;
INSERT INTO t1 (id) VALUES (1), (2), (3), (4), (5), (6), (7), (8); INSERT INTO t1 (id) VALUES (1), (2), (3), (4), (5), (6), (7), (8);
TRUNCATE TABLE performance_schema.EVENTS_WAITS_HISTORY_LONG; TRUNCATE TABLE performance_schema.events_waits_history_long;
TRUNCATE TABLE performance_schema.EVENTS_WAITS_HISTORY; TRUNCATE TABLE performance_schema.events_waits_history;
TRUNCATE TABLE performance_schema.EVENTS_WAITS_CURRENT; TRUNCATE TABLE performance_schema.events_waits_current;
SELECT * FROM t1 WHERE id = 1; SELECT * FROM t1 WHERE id = 1;
id b id b
1 initial value 1 initial value
SET @before_count = (SELECT SUM(TIMER_WAIT) SET @before_count = (SELECT SUM(TIMER_WAIT)
FROM performance_schema.EVENTS_WAITS_HISTORY_LONG FROM performance_schema.events_waits_history_long
WHERE (EVENT_NAME = 'wait/io/file/myisam/dfile') WHERE (EVENT_NAME = 'wait/io/file/myisam/dfile')
AND (OBJECT_NAME LIKE '%t1.MYD')); AND (OBJECT_NAME LIKE '%t1.MYD'));
SELECT IF(@before_count > 0, 'Success', 'Failure') has_instrumentation; SELECT IF(@before_count > 0, 'Success', 'Failure') has_instrumentation;
@ -24,15 +24,15 @@ id b
2 initial value 2 initial value
3 initial value 3 initial value
SET @after_count = (SELECT SUM(TIMER_WAIT) SET @after_count = (SELECT SUM(TIMER_WAIT)
FROM performance_schema.EVENTS_WAITS_HISTORY_LONG FROM performance_schema.events_waits_history_long
WHERE (EVENT_NAME = 'wait/io/file/myisam/dfile') WHERE (EVENT_NAME = 'wait/io/file/myisam/dfile')
AND (OBJECT_NAME LIKE '%t1.MYD') AND (1 = 1)); AND (OBJECT_NAME LIKE '%t1.MYD') AND (1 = 1));
SELECT IF((@after_count - @before_count) > 0, 'Success', 'Failure') test_ff1_timed; SELECT IF((@after_count - @before_count) > 0, 'Success', 'Failure') test_ff1_timed;
test_ff1_timed test_ff1_timed
Success Success
UPDATE performance_schema.SETUP_INSTRUMENTS SET enabled='NO'; UPDATE performance_schema.setup_instruments SET enabled='NO';
SET @before_count = (SELECT SUM(TIMER_WAIT) SET @before_count = (SELECT SUM(TIMER_WAIT)
FROM performance_schema.EVENTS_WAITS_HISTORY_LONG FROM performance_schema.events_waits_history_long
WHERE (EVENT_NAME = 'wait/io/file/myisam/dfile') WHERE (EVENT_NAME = 'wait/io/file/myisam/dfile')
AND (OBJECT_NAME LIKE '%t1.MYD') AND (2 = 2)); AND (OBJECT_NAME LIKE '%t1.MYD') AND (2 = 2));
SELECT * FROM t1 WHERE id < 6; SELECT * FROM t1 WHERE id < 6;
@ -43,40 +43,40 @@ id b
4 initial value 4 initial value
5 initial value 5 initial value
SET @after_count = (SELECT SUM(TIMER_WAIT) SET @after_count = (SELECT SUM(TIMER_WAIT)
FROM performance_schema.EVENTS_WAITS_HISTORY_LONG FROM performance_schema.events_waits_history_long
WHERE (EVENT_NAME = 'wait/io/file/myisam/dfile') WHERE (EVENT_NAME = 'wait/io/file/myisam/dfile')
AND (OBJECT_NAME LIKE '%t1.MYD') AND (3 = 3)); AND (OBJECT_NAME LIKE '%t1.MYD') AND (3 = 3));
SELECT IF((COALESCE(@after_count, 0) - COALESCE(@before_count, 0)) = 0, 'Success', 'Failure') test_ff2_timed; SELECT IF((COALESCE(@after_count, 0) - COALESCE(@before_count, 0)) = 0, 'Success', 'Failure') test_ff2_timed;
test_ff2_timed test_ff2_timed
Success Success
UPDATE performance_schema.SETUP_INSTRUMENTS SET enabled = 'YES' UPDATE performance_schema.setup_instruments SET enabled = 'YES'
WHERE name LIKE 'wait/io/file/%'; WHERE name LIKE 'wait/io/file/%';
UPDATE performance_schema.SETUP_INSTRUMENTS SET timed = 'NO'; UPDATE performance_schema.setup_instruments SET timed = 'NO';
TRUNCATE TABLE performance_schema.EVENTS_WAITS_HISTORY_LONG; TRUNCATE TABLE performance_schema.events_waits_history_long;
TRUNCATE TABLE performance_schema.EVENTS_WAITS_HISTORY; TRUNCATE TABLE performance_schema.events_waits_history;
TRUNCATE TABLE performance_schema.EVENTS_WAITS_CURRENT; TRUNCATE TABLE performance_schema.events_waits_current;
SELECT * FROM t1 WHERE id > 4; SELECT * FROM t1 WHERE id > 4;
id b id b
5 initial value 5 initial value
6 initial value 6 initial value
7 initial value 7 initial value
8 initial value 8 initial value
SELECT * FROM performance_schema.EVENTS_WAITS_HISTORY_LONG SELECT * FROM performance_schema.events_waits_history_long
WHERE TIMER_WAIT != NULL WHERE TIMER_WAIT != NULL
OR TIMER_START != NULL OR TIMER_START != NULL
OR TIMER_END != NULL; OR TIMER_END != NULL;
THREAD_ID EVENT_ID EVENT_NAME SOURCE TIMER_START TIMER_END TIMER_WAIT SPINS OBJECT_SCHEMA OBJECT_NAME OBJECT_TYPE OBJECT_INSTANCE_BEGIN NESTING_EVENT_ID OPERATION NUMBER_OF_BYTES FLAGS THREAD_ID EVENT_ID EVENT_NAME SOURCE TIMER_START TIMER_END TIMER_WAIT SPINS OBJECT_SCHEMA OBJECT_NAME OBJECT_TYPE OBJECT_INSTANCE_BEGIN NESTING_EVENT_ID OPERATION NUMBER_OF_BYTES FLAGS
SELECT * FROM performance_schema.EVENTS_WAITS_HISTORY SELECT * FROM performance_schema.events_waits_history
WHERE TIMER_WAIT != NULL WHERE TIMER_WAIT != NULL
OR TIMER_START != NULL OR TIMER_START != NULL
OR TIMER_END != NULL; OR TIMER_END != NULL;
THREAD_ID EVENT_ID EVENT_NAME SOURCE TIMER_START TIMER_END TIMER_WAIT SPINS OBJECT_SCHEMA OBJECT_NAME OBJECT_TYPE OBJECT_INSTANCE_BEGIN NESTING_EVENT_ID OPERATION NUMBER_OF_BYTES FLAGS THREAD_ID EVENT_ID EVENT_NAME SOURCE TIMER_START TIMER_END TIMER_WAIT SPINS OBJECT_SCHEMA OBJECT_NAME OBJECT_TYPE OBJECT_INSTANCE_BEGIN NESTING_EVENT_ID OPERATION NUMBER_OF_BYTES FLAGS
SELECT * FROM performance_schema.EVENTS_WAITS_CURRENT SELECT * FROM performance_schema.events_waits_current
WHERE TIMER_WAIT != NULL WHERE TIMER_WAIT != NULL
OR TIMER_START != NULL OR TIMER_START != NULL
OR TIMER_END != NULL; OR TIMER_END != NULL;
THREAD_ID EVENT_ID EVENT_NAME SOURCE TIMER_START TIMER_END TIMER_WAIT SPINS OBJECT_SCHEMA OBJECT_NAME OBJECT_TYPE OBJECT_INSTANCE_BEGIN NESTING_EVENT_ID OPERATION NUMBER_OF_BYTES FLAGS THREAD_ID EVENT_ID EVENT_NAME SOURCE TIMER_START TIMER_END TIMER_WAIT SPINS OBJECT_SCHEMA OBJECT_NAME OBJECT_TYPE OBJECT_INSTANCE_BEGIN NESTING_EVENT_ID OPERATION NUMBER_OF_BYTES FLAGS
UPDATE performance_schema.SETUP_INSTRUMENTS SET timed = 'YES'; UPDATE performance_schema.setup_instruments SET timed = 'YES';
SELECT * FROM t1 WHERE id < 4; SELECT * FROM t1 WHERE id < 4;
id b id b
1 initial value 1 initial value
@ -87,17 +87,17 @@ SELECT SUM(COUNT_READ) AS sum_count_read,
SUM(COUNT_WRITE) AS sum_count_write, SUM(COUNT_WRITE) AS sum_count_write,
SUM(SUM_NUMBER_OF_BYTES_READ) AS sum_num_bytes_read, SUM(SUM_NUMBER_OF_BYTES_READ) AS sum_num_bytes_read,
SUM(SUM_NUMBER_OF_BYTES_WRITE) AS sum_num_bytes_write SUM(SUM_NUMBER_OF_BYTES_WRITE) AS sum_num_bytes_write
FROM performance_schema.FILE_SUMMARY_BY_INSTANCE FROM performance_schema.file_summary_by_instance
WHERE FILE_NAME LIKE CONCAT('%', @@tmpdir, '%') ORDER BY NULL; WHERE FILE_NAME LIKE CONCAT('%', @@tmpdir, '%') ORDER BY NULL;
SELECT EVENT_NAME, COUNT_STAR, AVG_TIMER_WAIT, SUM_TIMER_WAIT SELECT EVENT_NAME, COUNT_STAR, AVG_TIMER_WAIT, SUM_TIMER_WAIT
FROM performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME FROM performance_schema.events_waits_summary_global_by_event_name
WHERE COUNT_STAR > 0 WHERE COUNT_STAR > 0
ORDER BY SUM_TIMER_WAIT DESC ORDER BY SUM_TIMER_WAIT DESC
LIMIT 10; LIMIT 10;
SELECT h.EVENT_NAME, SUM(h.TIMER_WAIT) TOTAL_WAIT SELECT h.EVENT_NAME, SUM(h.TIMER_WAIT) TOTAL_WAIT
FROM performance_schema.EVENTS_WAITS_HISTORY_LONG h FROM performance_schema.events_waits_history_long h
INNER JOIN performance_schema.THREADS p USING (THREAD_ID) INNER JOIN performance_schema.threads p USING (THREAD_ID)
WHERE p.PROCESSLIST_ID = 1 WHERE p.PROCESSLIST_ID = 1
GROUP BY h.EVENT_NAME GROUP BY h.EVENT_NAME
HAVING TOTAL_WAIT > 0; HAVING TOTAL_WAIT > 0;
UPDATE performance_schema.SETUP_INSTRUMENTS SET enabled = 'YES'; UPDATE performance_schema.setup_instruments SET enabled = 'YES';

50
mysql-test/suite/perfschema/r/func_mutex.result
View File

@ -1,19 +1,19 @@
UPDATE performance_schema.SETUP_INSTRUMENTS SET enabled = 'NO', timed = 'YES'; UPDATE performance_schema.setup_instruments SET enabled = 'NO', timed = 'YES';
UPDATE performance_schema.SETUP_INSTRUMENTS SET enabled = 'YES' UPDATE performance_schema.setup_instruments SET enabled = 'YES'
WHERE name LIKE 'wait/synch/mutex/%' WHERE name LIKE 'wait/synch/mutex/%'
OR name LIKE 'wait/synch/rwlock/%'; OR name LIKE 'wait/synch/rwlock/%';
DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (id INT PRIMARY KEY, b CHAR(100) DEFAULT 'initial value') CREATE TABLE t1 (id INT PRIMARY KEY, b CHAR(100) DEFAULT 'initial value')
ENGINE=MyISAM; ENGINE=MyISAM;
INSERT INTO t1 (id) VALUES (1), (2), (3), (4), (5), (6), (7), (8); INSERT INTO t1 (id) VALUES (1), (2), (3), (4), (5), (6), (7), (8);
TRUNCATE TABLE performance_schema.EVENTS_WAITS_HISTORY_LONG; TRUNCATE TABLE performance_schema.events_waits_history_long;
TRUNCATE TABLE performance_schema.EVENTS_WAITS_HISTORY; TRUNCATE TABLE performance_schema.events_waits_history;
TRUNCATE TABLE performance_schema.EVENTS_WAITS_CURRENT; TRUNCATE TABLE performance_schema.events_waits_current;
SELECT * FROM t1 WHERE id = 1; SELECT * FROM t1 WHERE id = 1;
id b id b
1 initial value 1 initial value
SET @before_count = (SELECT SUM(TIMER_WAIT) SET @before_count = (SELECT SUM(TIMER_WAIT)
FROM performance_schema.EVENTS_WAITS_HISTORY_LONG FROM performance_schema.events_waits_history_long
WHERE (EVENT_NAME = 'wait/synch/mutex/sql/LOCK_open')); WHERE (EVENT_NAME = 'wait/synch/mutex/sql/LOCK_open'));
SELECT * FROM t1; SELECT * FROM t1;
id b id b
@ -26,21 +26,21 @@ id b
7 initial value 7 initial value
8 initial value 8 initial value
SET @after_count = (SELECT SUM(TIMER_WAIT) SET @after_count = (SELECT SUM(TIMER_WAIT)
FROM performance_schema.EVENTS_WAITS_HISTORY_LONG FROM performance_schema.events_waits_history_long
WHERE (EVENT_NAME = 'wait/synch/mutex/sql/LOCK_open')); WHERE (EVENT_NAME = 'wait/synch/mutex/sql/LOCK_open'));
SELECT IF((@after_count - @before_count) > 0, 'Success', 'Failure') test_fm1_timed; SELECT IF((@after_count - @before_count) > 0, 'Success', 'Failure') test_fm1_timed;
test_fm1_timed test_fm1_timed
Success Success
UPDATE performance_schema.SETUP_INSTRUMENTS SET enabled = 'NO' UPDATE performance_schema.setup_instruments SET enabled = 'NO'
WHERE NAME = 'wait/synch/mutex/sql/LOCK_open'; WHERE NAME = 'wait/synch/mutex/sql/LOCK_open';
TRUNCATE TABLE performance_schema.EVENTS_WAITS_HISTORY_LONG; TRUNCATE TABLE performance_schema.events_waits_history_long;
TRUNCATE TABLE performance_schema.EVENTS_WAITS_HISTORY; TRUNCATE TABLE performance_schema.events_waits_history;
TRUNCATE TABLE performance_schema.EVENTS_WAITS_CURRENT; TRUNCATE TABLE performance_schema.events_waits_current;
SELECT * FROM t1 WHERE id = 1; SELECT * FROM t1 WHERE id = 1;
id b id b
1 initial value 1 initial value
SET @before_count = (SELECT SUM(TIMER_WAIT) SET @before_count = (SELECT SUM(TIMER_WAIT)
FROM performance_schema.EVENTS_WAITS_HISTORY_LONG FROM performance_schema.events_waits_history_long
WHERE (EVENT_NAME = 'wait/synch/mutex/sql/LOCK_open')); WHERE (EVENT_NAME = 'wait/synch/mutex/sql/LOCK_open'));
SELECT * FROM t1; SELECT * FROM t1;
id b id b
@ -53,19 +53,19 @@ id b
7 initial value 7 initial value
8 initial value 8 initial value
SET @after_count = (SELECT SUM(TIMER_WAIT) SET @after_count = (SELECT SUM(TIMER_WAIT)
FROM performance_schema.EVENTS_WAITS_HISTORY_LONG FROM performance_schema.events_waits_history_long
WHERE (EVENT_NAME = 'wait/synch/mutex/sql/LOCK_open')); WHERE (EVENT_NAME = 'wait/synch/mutex/sql/LOCK_open'));
SELECT IF((COALESCE(@after_count, 0) - COALESCE(@before_count, 0)) = 0, 'Success', 'Failure') test_fm2_timed; SELECT IF((COALESCE(@after_count, 0) - COALESCE(@before_count, 0)) = 0, 'Success', 'Failure') test_fm2_timed;
test_fm2_timed test_fm2_timed
Success Success
TRUNCATE TABLE performance_schema.EVENTS_WAITS_HISTORY_LONG; TRUNCATE TABLE performance_schema.events_waits_history_long;
TRUNCATE TABLE performance_schema.EVENTS_WAITS_HISTORY; TRUNCATE TABLE performance_schema.events_waits_history;
TRUNCATE TABLE performance_schema.EVENTS_WAITS_CURRENT; TRUNCATE TABLE performance_schema.events_waits_current;
SELECT * FROM t1 WHERE id = 1; SELECT * FROM t1 WHERE id = 1;
id b id b
1 initial value 1 initial value
SET @before_count = (SELECT SUM(TIMER_WAIT) SET @before_count = (SELECT SUM(TIMER_WAIT)
FROM performance_schema.EVENTS_WAITS_HISTORY_LONG FROM performance_schema.events_waits_history_long
WHERE (EVENT_NAME = 'wait/synch/rwlock/sql/LOCK_grant')); WHERE (EVENT_NAME = 'wait/synch/rwlock/sql/LOCK_grant'));
SELECT * FROM t1; SELECT * FROM t1;
id b id b
@ -78,21 +78,21 @@ id b
7 initial value 7 initial value
8 initial value 8 initial value
SET @after_count = (SELECT SUM(TIMER_WAIT) SET @after_count = (SELECT SUM(TIMER_WAIT)
FROM performance_schema.EVENTS_WAITS_HISTORY_LONG FROM performance_schema.events_waits_history_long
WHERE (EVENT_NAME = 'wait/synch/rwlock/sql/LOCK_grant')); WHERE (EVENT_NAME = 'wait/synch/rwlock/sql/LOCK_grant'));
SELECT IF((@after_count - @before_count) > 0, 'Success', 'Failure') test_fm1_rw_timed; SELECT IF((@after_count - @before_count) > 0, 'Success', 'Failure') test_fm1_rw_timed;
test_fm1_rw_timed test_fm1_rw_timed
Success Success
UPDATE performance_schema.SETUP_INSTRUMENTS SET enabled = 'NO' UPDATE performance_schema.setup_instruments SET enabled = 'NO'
WHERE NAME = 'wait/synch/rwlock/sql/LOCK_grant'; WHERE NAME = 'wait/synch/rwlock/sql/LOCK_grant';
TRUNCATE TABLE performance_schema.EVENTS_WAITS_HISTORY_LONG; TRUNCATE TABLE performance_schema.events_waits_history_long;
TRUNCATE TABLE performance_schema.EVENTS_WAITS_HISTORY; TRUNCATE TABLE performance_schema.events_waits_history;
TRUNCATE TABLE performance_schema.EVENTS_WAITS_CURRENT; TRUNCATE TABLE performance_schema.events_waits_current;
SELECT * FROM t1 WHERE id = 1; SELECT * FROM t1 WHERE id = 1;
id b id b
1 initial value 1 initial value
SET @before_count = (SELECT SUM(TIMER_WAIT) SET @before_count = (SELECT SUM(TIMER_WAIT)
FROM performance_schema.EVENTS_WAITS_HISTORY_LONG FROM performance_schema.events_waits_history_long
WHERE (EVENT_NAME = 'wait/synch/rwlock/sql/LOCK_grant')); WHERE (EVENT_NAME = 'wait/synch/rwlock/sql/LOCK_grant'));
SELECT * FROM t1; SELECT * FROM t1;
id b id b
@ -105,10 +105,10 @@ id b
7 initial value 7 initial value
8 initial value 8 initial value
SET @after_count = (SELECT SUM(TIMER_WAIT) SET @after_count = (SELECT SUM(TIMER_WAIT)
FROM performance_schema.EVENTS_WAITS_HISTORY_LONG FROM performance_schema.events_waits_history_long
WHERE (EVENT_NAME = 'wait/synch/rwlock/sql/LOCK_grant')); WHERE (EVENT_NAME = 'wait/synch/rwlock/sql/LOCK_grant'));
SELECT IF((COALESCE(@after_count, 0) - COALESCE(@before_count, 0)) = 0, 'Success', 'Failure') test_fm2_rw_timed; SELECT IF((COALESCE(@after_count, 0) - COALESCE(@before_count, 0)) = 0, 'Success', 'Failure') test_fm2_rw_timed;
test_fm2_rw_timed test_fm2_rw_timed
Success Success
UPDATE performance_schema.SETUP_INSTRUMENTS SET enabled = 'YES'; UPDATE performance_schema.setup_instruments SET enabled = 'YES';
DROP TABLE t1; DROP TABLE t1;

24
mysql-test/suite/perfschema/r/global_read_lock.result
View File

@ -1,33 +1,33 @@
use performance_schema; use performance_schema;
update performance_schema.SETUP_INSTRUMENTS set enabled='YES'; update performance_schema.setup_instruments set enabled='YES';
grant SELECT, UPDATE, LOCK TABLES on performance_schema.* to pfsuser@localhost; grant SELECT, UPDATE, LOCK TABLES on performance_schema.* to pfsuser@localhost;
flush privileges; flush privileges;
connect (con1, localhost, pfsuser, , test); connect (con1, localhost, pfsuser, , test);
lock tables performance_schema.SETUP_INSTRUMENTS read; lock tables performance_schema.setup_instruments read;
select * from performance_schema.SETUP_INSTRUMENTS; select * from performance_schema.setup_instruments;
unlock tables; unlock tables;
lock tables performance_schema.SETUP_INSTRUMENTS write; lock tables performance_schema.setup_instruments write;
update performance_schema.SETUP_INSTRUMENTS set enabled='NO'; update performance_schema.setup_instruments set enabled='NO';
update performance_schema.SETUP_INSTRUMENTS set enabled='YES'; update performance_schema.setup_instruments set enabled='YES';
unlock tables; unlock tables;
connection default; connection default;
flush tables with read lock; flush tables with read lock;
connection con1; connection con1;
lock tables performance_schema.SETUP_INSTRUMENTS read; lock tables performance_schema.setup_instruments read;
select * from performance_schema.SETUP_INSTRUMENTS; select * from performance_schema.setup_instruments;
unlock tables; unlock tables;
lock tables performance_schema.SETUP_INSTRUMENTS write; lock tables performance_schema.setup_instruments write;
connection default; connection default;
select event_name, select event_name,
left(source, locate(":", source)) as short_source, left(source, locate(":", source)) as short_source,
timer_end, timer_wait, operation timer_end, timer_wait, operation
from performance_schema.EVENTS_WAITS_CURRENT from performance_schema.events_waits_current
where event_name like "wait/synch/cond/sql/MDL_context::COND_wait_status"; where event_name like "wait/synch/cond/sql/MDL_context::COND_wait_status";
event_name short_source timer_end timer_wait operation event_name short_source timer_end timer_wait operation
wait/synch/cond/sql/MDL_context::COND_wait_status mdl.cc: NULL NULL timed_wait wait/synch/cond/sql/MDL_context::COND_wait_status mdl.cc: NULL NULL timed_wait
unlock tables; unlock tables;
update performance_schema.SETUP_INSTRUMENTS set enabled='NO'; update performance_schema.setup_instruments set enabled='NO';
update performance_schema.SETUP_INSTRUMENTS set enabled='YES'; update performance_schema.setup_instruments set enabled='YES';
unlock tables; unlock tables;
connection default; connection default;
drop user pfsuser@localhost; drop user pfsuser@localhost;

342
mysql-test/suite/perfschema/r/information_schema.result
View File

@ -1,189 +1,189 @@
select TABLE_SCHEMA, upper(TABLE_NAME), TABLE_CATALOG select TABLE_SCHEMA, lower(TABLE_NAME), TABLE_CATALOG
from information_schema.tables from information_schema.tables
where TABLE_SCHEMA='performance_schema'; where TABLE_SCHEMA='performance_schema';
TABLE_SCHEMA upper(TABLE_NAME) TABLE_CATALOG TABLE_SCHEMA lower(TABLE_NAME) TABLE_CATALOG
performance_schema COND_INSTANCES def performance_schema cond_instances def
performance_schema EVENTS_WAITS_CURRENT def performance_schema events_waits_current def
performance_schema EVENTS_WAITS_HISTORY def performance_schema events_waits_history def
performance_schema EVENTS_WAITS_HISTORY_LONG def performance_schema events_waits_history_long def
performance_schema EVENTS_WAITS_SUMMARY_BY_INSTANCE def performance_schema events_waits_summary_by_instance def
performance_schema EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME def performance_schema events_waits_summary_by_thread_by_event_name def
performance_schema EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME def performance_schema events_waits_summary_global_by_event_name def
performance_schema FILE_INSTANCES def performance_schema file_instances def
performance_schema FILE_SUMMARY_BY_EVENT_NAME def performance_schema file_summary_by_event_name def
performance_schema FILE_SUMMARY_BY_INSTANCE def performance_schema file_summary_by_instance def
performance_schema MUTEX_INSTANCES def performance_schema mutex_instances def
performance_schema PERFORMANCE_TIMERS def performance_schema performance_timers def
performance_schema RWLOCK_INSTANCES def performance_schema rwlock_instances def
performance_schema SETUP_CONSUMERS def performance_schema setup_consumers def
performance_schema SETUP_INSTRUMENTS def performance_schema setup_instruments def
performance_schema SETUP_TIMERS def performance_schema setup_timers def
performance_schema THREADS def performance_schema threads def
select upper(TABLE_NAME), TABLE_TYPE, ENGINE select lower(TABLE_NAME), TABLE_TYPE, ENGINE
from information_schema.tables from information_schema.tables
where TABLE_SCHEMA='performance_schema'; where TABLE_SCHEMA='performance_schema';
upper(TABLE_NAME) TABLE_TYPE ENGINE lower(TABLE_NAME) TABLE_TYPE ENGINE
COND_INSTANCES BASE TABLE PERFORMANCE_SCHEMA cond_instances BASE TABLE PERFORMANCE_SCHEMA
EVENTS_WAITS_CURRENT BASE TABLE PERFORMANCE_SCHEMA events_waits_current BASE TABLE PERFORMANCE_SCHEMA
EVENTS_WAITS_HISTORY BASE TABLE PERFORMANCE_SCHEMA events_waits_history BASE TABLE PERFORMANCE_SCHEMA
EVENTS_WAITS_HISTORY_LONG BASE TABLE PERFORMANCE_SCHEMA events_waits_history_long BASE TABLE PERFORMANCE_SCHEMA
EVENTS_WAITS_SUMMARY_BY_INSTANCE BASE TABLE PERFORMANCE_SCHEMA events_waits_summary_by_instance BASE TABLE PERFORMANCE_SCHEMA
EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME BASE TABLE PERFORMANCE_SCHEMA events_waits_summary_by_thread_by_event_name BASE TABLE PERFORMANCE_SCHEMA
EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME BASE TABLE PERFORMANCE_SCHEMA events_waits_summary_global_by_event_name BASE TABLE PERFORMANCE_SCHEMA
FILE_INSTANCES BASE TABLE PERFORMANCE_SCHEMA file_instances BASE TABLE PERFORMANCE_SCHEMA
FILE_SUMMARY_BY_EVENT_NAME BASE TABLE PERFORMANCE_SCHEMA file_summary_by_event_name BASE TABLE PERFORMANCE_SCHEMA
FILE_SUMMARY_BY_INSTANCE BASE TABLE PERFORMANCE_SCHEMA file_summary_by_instance BASE TABLE PERFORMANCE_SCHEMA
MUTEX_INSTANCES BASE TABLE PERFORMANCE_SCHEMA mutex_instances BASE TABLE PERFORMANCE_SCHEMA
PERFORMANCE_TIMERS BASE TABLE PERFORMANCE_SCHEMA performance_timers BASE TABLE PERFORMANCE_SCHEMA
RWLOCK_INSTANCES BASE TABLE PERFORMANCE_SCHEMA rwlock_instances BASE TABLE PERFORMANCE_SCHEMA
SETUP_CONSUMERS BASE TABLE PERFORMANCE_SCHEMA setup_consumers BASE TABLE PERFORMANCE_SCHEMA
SETUP_INSTRUMENTS BASE TABLE PERFORMANCE_SCHEMA setup_instruments BASE TABLE PERFORMANCE_SCHEMA
SETUP_TIMERS BASE TABLE PERFORMANCE_SCHEMA setup_timers BASE TABLE PERFORMANCE_SCHEMA
THREADS BASE TABLE PERFORMANCE_SCHEMA threads BASE TABLE PERFORMANCE_SCHEMA
select upper(TABLE_NAME), VERSION, ROW_FORMAT select lower(TABLE_NAME), VERSION, ROW_FORMAT
from information_schema.tables from information_schema.tables
where TABLE_SCHEMA='performance_schema'; where TABLE_SCHEMA='performance_schema';
upper(TABLE_NAME) VERSION ROW_FORMAT lower(TABLE_NAME) VERSION ROW_FORMAT
COND_INSTANCES 10 Dynamic cond_instances 10 Dynamic
EVENTS_WAITS_CURRENT 10 Dynamic events_waits_current 10 Dynamic
EVENTS_WAITS_HISTORY 10 Dynamic events_waits_history 10 Dynamic
EVENTS_WAITS_HISTORY_LONG 10 Dynamic events_waits_history_long 10 Dynamic
EVENTS_WAITS_SUMMARY_BY_INSTANCE 10 Dynamic events_waits_summary_by_instance 10 Dynamic
EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME 10 Dynamic events_waits_summary_by_thread_by_event_name 10 Dynamic
EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME 10 Dynamic events_waits_summary_global_by_event_name 10 Dynamic
FILE_INSTANCES 10 Dynamic file_instances 10 Dynamic
FILE_SUMMARY_BY_EVENT_NAME 10 Dynamic file_summary_by_event_name 10 Dynamic
FILE_SUMMARY_BY_INSTANCE 10 Dynamic file_summary_by_instance 10 Dynamic
MUTEX_INSTANCES 10 Dynamic mutex_instances 10 Dynamic
PERFORMANCE_TIMERS 10 Fixed performance_timers 10 Fixed
RWLOCK_INSTANCES 10 Dynamic rwlock_instances 10 Dynamic
SETUP_CONSUMERS 10 Dynamic setup_consumers 10 Dynamic
SETUP_INSTRUMENTS 10 Dynamic setup_instruments 10 Dynamic
SETUP_TIMERS 10 Dynamic setup_timers 10 Dynamic
THREADS 10 Dynamic threads 10 Dynamic
select upper(TABLE_NAME), TABLE_ROWS, AVG_ROW_LENGTH select lower(TABLE_NAME), TABLE_ROWS, AVG_ROW_LENGTH
from information_schema.tables from information_schema.tables
where TABLE_SCHEMA='performance_schema'; where TABLE_SCHEMA='performance_schema';
upper(TABLE_NAME) TABLE_ROWS AVG_ROW_LENGTH lower(TABLE_NAME) TABLE_ROWS AVG_ROW_LENGTH
COND_INSTANCES 1000 0 cond_instances 1000 0
EVENTS_WAITS_CURRENT 1000 0 events_waits_current 1000 0
EVENTS_WAITS_HISTORY 1000 0 events_waits_history 1000 0
EVENTS_WAITS_HISTORY_LONG 10000 0 events_waits_history_long 10000 0
EVENTS_WAITS_SUMMARY_BY_INSTANCE 1000 0 events_waits_summary_by_instance 1000 0
EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME 1000 0 events_waits_summary_by_thread_by_event_name 1000 0
EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME 1000 0 events_waits_summary_global_by_event_name 1000 0
FILE_INSTANCES 1000 0 file_instances 1000 0
FILE_SUMMARY_BY_EVENT_NAME 1000 0 file_summary_by_event_name 1000 0
FILE_SUMMARY_BY_INSTANCE 1000 0 file_summary_by_instance 1000 0
MUTEX_INSTANCES 1000 0 mutex_instances 1000 0
PERFORMANCE_TIMERS 5 0 performance_timers 5 0
RWLOCK_INSTANCES 1000 0 rwlock_instances 1000 0
SETUP_CONSUMERS 8 0 setup_consumers 8 0
SETUP_INSTRUMENTS 1000 0 setup_instruments 1000 0
SETUP_TIMERS 1 0 setup_timers 1 0
THREADS 1000 0 threads 1000 0
select upper(TABLE_NAME), DATA_LENGTH, MAX_DATA_LENGTH select lower(TABLE_NAME), DATA_LENGTH, MAX_DATA_LENGTH
from information_schema.tables from information_schema.tables
where TABLE_SCHEMA='performance_schema'; where TABLE_SCHEMA='performance_schema';
upper(TABLE_NAME) DATA_LENGTH MAX_DATA_LENGTH lower(TABLE_NAME) DATA_LENGTH MAX_DATA_LENGTH
COND_INSTANCES 0 0 cond_instances 0 0
EVENTS_WAITS_CURRENT 0 0 events_waits_current 0 0
EVENTS_WAITS_HISTORY 0 0 events_waits_history 0 0
EVENTS_WAITS_HISTORY_LONG 0 0 events_waits_history_long 0 0
EVENTS_WAITS_SUMMARY_BY_INSTANCE 0 0 events_waits_summary_by_instance 0 0
EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME 0 0 events_waits_summary_by_thread_by_event_name 0 0
EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME 0 0 events_waits_summary_global_by_event_name 0 0
FILE_INSTANCES 0 0 file_instances 0 0
FILE_SUMMARY_BY_EVENT_NAME 0 0 file_summary_by_event_name 0 0
FILE_SUMMARY_BY_INSTANCE 0 0 file_summary_by_instance 0 0
MUTEX_INSTANCES 0 0 mutex_instances 0 0
PERFORMANCE_TIMERS 0 0 performance_timers 0 0
RWLOCK_INSTANCES 0 0 rwlock_instances 0 0
SETUP_CONSUMERS 0 0 setup_consumers 0 0
SETUP_INSTRUMENTS 0 0 setup_instruments 0 0
SETUP_TIMERS 0 0 setup_timers 0 0
THREADS 0 0 threads 0 0
select upper(TABLE_NAME), INDEX_LENGTH, DATA_FREE, AUTO_INCREMENT select lower(TABLE_NAME), INDEX_LENGTH, DATA_FREE, AUTO_INCREMENT
from information_schema.tables from information_schema.tables
where TABLE_SCHEMA='performance_schema'; where TABLE_SCHEMA='performance_schema';
upper(TABLE_NAME) INDEX_LENGTH DATA_FREE AUTO_INCREMENT lower(TABLE_NAME) INDEX_LENGTH DATA_FREE AUTO_INCREMENT
COND_INSTANCES 0 0 NULL cond_instances 0 0 NULL
EVENTS_WAITS_CURRENT 0 0 NULL events_waits_current 0 0 NULL
EVENTS_WAITS_HISTORY 0 0 NULL events_waits_history 0 0 NULL
EVENTS_WAITS_HISTORY_LONG 0 0 NULL events_waits_history_long 0 0 NULL
EVENTS_WAITS_SUMMARY_BY_INSTANCE 0 0 NULL events_waits_summary_by_instance 0 0 NULL
EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME 0 0 NULL events_waits_summary_by_thread_by_event_name 0 0 NULL
EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME 0 0 NULL events_waits_summary_global_by_event_name 0 0 NULL
FILE_INSTANCES 0 0 NULL file_instances 0 0 NULL
FILE_SUMMARY_BY_EVENT_NAME 0 0 NULL file_summary_by_event_name 0 0 NULL
FILE_SUMMARY_BY_INSTANCE 0 0 NULL file_summary_by_instance 0 0 NULL
MUTEX_INSTANCES 0 0 NULL mutex_instances 0 0 NULL
PERFORMANCE_TIMERS 0 0 NULL performance_timers 0 0 NULL
RWLOCK_INSTANCES 0 0 NULL rwlock_instances 0 0 NULL
SETUP_CONSUMERS 0 0 NULL setup_consumers 0 0 NULL
SETUP_INSTRUMENTS 0 0 NULL setup_instruments 0 0 NULL
SETUP_TIMERS 0 0 NULL setup_timers 0 0 NULL
THREADS 0 0 NULL threads 0 0 NULL
select upper(TABLE_NAME), CREATE_TIME, UPDATE_TIME, CHECK_TIME select lower(TABLE_NAME), CREATE_TIME, UPDATE_TIME, CHECK_TIME
from information_schema.tables from information_schema.tables
where TABLE_SCHEMA='performance_schema'; where TABLE_SCHEMA='performance_schema';
upper(TABLE_NAME) CREATE_TIME UPDATE_TIME CHECK_TIME lower(TABLE_NAME) CREATE_TIME UPDATE_TIME CHECK_TIME
COND_INSTANCES NULL NULL NULL cond_instances NULL NULL NULL
EVENTS_WAITS_CURRENT NULL NULL NULL events_waits_current NULL NULL NULL
EVENTS_WAITS_HISTORY NULL NULL NULL events_waits_history NULL NULL NULL
EVENTS_WAITS_HISTORY_LONG NULL NULL NULL events_waits_history_long NULL NULL NULL
EVENTS_WAITS_SUMMARY_BY_INSTANCE NULL NULL NULL events_waits_summary_by_instance NULL NULL NULL
EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME NULL NULL NULL events_waits_summary_by_thread_by_event_name NULL NULL NULL
EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME NULL NULL NULL events_waits_summary_global_by_event_name NULL NULL NULL
FILE_INSTANCES NULL NULL NULL file_instances NULL NULL NULL
FILE_SUMMARY_BY_EVENT_NAME NULL NULL NULL file_summary_by_event_name NULL NULL NULL
FILE_SUMMARY_BY_INSTANCE NULL NULL NULL file_summary_by_instance NULL NULL NULL
MUTEX_INSTANCES NULL NULL NULL mutex_instances NULL NULL NULL
PERFORMANCE_TIMERS NULL NULL NULL performance_timers NULL NULL NULL
RWLOCK_INSTANCES NULL NULL NULL rwlock_instances NULL NULL NULL
SETUP_CONSUMERS NULL NULL NULL setup_consumers NULL NULL NULL
SETUP_INSTRUMENTS NULL NULL NULL setup_instruments NULL NULL NULL
SETUP_TIMERS NULL NULL NULL setup_timers NULL NULL NULL
THREADS NULL NULL NULL threads NULL NULL NULL
select upper(TABLE_NAME), TABLE_COLLATION, CHECKSUM select lower(TABLE_NAME), TABLE_COLLATION, CHECKSUM
from information_schema.tables from information_schema.tables
where TABLE_SCHEMA='performance_schema'; where TABLE_SCHEMA='performance_schema';
upper(TABLE_NAME) TABLE_COLLATION CHECKSUM lower(TABLE_NAME) TABLE_COLLATION CHECKSUM
COND_INSTANCES utf8_general_ci NULL cond_instances utf8_general_ci NULL
EVENTS_WAITS_CURRENT utf8_general_ci NULL events_waits_current utf8_general_ci NULL
EVENTS_WAITS_HISTORY utf8_general_ci NULL events_waits_history utf8_general_ci NULL
EVENTS_WAITS_HISTORY_LONG utf8_general_ci NULL events_waits_history_long utf8_general_ci NULL
EVENTS_WAITS_SUMMARY_BY_INSTANCE utf8_general_ci NULL events_waits_summary_by_instance utf8_general_ci NULL
EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME utf8_general_ci NULL events_waits_summary_by_thread_by_event_name utf8_general_ci NULL
EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME utf8_general_ci NULL events_waits_summary_global_by_event_name utf8_general_ci NULL
FILE_INSTANCES utf8_general_ci NULL file_instances utf8_general_ci NULL
FILE_SUMMARY_BY_EVENT_NAME utf8_general_ci NULL file_summary_by_event_name utf8_general_ci NULL
FILE_SUMMARY_BY_INSTANCE utf8_general_ci NULL file_summary_by_instance utf8_general_ci NULL
MUTEX_INSTANCES utf8_general_ci NULL mutex_instances utf8_general_ci NULL
PERFORMANCE_TIMERS utf8_general_ci NULL performance_timers utf8_general_ci NULL
RWLOCK_INSTANCES utf8_general_ci NULL rwlock_instances utf8_general_ci NULL
SETUP_CONSUMERS utf8_general_ci NULL setup_consumers utf8_general_ci NULL
SETUP_INSTRUMENTS utf8_general_ci NULL setup_instruments utf8_general_ci NULL
SETUP_TIMERS utf8_general_ci NULL setup_timers utf8_general_ci NULL
THREADS utf8_general_ci NULL threads utf8_general_ci NULL
select upper(TABLE_NAME), TABLE_COMMENT select lower(TABLE_NAME), TABLE_COMMENT
from information_schema.tables from information_schema.tables
where TABLE_SCHEMA='performance_schema'; where TABLE_SCHEMA='performance_schema';
upper(TABLE_NAME) TABLE_COMMENT lower(TABLE_NAME) TABLE_COMMENT
COND_INSTANCES cond_instances
EVENTS_WAITS_CURRENT events_waits_current
EVENTS_WAITS_HISTORY events_waits_history
EVENTS_WAITS_HISTORY_LONG events_waits_history_long
EVENTS_WAITS_SUMMARY_BY_INSTANCE events_waits_summary_by_instance
EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME events_waits_summary_by_thread_by_event_name
EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME events_waits_summary_global_by_event_name
FILE_INSTANCES file_instances
FILE_SUMMARY_BY_EVENT_NAME file_summary_by_event_name
FILE_SUMMARY_BY_INSTANCE file_summary_by_instance
MUTEX_INSTANCES mutex_instances
PERFORMANCE_TIMERS performance_timers
RWLOCK_INSTANCES rwlock_instances
SETUP_CONSUMERS setup_consumers
SETUP_INSTRUMENTS setup_instruments
SETUP_TIMERS setup_timers
THREADS threads

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

@ -1,13 +1,13 @@
SELECT EVENT_ID FROM performance_schema.EVENTS_WAITS_CURRENT SELECT EVENT_ID FROM performance_schema.events_waits_current
WHERE THREAD_ID IN WHERE THREAD_ID IN
(SELECT THREAD_ID FROM performance_schema.THREADS) (SELECT THREAD_ID FROM performance_schema.threads)
AND EVENT_NAME IN AND EVENT_NAME IN
(SELECT NAME FROM performance_schema.SETUP_INSTRUMENTS (SELECT NAME FROM performance_schema.setup_instruments
WHERE NAME LIKE "wait/synch/%") WHERE NAME LIKE "wait/synch/%")
LIMIT 1; LIMIT 1;
create table test.t1(a int) engine=performance_schema; create table test.t1(a int) engine=performance_schema;
ERROR HY000: Invalid performance_schema usage. ERROR HY000: Invalid performance_schema usage.
create table test.t1 like performance_schema.EVENTS_WAITS_CURRENT; create table test.t1 like performance_schema.events_waits_current;
ERROR HY000: Invalid performance_schema usage. ERROR HY000: Invalid performance_schema usage.
create table performance_schema.t1(a int); create table performance_schema.t1(a int);
ERROR 42000: CREATE command denied to user 'root'@'localhost' for table 't1' ERROR 42000: CREATE command denied to user 'root'@'localhost' for table 't1'
@ -22,7 +22,7 @@ a b
1 3 1 3
2 4 2 4
drop table test.ghost; drop table test.ghost;
select * from performance_schema.FILE_INSTANCES select * from performance_schema.file_instances
where file_name like "%ghost%"; where file_name like "%ghost%";
FILE_NAME EVENT_NAME OPEN_COUNT FILE_NAME EVENT_NAME OPEN_COUNT
select * from performance_schema.no_such_table; select * from performance_schema.no_such_table;

12
mysql-test/suite/perfschema/r/myisam_file_io.result
View File

@ -1,9 +1,9 @@
update performance_schema.SETUP_INSTRUMENTS set enabled='NO'; update performance_schema.setup_instruments set enabled='NO';
update performance_schema.SETUP_INSTRUMENTS set enabled='YES' update performance_schema.setup_instruments set enabled='YES'
where name like "wait/io/file/myisam/%"; where name like "wait/io/file/myisam/%";
update performance_schema.SETUP_CONSUMERS update performance_schema.setup_consumers
set enabled='YES'; set enabled='YES';
truncate table performance_schema.EVENTS_WAITS_HISTORY_LONG; truncate table performance_schema.events_waits_history_long;
flush status; flush status;
drop table if exists test.no_index_tab; drop table if exists test.no_index_tab;
create table test.no_index_tab ( a varchar(255), b int ) engine=myisam; create table test.no_index_tab ( a varchar(255), b int ) engine=myisam;
@ -14,7 +14,7 @@ select event_name,
left(source, locate(":", source)) as short_source, left(source, locate(":", source)) as short_source,
operation, number_of_bytes, operation, number_of_bytes,
substring(object_name, locate("no_index_tab", object_name)) as short_name substring(object_name, locate("no_index_tab", object_name)) as short_name
from performance_schema.EVENTS_WAITS_HISTORY_LONG from performance_schema.events_waits_history_long
where operation not like "tell" where operation not like "tell"
order by thread_id, event_id; order by thread_id, event_id;
event_name short_source operation number_of_bytes short_name event_name short_source operation number_of_bytes short_name
@ -56,5 +56,5 @@ Performance_schema_table_handles_lost 0
Performance_schema_table_instances_lost 0 Performance_schema_table_instances_lost 0
Performance_schema_thread_classes_lost 0 Performance_schema_thread_classes_lost 0
Performance_schema_thread_instances_lost 0 Performance_schema_thread_instances_lost 0
update performance_schema.SETUP_INSTRUMENTS set enabled='YES'; update performance_schema.setup_instruments set enabled='YES';
drop table test.no_index_tab; drop table test.no_index_tab;

22
mysql-test/suite/perfschema/r/no_threads.result
View File

@ -1,11 +1,11 @@
update performance_schema.SETUP_INSTRUMENTS set enabled='NO'; update performance_schema.setup_instruments set enabled='NO';
update performance_schema.SETUP_CONSUMERS set enabled='YES'; update performance_schema.setup_consumers set enabled='YES';
update performance_schema.SETUP_INSTRUMENTS set enabled='YES' update performance_schema.setup_instruments set enabled='YES'
where name like "wait/synch/mutex/mysys/THR_LOCK_myisam"; where name like "wait/synch/mutex/mysys/THR_LOCK_myisam";
drop table if exists test.t1; drop table if exists test.t1;
truncate table performance_schema.EVENTS_WAITS_CURRENT; truncate table performance_schema.events_waits_current;
truncate table performance_schema.EVENTS_WAITS_HISTORY; truncate table performance_schema.events_waits_history;
truncate table performance_schema.EVENTS_WAITS_HISTORY_LONG; truncate table performance_schema.events_waits_history_long;
show variables like "thread_handling"; show variables like "thread_handling";
Variable_name Value Variable_name Value
thread_handling no-threads thread_handling no-threads
@ -17,27 +17,27 @@ show variables like "performance_schema_max_thread%";
Variable_name Value Variable_name Value
performance_schema_max_thread_classes 50 performance_schema_max_thread_classes 50
performance_schema_max_thread_instances 10 performance_schema_max_thread_instances 10
select count(*) from performance_schema.THREADS select count(*) from performance_schema.threads
where name like "thread/sql/main"; where name like "thread/sql/main";
count(*) count(*)
1 1
select count(*) from performance_schema.THREADS select count(*) from performance_schema.threads
where name like "thread/sql/OneConnection"; where name like "thread/sql/OneConnection";
count(*) count(*)
0 0
select event_name, operation, select event_name, operation,
left(source, locate(":", source)) as short_source left(source, locate(":", source)) as short_source
from performance_schema.EVENTS_WAITS_CURRENT; from performance_schema.events_waits_current;
event_name operation short_source event_name operation short_source
wait/synch/mutex/mysys/THR_LOCK_myisam lock mi_create.c: wait/synch/mutex/mysys/THR_LOCK_myisam lock mi_create.c:
select event_name, operation, select event_name, operation,
left(source, locate(":", source)) as short_source left(source, locate(":", source)) as short_source
from performance_schema.EVENTS_WAITS_HISTORY; from performance_schema.events_waits_history;
event_name operation short_source event_name operation short_source
wait/synch/mutex/mysys/THR_LOCK_myisam lock mi_create.c: wait/synch/mutex/mysys/THR_LOCK_myisam lock mi_create.c:
select event_name, operation, select event_name, operation,
left(source, locate(":", source)) as short_source left(source, locate(":", source)) as short_source
from performance_schema.EVENTS_WAITS_HISTORY_LONG; from performance_schema.events_waits_history_long;
event_name operation short_source event_name operation short_source
wait/synch/mutex/mysys/THR_LOCK_myisam lock mi_create.c: wait/synch/mutex/mysys/THR_LOCK_myisam lock mi_create.c:
drop table test.t1; drop table test.t1;

6
mysql-test/suite/perfschema/r/one_thread_per_con.result
View File

@ -1,9 +1,9 @@
update performance_schema.SETUP_INSTRUMENTS set enabled='YES' update performance_schema.setup_instruments set enabled='YES'
where name like "wait/synch/mutex/mysys/THR_LOCK_myisam"; where name like "wait/synch/mutex/mysys/THR_LOCK_myisam";
drop table if exists test.t1; drop table if exists test.t1;
drop table if exists test.t2; drop table if exists test.t2;
drop table if exists test.t3; drop table if exists test.t3;
truncate table performance_schema.EVENTS_WAITS_HISTORY_LONG; truncate table performance_schema.events_waits_history_long;
show variables like "thread_handling"; show variables like "thread_handling";
Variable_name Value Variable_name Value
thread_handling one-thread-per-connection thread_handling one-thread-per-connection
@ -35,4 +35,4 @@ thread/sql/one_connection
drop table test.t1; drop table test.t1;
drop table test.t2; drop table test.t2;
drop table test.t3; drop table test.t3;
update performance_schema.SETUP_INSTRUMENTS set enabled='YES'; update performance_schema.setup_instruments set enabled='YES';

170
mysql-test/suite/perfschema/r/pfs_upgrade.result
View File

@ -8,23 +8,23 @@ use performance_schema;
show tables like "user_table"; show tables like "user_table";
Tables_in_performance_schema (user_table) Tables_in_performance_schema (user_table)
user_table user_table
ERROR 1050 (42S01) at line 183: Table 'COND_INSTANCES' already exists ERROR 1050 (42S01) at line 183: Table 'cond_instances' already exists
ERROR 1050 (42S01) at line 213: Table 'EVENTS_WAITS_CURRENT' already exists ERROR 1050 (42S01) at line 213: Table 'events_waits_current' already exists
ERROR 1050 (42S01) at line 227: Table 'EVENTS_WAITS_HISTORY' already exists ERROR 1050 (42S01) at line 227: Table 'events_waits_history' already exists
ERROR 1050 (42S01) at line 241: Table 'EVENTS_WAITS_HISTORY_LONG' already exists ERROR 1050 (42S01) at line 241: Table 'events_waits_history_long' already exists
ERROR 1050 (42S01) at line 262: Table 'EVENTS_WAITS_SUMMARY_BY_INSTANCE' already exists ERROR 1050 (42S01) at line 262: Table 'events_waits_summary_by_instance' already exists
ERROR 1050 (42S01) at line 283: Table 'EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME' already exists ERROR 1050 (42S01) at line 283: Table 'events_waits_summary_by_thread_by_event_name' already exists
ERROR 1050 (42S01) at line 303: Table 'EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME' already exists ERROR 1050 (42S01) at line 303: Table 'events_waits_summary_global_by_event_name' already exists
ERROR 1050 (42S01) at line 320: Table 'FILE_INSTANCES' already exists ERROR 1050 (42S01) at line 320: Table 'file_instances' already exists
ERROR 1050 (42S01) at line 339: Table 'FILE_SUMMARY_BY_EVENT_NAME' already exists ERROR 1050 (42S01) at line 339: Table 'file_summary_by_event_name' already exists
ERROR 1050 (42S01) at line 359: Table 'FILE_SUMMARY_BY_INSTANCE' already exists ERROR 1050 (42S01) at line 359: Table 'file_summary_by_instance' already exists
ERROR 1050 (42S01) at line 376: Table 'MUTEX_INSTANCES' already exists ERROR 1050 (42S01) at line 376: Table 'mutex_instances' already exists
ERROR 1050 (42S01) at line 394: Table 'PERFORMANCE_TIMERS' already exists ERROR 1050 (42S01) at line 394: Table 'performance_timers' already exists
ERROR 1050 (42S01) at line 412: Table 'RWLOCK_INSTANCES' already exists ERROR 1050 (42S01) at line 412: Table 'rwlock_instances' already exists
ERROR 1050 (42S01) at line 428: Table 'SETUP_CONSUMERS' already exists ERROR 1050 (42S01) at line 428: Table 'setup_consumers' already exists
ERROR 1050 (42S01) at line 445: Table 'SETUP_INSTRUMENTS' already exists ERROR 1050 (42S01) at line 445: Table 'setup_instruments' already exists
ERROR 1050 (42S01) at line 461: Table 'SETUP_TIMERS' already exists ERROR 1050 (42S01) at line 461: Table 'setup_timers' already exists
ERROR 1050 (42S01) at line 478: Table 'THREADS' already exists ERROR 1050 (42S01) at line 478: Table 'threads' already exists
ERROR 1644 (HY000) at line 1122: Unexpected content found in the performance_schema database. ERROR 1644 (HY000) at line 1122: Unexpected content found in the performance_schema database.
FATAL ERROR: Upgrade failed FATAL ERROR: Upgrade failed
show tables like "user_table"; show tables like "user_table";
@ -38,23 +38,23 @@ use performance_schema;
show tables like "user_view"; show tables like "user_view";
Tables_in_performance_schema (user_view) Tables_in_performance_schema (user_view)
user_view user_view
ERROR 1050 (42S01) at line 183: Table 'COND_INSTANCES' already exists ERROR 1050 (42S01) at line 183: Table 'cond_instances' already exists
ERROR 1050 (42S01) at line 213: Table 'EVENTS_WAITS_CURRENT' already exists ERROR 1050 (42S01) at line 213: Table 'events_waits_current' already exists
ERROR 1050 (42S01) at line 227: Table 'EVENTS_WAITS_HISTORY' already exists ERROR 1050 (42S01) at line 227: Table 'events_waits_history' already exists
ERROR 1050 (42S01) at line 241: Table 'EVENTS_WAITS_HISTORY_LONG' already exists ERROR 1050 (42S01) at line 241: Table 'events_waits_history_long' already exists
ERROR 1050 (42S01) at line 262: Table 'EVENTS_WAITS_SUMMARY_BY_INSTANCE' already exists ERROR 1050 (42S01) at line 262: Table 'events_waits_summary_by_instance' already exists
ERROR 1050 (42S01) at line 283: Table 'EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME' already exists ERROR 1050 (42S01) at line 283: Table 'events_waits_summary_by_thread_by_event_name' already exists
ERROR 1050 (42S01) at line 303: Table 'EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME' already exists ERROR 1050 (42S01) at line 303: Table 'events_waits_summary_global_by_event_name' already exists
ERROR 1050 (42S01) at line 320: Table 'FILE_INSTANCES' already exists ERROR 1050 (42S01) at line 320: Table 'file_instances' already exists
ERROR 1050 (42S01) at line 339: Table 'FILE_SUMMARY_BY_EVENT_NAME' already exists ERROR 1050 (42S01) at line 339: Table 'file_summary_by_event_name' already exists
ERROR 1050 (42S01) at line 359: Table 'FILE_SUMMARY_BY_INSTANCE' already exists ERROR 1050 (42S01) at line 359: Table 'file_summary_by_instance' already exists
ERROR 1050 (42S01) at line 376: Table 'MUTEX_INSTANCES' already exists ERROR 1050 (42S01) at line 376: Table 'mutex_instances' already exists
ERROR 1050 (42S01) at line 394: Table 'PERFORMANCE_TIMERS' already exists ERROR 1050 (42S01) at line 394: Table 'performance_timers' already exists
ERROR 1050 (42S01) at line 412: Table 'RWLOCK_INSTANCES' already exists ERROR 1050 (42S01) at line 412: Table 'rwlock_instances' already exists
ERROR 1050 (42S01) at line 428: Table 'SETUP_CONSUMERS' already exists ERROR 1050 (42S01) at line 428: Table 'setup_consumers' already exists
ERROR 1050 (42S01) at line 445: Table 'SETUP_INSTRUMENTS' already exists ERROR 1050 (42S01) at line 445: Table 'setup_instruments' already exists
ERROR 1050 (42S01) at line 461: Table 'SETUP_TIMERS' already exists ERROR 1050 (42S01) at line 461: Table 'setup_timers' already exists
ERROR 1050 (42S01) at line 478: Table 'THREADS' already exists ERROR 1050 (42S01) at line 478: Table 'threads' already exists
ERROR 1644 (HY000) at line 1122: Unexpected content found in the performance_schema database. ERROR 1644 (HY000) at line 1122: Unexpected content found in the performance_schema database.
FATAL ERROR: Upgrade failed FATAL ERROR: Upgrade failed
show tables like "user_view"; show tables like "user_view";
@ -66,23 +66,23 @@ drop view test.user_view;
create procedure test.user_proc() create procedure test.user_proc()
select "Not supposed to be here"; select "Not supposed to be here";
update mysql.proc set db='performance_schema' where name='user_proc'; update mysql.proc set db='performance_schema' where name='user_proc';
ERROR 1050 (42S01) at line 183: Table 'COND_INSTANCES' already exists ERROR 1050 (42S01) at line 183: Table 'cond_instances' already exists
ERROR 1050 (42S01) at line 213: Table 'EVENTS_WAITS_CURRENT' already exists ERROR 1050 (42S01) at line 213: Table 'events_waits_current' already exists
ERROR 1050 (42S01) at line 227: Table 'EVENTS_WAITS_HISTORY' already exists ERROR 1050 (42S01) at line 227: Table 'events_waits_history' already exists
ERROR 1050 (42S01) at line 241: Table 'EVENTS_WAITS_HISTORY_LONG' already exists ERROR 1050 (42S01) at line 241: Table 'events_waits_history_long' already exists
ERROR 1050 (42S01) at line 262: Table 'EVENTS_WAITS_SUMMARY_BY_INSTANCE' already exists ERROR 1050 (42S01) at line 262: Table 'events_waits_summary_by_instance' already exists
ERROR 1050 (42S01) at line 283: Table 'EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME' already exists ERROR 1050 (42S01) at line 283: Table 'events_waits_summary_by_thread_by_event_name' already exists
ERROR 1050 (42S01) at line 303: Table 'EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME' already exists ERROR 1050 (42S01) at line 303: Table 'events_waits_summary_global_by_event_name' already exists
ERROR 1050 (42S01) at line 320: Table 'FILE_INSTANCES' already exists ERROR 1050 (42S01) at line 320: Table 'file_instances' already exists
ERROR 1050 (42S01) at line 339: Table 'FILE_SUMMARY_BY_EVENT_NAME' already exists ERROR 1050 (42S01) at line 339: Table 'file_summary_by_event_name' already exists
ERROR 1050 (42S01) at line 359: Table 'FILE_SUMMARY_BY_INSTANCE' already exists ERROR 1050 (42S01) at line 359: Table 'file_summary_by_instance' already exists
ERROR 1050 (42S01) at line 376: Table 'MUTEX_INSTANCES' already exists ERROR 1050 (42S01) at line 376: Table 'mutex_instances' already exists
ERROR 1050 (42S01) at line 394: Table 'PERFORMANCE_TIMERS' already exists ERROR 1050 (42S01) at line 394: Table 'performance_timers' already exists
ERROR 1050 (42S01) at line 412: Table 'RWLOCK_INSTANCES' already exists ERROR 1050 (42S01) at line 412: Table 'rwlock_instances' already exists
ERROR 1050 (42S01) at line 428: Table 'SETUP_CONSUMERS' already exists ERROR 1050 (42S01) at line 428: Table 'setup_consumers' already exists
ERROR 1050 (42S01) at line 445: Table 'SETUP_INSTRUMENTS' already exists ERROR 1050 (42S01) at line 445: Table 'setup_instruments' already exists
ERROR 1050 (42S01) at line 461: Table 'SETUP_TIMERS' already exists ERROR 1050 (42S01) at line 461: Table 'setup_timers' already exists
ERROR 1050 (42S01) at line 478: Table 'THREADS' already exists ERROR 1050 (42S01) at line 478: Table 'threads' already exists
ERROR 1644 (HY000) at line 1122: Unexpected content found in the performance_schema database. ERROR 1644 (HY000) at line 1122: Unexpected content found in the performance_schema database.
FATAL ERROR: Upgrade failed FATAL ERROR: Upgrade failed
select name from mysql.proc where db='performance_schema'; select name from mysql.proc where db='performance_schema';
@ -94,23 +94,23 @@ drop procedure test.user_proc;
create function test.user_func() returns integer create function test.user_func() returns integer
return 0; return 0;
update mysql.proc set db='performance_schema' where name='user_func'; update mysql.proc set db='performance_schema' where name='user_func';
ERROR 1050 (42S01) at line 183: Table 'COND_INSTANCES' already exists ERROR 1050 (42S01) at line 183: Table 'cond_instances' already exists
ERROR 1050 (42S01) at line 213: Table 'EVENTS_WAITS_CURRENT' already exists ERROR 1050 (42S01) at line 213: Table 'events_waits_current' already exists
ERROR 1050 (42S01) at line 227: Table 'EVENTS_WAITS_HISTORY' already exists ERROR 1050 (42S01) at line 227: Table 'events_waits_history' already exists
ERROR 1050 (42S01) at line 241: Table 'EVENTS_WAITS_HISTORY_LONG' already exists ERROR 1050 (42S01) at line 241: Table 'events_waits_history_long' already exists
ERROR 1050 (42S01) at line 262: Table 'EVENTS_WAITS_SUMMARY_BY_INSTANCE' already exists ERROR 1050 (42S01) at line 262: Table 'events_waits_summary_by_instance' already exists
ERROR 1050 (42S01) at line 283: Table 'EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME' already exists ERROR 1050 (42S01) at line 283: Table 'events_waits_summary_by_thread_by_event_name' already exists
ERROR 1050 (42S01) at line 303: Table 'EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME' already exists ERROR 1050 (42S01) at line 303: Table 'events_waits_summary_global_by_event_name' already exists
ERROR 1050 (42S01) at line 320: Table 'FILE_INSTANCES' already exists ERROR 1050 (42S01) at line 320: Table 'file_instances' already exists
ERROR 1050 (42S01) at line 339: Table 'FILE_SUMMARY_BY_EVENT_NAME' already exists ERROR 1050 (42S01) at line 339: Table 'file_summary_by_event_name' already exists
ERROR 1050 (42S01) at line 359: Table 'FILE_SUMMARY_BY_INSTANCE' already exists ERROR 1050 (42S01) at line 359: Table 'file_summary_by_instance' already exists
ERROR 1050 (42S01) at line 376: Table 'MUTEX_INSTANCES' already exists ERROR 1050 (42S01) at line 376: Table 'mutex_instances' already exists
ERROR 1050 (42S01) at line 394: Table 'PERFORMANCE_TIMERS' already exists ERROR 1050 (42S01) at line 394: Table 'performance_timers' already exists
ERROR 1050 (42S01) at line 412: Table 'RWLOCK_INSTANCES' already exists ERROR 1050 (42S01) at line 412: Table 'rwlock_instances' already exists
ERROR 1050 (42S01) at line 428: Table 'SETUP_CONSUMERS' already exists ERROR 1050 (42S01) at line 428: Table 'setup_consumers' already exists
ERROR 1050 (42S01) at line 445: Table 'SETUP_INSTRUMENTS' already exists ERROR 1050 (42S01) at line 445: Table 'setup_instruments' already exists
ERROR 1050 (42S01) at line 461: Table 'SETUP_TIMERS' already exists ERROR 1050 (42S01) at line 461: Table 'setup_timers' already exists
ERROR 1050 (42S01) at line 478: Table 'THREADS' already exists ERROR 1050 (42S01) at line 478: Table 'threads' already exists
ERROR 1644 (HY000) at line 1122: Unexpected content found in the performance_schema database. ERROR 1644 (HY000) at line 1122: Unexpected content found in the performance_schema database.
FATAL ERROR: Upgrade failed FATAL ERROR: Upgrade failed
select name from mysql.proc where db='performance_schema'; select name from mysql.proc where db='performance_schema';
@ -122,23 +122,23 @@ drop function test.user_func;
create event test.user_event on schedule every 1 day do create event test.user_event on schedule every 1 day do
select "not supposed to be here"; select "not supposed to be here";
update mysql.event set db='performance_schema' where name='user_event'; update mysql.event set db='performance_schema' where name='user_event';
ERROR 1050 (42S01) at line 183: Table 'COND_INSTANCES' already exists ERROR 1050 (42S01) at line 183: Table 'cond_instances' already exists
ERROR 1050 (42S01) at line 213: Table 'EVENTS_WAITS_CURRENT' already exists ERROR 1050 (42S01) at line 213: Table 'events_waits_current' already exists
ERROR 1050 (42S01) at line 227: Table 'EVENTS_WAITS_HISTORY' already exists ERROR 1050 (42S01) at line 227: Table 'events_waits_history' already exists
ERROR 1050 (42S01) at line 241: Table 'EVENTS_WAITS_HISTORY_LONG' already exists ERROR 1050 (42S01) at line 241: Table 'events_waits_history_long' already exists
ERROR 1050 (42S01) at line 262: Table 'EVENTS_WAITS_SUMMARY_BY_INSTANCE' already exists ERROR 1050 (42S01) at line 262: Table 'events_waits_summary_by_instance' already exists
ERROR 1050 (42S01) at line 283: Table 'EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME' already exists ERROR 1050 (42S01) at line 283: Table 'events_waits_summary_by_thread_by_event_name' already exists
ERROR 1050 (42S01) at line 303: Table 'EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME' already exists ERROR 1050 (42S01) at line 303: Table 'events_waits_summary_global_by_event_name' already exists
ERROR 1050 (42S01) at line 320: Table 'FILE_INSTANCES' already exists ERROR 1050 (42S01) at line 320: Table 'file_instances' already exists
ERROR 1050 (42S01) at line 339: Table 'FILE_SUMMARY_BY_EVENT_NAME' already exists ERROR 1050 (42S01) at line 339: Table 'file_summary_by_event_name' already exists
ERROR 1050 (42S01) at line 359: Table 'FILE_SUMMARY_BY_INSTANCE' already exists ERROR 1050 (42S01) at line 359: Table 'file_summary_by_instance' already exists
ERROR 1050 (42S01) at line 376: Table 'MUTEX_INSTANCES' already exists ERROR 1050 (42S01) at line 376: Table 'mutex_instances' already exists
ERROR 1050 (42S01) at line 394: Table 'PERFORMANCE_TIMERS' already exists ERROR 1050 (42S01) at line 394: Table 'performance_timers' already exists
ERROR 1050 (42S01) at line 412: Table 'RWLOCK_INSTANCES' already exists ERROR 1050 (42S01) at line 412: Table 'rwlock_instances' already exists
ERROR 1050 (42S01) at line 428: Table 'SETUP_CONSUMERS' already exists ERROR 1050 (42S01) at line 428: Table 'setup_consumers' already exists
ERROR 1050 (42S01) at line 445: Table 'SETUP_INSTRUMENTS' already exists ERROR 1050 (42S01) at line 445: Table 'setup_instruments' already exists
ERROR 1050 (42S01) at line 461: Table 'SETUP_TIMERS' already exists ERROR 1050 (42S01) at line 461: Table 'setup_timers' already exists
ERROR 1050 (42S01) at line 478: Table 'THREADS' already exists ERROR 1050 (42S01) at line 478: Table 'threads' already exists
ERROR 1644 (HY000) at line 1122: Unexpected content found in the performance_schema database. ERROR 1644 (HY000) at line 1122: Unexpected content found in the performance_schema database.
FATAL ERROR: Upgrade failed FATAL ERROR: Upgrade failed
select name from mysql.event where db='performance_schema'; select name from mysql.event where db='performance_schema';

542
mysql-test/suite/perfschema/r/privilege.result
View File

@ -35,102 +35,102 @@ grant INSERT on performance_schema.* to 'pfs_user_2'@localhost;
grant UPDATE on performance_schema.* to 'pfs_user_2'@localhost; grant UPDATE on performance_schema.* to 'pfs_user_2'@localhost;
grant DELETE on performance_schema.* to 'pfs_user_2'@localhost; grant DELETE on performance_schema.* to 'pfs_user_2'@localhost;
grant LOCK TABLES on performance_schema.* to 'pfs_user_2'@localhost; grant LOCK TABLES on performance_schema.* to 'pfs_user_2'@localhost;
grant ALL on performance_schema.SETUP_INSTRUMENTS to 'pfs_user_3'@localhost grant ALL on performance_schema.setup_instruments to 'pfs_user_3'@localhost
with GRANT OPTION; with GRANT OPTION;
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
grant CREATE on performance_schema.SETUP_INSTRUMENTS to 'pfs_user_3'@localhost; grant CREATE on performance_schema.setup_instruments to 'pfs_user_3'@localhost;
grant DROP on performance_schema.SETUP_INSTRUMENTS to 'pfs_user_3'@localhost; grant DROP on performance_schema.setup_instruments to 'pfs_user_3'@localhost;
grant REFERENCES on performance_schema.SETUP_INSTRUMENTS to 'pfs_user_3'@localhost; grant REFERENCES on performance_schema.setup_instruments to 'pfs_user_3'@localhost;
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
grant INDEX on performance_schema.SETUP_INSTRUMENTS to 'pfs_user_3'@localhost; grant INDEX on performance_schema.setup_instruments to 'pfs_user_3'@localhost;
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
grant ALTER on performance_schema.SETUP_INSTRUMENTS to 'pfs_user_3'@localhost; grant ALTER on performance_schema.setup_instruments to 'pfs_user_3'@localhost;
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
grant CREATE VIEW on performance_schema.SETUP_INSTRUMENTS to 'pfs_user_3'@localhost; grant CREATE VIEW on performance_schema.setup_instruments to 'pfs_user_3'@localhost;
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
grant SHOW VIEW on performance_schema.SETUP_INSTRUMENTS to 'pfs_user_3'@localhost; grant SHOW VIEW on performance_schema.setup_instruments to 'pfs_user_3'@localhost;
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
grant TRIGGER on performance_schema.SETUP_INSTRUMENTS to 'pfs_user_3'@localhost; grant TRIGGER on performance_schema.setup_instruments to 'pfs_user_3'@localhost;
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
grant INSERT on performance_schema.SETUP_INSTRUMENTS to 'pfs_user_3'@localhost; grant INSERT on performance_schema.setup_instruments to 'pfs_user_3'@localhost;
ERROR 42000: INSERT,GRANT command denied to user 'root'@'localhost' for table 'SETUP_INSTRUMENTS' ERROR 42000: INSERT,GRANT command denied to user 'root'@'localhost' for table 'setup_instruments'
grant DELETE on performance_schema.SETUP_INSTRUMENTS to 'pfs_user_3'@localhost; grant DELETE on performance_schema.setup_instruments to 'pfs_user_3'@localhost;
ERROR 42000: DELETE,GRANT command denied to user 'root'@'localhost' for table 'SETUP_INSTRUMENTS' ERROR 42000: DELETE,GRANT command denied to user 'root'@'localhost' for table 'setup_instruments'
grant SELECT on performance_schema.SETUP_INSTRUMENTS to 'pfs_user_3'@localhost grant SELECT on performance_schema.setup_instruments to 'pfs_user_3'@localhost
with GRANT OPTION; with GRANT OPTION;
grant UPDATE on performance_schema.SETUP_INSTRUMENTS to 'pfs_user_3'@localhost grant UPDATE on performance_schema.setup_instruments to 'pfs_user_3'@localhost
with GRANT OPTION; with GRANT OPTION;
grant ALL on performance_schema.EVENTS_WAITS_CURRENT to 'pfs_user_3'@localhost grant ALL on performance_schema.events_waits_current to 'pfs_user_3'@localhost
with GRANT OPTION; with GRANT OPTION;
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
grant CREATE on performance_schema.EVENTS_WAITS_CURRENT to 'pfs_user_3'@localhost; grant CREATE on performance_schema.events_waits_current to 'pfs_user_3'@localhost;
grant DROP on performance_schema.EVENTS_WAITS_CURRENT to 'pfs_user_3'@localhost; grant DROP on performance_schema.events_waits_current to 'pfs_user_3'@localhost;
grant REFERENCES on performance_schema.EVENTS_WAITS_CURRENT to 'pfs_user_3'@localhost; grant REFERENCES on performance_schema.events_waits_current to 'pfs_user_3'@localhost;
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
grant INDEX on performance_schema.EVENTS_WAITS_CURRENT to 'pfs_user_3'@localhost; grant INDEX on performance_schema.events_waits_current to 'pfs_user_3'@localhost;
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
grant ALTER on performance_schema.EVENTS_WAITS_CURRENT to 'pfs_user_3'@localhost; grant ALTER on performance_schema.events_waits_current to 'pfs_user_3'@localhost;
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
grant CREATE VIEW on performance_schema.EVENTS_WAITS_CURRENT to 'pfs_user_3'@localhost; grant CREATE VIEW on performance_schema.events_waits_current to 'pfs_user_3'@localhost;
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
grant SHOW VIEW on performance_schema.EVENTS_WAITS_CURRENT to 'pfs_user_3'@localhost; grant SHOW VIEW on performance_schema.events_waits_current to 'pfs_user_3'@localhost;
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
grant TRIGGER on performance_schema.EVENTS_WAITS_CURRENT to 'pfs_user_3'@localhost; grant TRIGGER on performance_schema.events_waits_current to 'pfs_user_3'@localhost;
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
grant INSERT on performance_schema.EVENTS_WAITS_CURRENT to 'pfs_user_3'@localhost; grant INSERT on performance_schema.events_waits_current to 'pfs_user_3'@localhost;
ERROR 42000: INSERT,GRANT command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_CURRENT' ERROR 42000: INSERT,GRANT command denied to user 'root'@'localhost' for table 'events_waits_current'
grant UPDATE on performance_schema.EVENTS_WAITS_CURRENT to 'pfs_user_3'@localhost; grant UPDATE on performance_schema.events_waits_current to 'pfs_user_3'@localhost;
ERROR 42000: UPDATE,GRANT command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_CURRENT' ERROR 42000: UPDATE,GRANT command denied to user 'root'@'localhost' for table 'events_waits_current'
grant DELETE on performance_schema.EVENTS_WAITS_CURRENT to 'pfs_user_3'@localhost; grant DELETE on performance_schema.events_waits_current to 'pfs_user_3'@localhost;
ERROR 42000: DELETE,GRANT command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_CURRENT' ERROR 42000: DELETE,GRANT command denied to user 'root'@'localhost' for table 'events_waits_current'
grant SELECT on performance_schema.EVENTS_WAITS_CURRENT to 'pfs_user_3'@localhost grant SELECT on performance_schema.events_waits_current to 'pfs_user_3'@localhost
with GRANT OPTION; with GRANT OPTION;
grant ALL on performance_schema.FILE_INSTANCES to 'pfs_user_3'@localhost grant ALL on performance_schema.file_instances to 'pfs_user_3'@localhost
with GRANT OPTION; with GRANT OPTION;
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
grant CREATE on performance_schema.FILE_INSTANCES to 'pfs_user_3'@localhost; grant CREATE on performance_schema.file_instances to 'pfs_user_3'@localhost;
grant DROP on performance_schema.FILE_INSTANCES to 'pfs_user_3'@localhost; grant DROP on performance_schema.file_instances to 'pfs_user_3'@localhost;
grant REFERENCES on performance_schema.FILE_INSTANCES to 'pfs_user_3'@localhost; grant REFERENCES on performance_schema.file_instances to 'pfs_user_3'@localhost;
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
grant INDEX on performance_schema.FILE_INSTANCES to 'pfs_user_3'@localhost; grant INDEX on performance_schema.file_instances to 'pfs_user_3'@localhost;
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
grant ALTER on performance_schema.FILE_INSTANCES to 'pfs_user_3'@localhost; grant ALTER on performance_schema.file_instances to 'pfs_user_3'@localhost;
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
grant CREATE VIEW on performance_schema.FILE_INSTANCES to 'pfs_user_3'@localhost; grant CREATE VIEW on performance_schema.file_instances to 'pfs_user_3'@localhost;
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
grant SHOW VIEW on performance_schema.FILE_INSTANCES to 'pfs_user_3'@localhost; grant SHOW VIEW on performance_schema.file_instances to 'pfs_user_3'@localhost;
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
grant TRIGGER on performance_schema.FILE_INSTANCES to 'pfs_user_3'@localhost; grant TRIGGER on performance_schema.file_instances to 'pfs_user_3'@localhost;
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
grant INSERT on performance_schema.FILE_INSTANCES to 'pfs_user_3'@localhost; grant INSERT on performance_schema.file_instances to 'pfs_user_3'@localhost;
ERROR 42000: INSERT,GRANT command denied to user 'root'@'localhost' for table 'FILE_INSTANCES' ERROR 42000: INSERT,GRANT command denied to user 'root'@'localhost' for table 'file_instances'
grant UPDATE on performance_schema.FILE_INSTANCES to 'pfs_user_3'@localhost; grant UPDATE on performance_schema.file_instances to 'pfs_user_3'@localhost;
ERROR 42000: UPDATE,GRANT command denied to user 'root'@'localhost' for table 'FILE_INSTANCES' ERROR 42000: UPDATE,GRANT command denied to user 'root'@'localhost' for table 'file_instances'
grant DELETE on performance_schema.FILE_INSTANCES to 'pfs_user_3'@localhost; grant DELETE on performance_schema.file_instances to 'pfs_user_3'@localhost;
ERROR 42000: DELETE,GRANT command denied to user 'root'@'localhost' for table 'FILE_INSTANCES' ERROR 42000: DELETE,GRANT command denied to user 'root'@'localhost' for table 'file_instances'
grant SELECT on performance_schema.FILE_INSTANCES to 'pfs_user_3'@localhost grant SELECT on performance_schema.file_instances to 'pfs_user_3'@localhost
with GRANT OPTION; with GRANT OPTION;
grant LOCK TABLES on performance_schema.* to 'pfs_user_3'@localhost grant LOCK TABLES on performance_schema.* to 'pfs_user_3'@localhost
with GRANT OPTION; with GRANT OPTION;
flush privileges; flush privileges;
drop table if exists test.t1; drop table if exists test.t1;
rename table performance_schema.SETUP_INSTRUMENTS to test.t1; rename table performance_schema.setup_instruments to test.t1;
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
rename table performance_schema.EVENTS_WAITS_CURRENT to test.t1; rename table performance_schema.events_waits_current to test.t1;
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
rename table performance_schema.FILE_INSTANCES to test.t1; rename table performance_schema.file_instances to test.t1;
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
rename table performance_schema.SETUP_INSTRUMENTS to performance_schema.t1; rename table performance_schema.setup_instruments to performance_schema.t1;
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
rename table performance_schema.EVENTS_WAITS_CURRENT to performance_schema.t1; rename table performance_schema.events_waits_current to performance_schema.t1;
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
rename table performance_schema.FILE_INSTANCES to performance_schema.t1; rename table performance_schema.file_instances to performance_schema.t1;
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
rename table performance_schema.SETUP_INSTRUMENTS rename table performance_schema.setup_instruments
to performance_schema.EVENTS_WAITS_CURRENT; to performance_schema.events_waits_current;
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
rename table performance_schema.EVENTS_WAITS_CURRENT rename table performance_schema.events_waits_current
to performance_schema.SETUP_INSTRUMENTS; to performance_schema.setup_instruments;
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
create procedure performance_schema.my_proc() begin end; create procedure performance_schema.my_proc() begin end;
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
@ -140,95 +140,95 @@ create event performance_schema.my_event on schedule every 15 minute
do begin end; do begin end;
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
create trigger performance_schema.bi_setup_instruments create trigger performance_schema.bi_setup_instruments
before insert on performance_schema.SETUP_INSTRUMENTS before insert on performance_schema.setup_instruments
for each row begin end; for each row begin end;
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
create trigger performance_schema.bi_events_waits_current create trigger performance_schema.bi_events_waits_current
before insert on performance_schema.EVENTS_WAITS_CURRENT before insert on performance_schema.events_waits_current
for each row begin end; for each row begin end;
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
create trigger performance_schema.bi_file_instances create trigger performance_schema.bi_file_instances
before insert on performance_schema.FILE_INSTANCES before insert on performance_schema.file_instances
for each row begin end; for each row begin end;
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
create table test.t1(a int) engine=PERFORMANCE_SCHEMA; create table test.t1(a int) engine=PERFORMANCE_SCHEMA;
ERROR HY000: Invalid performance_schema usage. ERROR HY000: Invalid performance_schema usage.
create table test.t1 like performance_schema.SETUP_INSTRUMENTS; create table test.t1 like performance_schema.setup_instruments;
ERROR HY000: Invalid performance_schema usage. ERROR HY000: Invalid performance_schema usage.
create table test.t1 like performance_schema.EVENTS_WAITS_CURRENT; create table test.t1 like performance_schema.events_waits_current;
ERROR HY000: Invalid performance_schema usage. ERROR HY000: Invalid performance_schema usage.
create table test.t1 like performance_schema.FILE_INSTANCES; create table test.t1 like performance_schema.file_instances;
ERROR HY000: Invalid performance_schema usage. ERROR HY000: Invalid performance_schema usage.
insert into performance_schema.SETUP_INSTRUMENTS insert into performance_schema.setup_instruments
set name="foo"; set name="foo";
ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'SETUP_INSTRUMENTS' ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'setup_instruments'
insert into performance_schema.EVENTS_WAITS_CURRENT insert into performance_schema.events_waits_current
set name="foo"; set name="foo";
ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_CURRENT' ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_waits_current'
insert into performance_schema.FILE_INSTANCES insert into performance_schema.file_instances
set name="foo"; set name="foo";
ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'FILE_INSTANCES' ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'file_instances'
delete from performance_schema.SETUP_INSTRUMENTS; delete from performance_schema.setup_instruments;
ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'SETUP_INSTRUMENTS' ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'setup_instruments'
delete from performance_schema.EVENTS_WAITS_CURRENT; delete from performance_schema.events_waits_current;
ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_CURRENT' ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_waits_current'
delete from performance_schema.FILE_INSTANCES; delete from performance_schema.file_instances;
ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'FILE_INSTANCES' ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'file_instances'
lock table performance_schema.SETUP_INSTRUMENTS read; lock table performance_schema.setup_instruments read;
unlock tables; unlock tables;
lock table performance_schema.SETUP_INSTRUMENTS write; lock table performance_schema.setup_instruments write;
unlock tables; unlock tables;
lock table performance_schema.EVENTS_WAITS_CURRENT read; lock table performance_schema.events_waits_current read;
ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_CURRENT' ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'events_waits_current'
unlock tables; unlock tables;
lock table performance_schema.EVENTS_WAITS_CURRENT write; lock table performance_schema.events_waits_current write;
ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_CURRENT' ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'events_waits_current'
unlock tables; unlock tables;
lock table performance_schema.FILE_INSTANCES read; lock table performance_schema.file_instances read;
ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'FILE_INSTANCES' ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'file_instances'
unlock tables; unlock tables;
lock table performance_schema.FILE_INSTANCES write; lock table performance_schema.file_instances write;
ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'FILE_INSTANCES' ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'file_instances'
unlock tables; unlock tables;
# #
# WL#4818, NFS2: Can use grants to give normal user access # WL#4818, NFS2: Can use grants to give normal user access
# to view data from _CURRENT and _HISTORY tables # to view data from _current and _history tables
# #
# Should work as pfs_user_1 and pfs_user_2, but not as pfs_user_3. # Should work as pfs_user_1 and pfs_user_2, but not as pfs_user_3.
# (Except for EVENTS_WAITS_CURRENT, which is granted.) # (Except for events_waits_current, which is granted.)
SELECT "can select" FROM performance_schema.EVENTS_WAITS_HISTORY LIMIT 1; SELECT "can select" FROM performance_schema.events_waits_history LIMIT 1;
can select can select
can select can select
SELECT "can select" FROM performance_schema.EVENTS_WAITS_HISTORY_LONG LIMIT 1; SELECT "can select" FROM performance_schema.events_waits_history_long LIMIT 1;
can select can select
can select can select
SELECT "can select" FROM performance_schema.EVENTS_WAITS_CURRENT LIMIT 1; SELECT "can select" FROM performance_schema.events_waits_current LIMIT 1;
can select can select
can select can select
SELECT "can select" FROM performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE LIMIT 1; SELECT "can select" FROM performance_schema.events_waits_summary_by_instance LIMIT 1;
can select can select
can select can select
SELECT "can select" FROM performance_schema.FILE_SUMMARY_BY_INSTANCE LIMIT 1; SELECT "can select" FROM performance_schema.file_summary_by_instance LIMIT 1;
can select can select
can select can select
drop table if exists test.t1; drop table if exists test.t1;
rename table performance_schema.SETUP_INSTRUMENTS to test.t1; rename table performance_schema.setup_instruments to test.t1;
ERROR 42000: Access denied for user 'pfs_user_1'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'pfs_user_1'@'localhost' to database 'performance_schema'
rename table performance_schema.EVENTS_WAITS_CURRENT to test.t1; rename table performance_schema.events_waits_current to test.t1;
ERROR 42000: Access denied for user 'pfs_user_1'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'pfs_user_1'@'localhost' to database 'performance_schema'
rename table performance_schema.FILE_INSTANCES to test.t1; rename table performance_schema.file_instances to test.t1;
ERROR 42000: Access denied for user 'pfs_user_1'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'pfs_user_1'@'localhost' to database 'performance_schema'
rename table performance_schema.SETUP_INSTRUMENTS to performance_schema.t1; rename table performance_schema.setup_instruments to performance_schema.t1;
ERROR 42000: Access denied for user 'pfs_user_1'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'pfs_user_1'@'localhost' to database 'performance_schema'
rename table performance_schema.EVENTS_WAITS_CURRENT to performance_schema.t1; rename table performance_schema.events_waits_current to performance_schema.t1;
ERROR 42000: Access denied for user 'pfs_user_1'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'pfs_user_1'@'localhost' to database 'performance_schema'
rename table performance_schema.FILE_INSTANCES to performance_schema.t1; rename table performance_schema.file_instances to performance_schema.t1;
ERROR 42000: Access denied for user 'pfs_user_1'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'pfs_user_1'@'localhost' to database 'performance_schema'
rename table performance_schema.SETUP_INSTRUMENTS rename table performance_schema.setup_instruments
to performance_schema.EVENTS_WAITS_CURRENT; to performance_schema.events_waits_current;
ERROR 42000: Access denied for user 'pfs_user_1'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'pfs_user_1'@'localhost' to database 'performance_schema'
rename table performance_schema.EVENTS_WAITS_CURRENT rename table performance_schema.events_waits_current
to performance_schema.SETUP_INSTRUMENTS; to performance_schema.setup_instruments;
ERROR 42000: Access denied for user 'pfs_user_1'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'pfs_user_1'@'localhost' to database 'performance_schema'
create procedure performance_schema.my_proc() begin end; create procedure performance_schema.my_proc() begin end;
ERROR 42000: Access denied for user 'pfs_user_1'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'pfs_user_1'@'localhost' to database 'performance_schema'
@ -238,95 +238,95 @@ create event performance_schema.my_event on schedule every 15 minute
do begin end; do begin end;
ERROR 42000: Access denied for user 'pfs_user_1'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'pfs_user_1'@'localhost' to database 'performance_schema'
create trigger performance_schema.bi_setup_instruments create trigger performance_schema.bi_setup_instruments
before insert on performance_schema.SETUP_INSTRUMENTS before insert on performance_schema.setup_instruments
for each row begin end; for each row begin end;
ERROR 42000: Access denied for user 'pfs_user_1'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'pfs_user_1'@'localhost' to database 'performance_schema'
create trigger performance_schema.bi_events_waits_current create trigger performance_schema.bi_events_waits_current
before insert on performance_schema.EVENTS_WAITS_CURRENT before insert on performance_schema.events_waits_current
for each row begin end; for each row begin end;
ERROR 42000: Access denied for user 'pfs_user_1'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'pfs_user_1'@'localhost' to database 'performance_schema'
create trigger performance_schema.bi_file_instances create trigger performance_schema.bi_file_instances
before insert on performance_schema.FILE_INSTANCES before insert on performance_schema.file_instances
for each row begin end; for each row begin end;
ERROR 42000: Access denied for user 'pfs_user_1'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'pfs_user_1'@'localhost' to database 'performance_schema'
create table test.t1(a int) engine=PERFORMANCE_SCHEMA; create table test.t1(a int) engine=PERFORMANCE_SCHEMA;
ERROR HY000: Invalid performance_schema usage. ERROR HY000: Invalid performance_schema usage.
create table test.t1 like performance_schema.SETUP_INSTRUMENTS; create table test.t1 like performance_schema.setup_instruments;
ERROR HY000: Invalid performance_schema usage. ERROR HY000: Invalid performance_schema usage.
create table test.t1 like performance_schema.EVENTS_WAITS_CURRENT; create table test.t1 like performance_schema.events_waits_current;
ERROR HY000: Invalid performance_schema usage. ERROR HY000: Invalid performance_schema usage.
create table test.t1 like performance_schema.FILE_INSTANCES; create table test.t1 like performance_schema.file_instances;
ERROR HY000: Invalid performance_schema usage. ERROR HY000: Invalid performance_schema usage.
insert into performance_schema.SETUP_INSTRUMENTS insert into performance_schema.setup_instruments
set name="foo"; set name="foo";
ERROR 42000: INSERT command denied to user 'pfs_user_1'@'localhost' for table 'SETUP_INSTRUMENTS' ERROR 42000: INSERT command denied to user 'pfs_user_1'@'localhost' for table 'setup_instruments'
insert into performance_schema.EVENTS_WAITS_CURRENT insert into performance_schema.events_waits_current
set name="foo"; set name="foo";
ERROR 42000: INSERT command denied to user 'pfs_user_1'@'localhost' for table 'EVENTS_WAITS_CURRENT' ERROR 42000: INSERT command denied to user 'pfs_user_1'@'localhost' for table 'events_waits_current'
insert into performance_schema.FILE_INSTANCES insert into performance_schema.file_instances
set name="foo"; set name="foo";
ERROR 42000: INSERT command denied to user 'pfs_user_1'@'localhost' for table 'FILE_INSTANCES' ERROR 42000: INSERT command denied to user 'pfs_user_1'@'localhost' for table 'file_instances'
delete from performance_schema.SETUP_INSTRUMENTS; delete from performance_schema.setup_instruments;
ERROR 42000: DELETE command denied to user 'pfs_user_1'@'localhost' for table 'SETUP_INSTRUMENTS' ERROR 42000: DELETE command denied to user 'pfs_user_1'@'localhost' for table 'setup_instruments'
delete from performance_schema.EVENTS_WAITS_CURRENT; delete from performance_schema.events_waits_current;
ERROR 42000: DELETE command denied to user 'pfs_user_1'@'localhost' for table 'EVENTS_WAITS_CURRENT' ERROR 42000: DELETE command denied to user 'pfs_user_1'@'localhost' for table 'events_waits_current'
delete from performance_schema.FILE_INSTANCES; delete from performance_schema.file_instances;
ERROR 42000: DELETE command denied to user 'pfs_user_1'@'localhost' for table 'FILE_INSTANCES' ERROR 42000: DELETE command denied to user 'pfs_user_1'@'localhost' for table 'file_instances'
lock table performance_schema.SETUP_INSTRUMENTS read; lock table performance_schema.setup_instruments read;
unlock tables; unlock tables;
lock table performance_schema.SETUP_INSTRUMENTS write; lock table performance_schema.setup_instruments write;
unlock tables; unlock tables;
lock table performance_schema.EVENTS_WAITS_CURRENT read; lock table performance_schema.events_waits_current read;
ERROR 42000: SELECT,LOCK TABL command denied to user 'pfs_user_1'@'localhost' for table 'EVENTS_WAITS_CURRENT' ERROR 42000: SELECT,LOCK TABL command denied to user 'pfs_user_1'@'localhost' for table 'events_waits_current'
unlock tables; unlock tables;
lock table performance_schema.EVENTS_WAITS_CURRENT write; lock table performance_schema.events_waits_current write;
ERROR 42000: SELECT,LOCK TABL command denied to user 'pfs_user_1'@'localhost' for table 'EVENTS_WAITS_CURRENT' ERROR 42000: SELECT,LOCK TABL command denied to user 'pfs_user_1'@'localhost' for table 'events_waits_current'
unlock tables; unlock tables;
lock table performance_schema.FILE_INSTANCES read; lock table performance_schema.file_instances read;
ERROR 42000: SELECT,LOCK TABL command denied to user 'pfs_user_1'@'localhost' for table 'FILE_INSTANCES' ERROR 42000: SELECT,LOCK TABL command denied to user 'pfs_user_1'@'localhost' for table 'file_instances'
unlock tables; unlock tables;
lock table performance_schema.FILE_INSTANCES write; lock table performance_schema.file_instances write;
ERROR 42000: SELECT,LOCK TABL command denied to user 'pfs_user_1'@'localhost' for table 'FILE_INSTANCES' ERROR 42000: SELECT,LOCK TABL command denied to user 'pfs_user_1'@'localhost' for table 'file_instances'
unlock tables; unlock tables;
# #
# WL#4818, NFS2: Can use grants to give normal user access # WL#4818, NFS2: Can use grants to give normal user access
# to view data from _CURRENT and _HISTORY tables # to view data from _current and _history tables
# #
# Should work as pfs_user_1 and pfs_user_2, but not as pfs_user_3. # Should work as pfs_user_1 and pfs_user_2, but not as pfs_user_3.
# (Except for EVENTS_WAITS_CURRENT, which is granted.) # (Except for events_waits_current, which is granted.)
SELECT "can select" FROM performance_schema.EVENTS_WAITS_HISTORY LIMIT 1; SELECT "can select" FROM performance_schema.events_waits_history LIMIT 1;
can select can select
can select can select
SELECT "can select" FROM performance_schema.EVENTS_WAITS_HISTORY_LONG LIMIT 1; SELECT "can select" FROM performance_schema.events_waits_history_long LIMIT 1;
can select can select
can select can select
SELECT "can select" FROM performance_schema.EVENTS_WAITS_CURRENT LIMIT 1; SELECT "can select" FROM performance_schema.events_waits_current LIMIT 1;
can select can select
can select can select
SELECT "can select" FROM performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE LIMIT 1; SELECT "can select" FROM performance_schema.events_waits_summary_by_instance LIMIT 1;
can select can select
can select can select
SELECT "can select" FROM performance_schema.FILE_SUMMARY_BY_INSTANCE LIMIT 1; SELECT "can select" FROM performance_schema.file_summary_by_instance LIMIT 1;
can select can select
can select can select
drop table if exists test.t1; drop table if exists test.t1;
rename table performance_schema.SETUP_INSTRUMENTS to test.t1; rename table performance_schema.setup_instruments to test.t1;
ERROR 42000: Access denied for user 'pfs_user_2'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'pfs_user_2'@'localhost' to database 'performance_schema'
rename table performance_schema.EVENTS_WAITS_CURRENT to test.t1; rename table performance_schema.events_waits_current to test.t1;
ERROR 42000: Access denied for user 'pfs_user_2'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'pfs_user_2'@'localhost' to database 'performance_schema'
rename table performance_schema.FILE_INSTANCES to test.t1; rename table performance_schema.file_instances to test.t1;
ERROR 42000: Access denied for user 'pfs_user_2'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'pfs_user_2'@'localhost' to database 'performance_schema'
rename table performance_schema.SETUP_INSTRUMENTS to performance_schema.t1; rename table performance_schema.setup_instruments to performance_schema.t1;
ERROR 42000: Access denied for user 'pfs_user_2'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'pfs_user_2'@'localhost' to database 'performance_schema'
rename table performance_schema.EVENTS_WAITS_CURRENT to performance_schema.t1; rename table performance_schema.events_waits_current to performance_schema.t1;
ERROR 42000: Access denied for user 'pfs_user_2'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'pfs_user_2'@'localhost' to database 'performance_schema'
rename table performance_schema.FILE_INSTANCES to performance_schema.t1; rename table performance_schema.file_instances to performance_schema.t1;
ERROR 42000: Access denied for user 'pfs_user_2'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'pfs_user_2'@'localhost' to database 'performance_schema'
rename table performance_schema.SETUP_INSTRUMENTS rename table performance_schema.setup_instruments
to performance_schema.EVENTS_WAITS_CURRENT; to performance_schema.events_waits_current;
ERROR 42000: Access denied for user 'pfs_user_2'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'pfs_user_2'@'localhost' to database 'performance_schema'
rename table performance_schema.EVENTS_WAITS_CURRENT rename table performance_schema.events_waits_current
to performance_schema.SETUP_INSTRUMENTS; to performance_schema.setup_instruments;
ERROR 42000: Access denied for user 'pfs_user_2'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'pfs_user_2'@'localhost' to database 'performance_schema'
create procedure performance_schema.my_proc() begin end; create procedure performance_schema.my_proc() begin end;
ERROR 42000: Access denied for user 'pfs_user_2'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'pfs_user_2'@'localhost' to database 'performance_schema'
@ -336,95 +336,95 @@ create event performance_schema.my_event on schedule every 15 minute
do begin end; do begin end;
ERROR 42000: Access denied for user 'pfs_user_2'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'pfs_user_2'@'localhost' to database 'performance_schema'
create trigger performance_schema.bi_setup_instruments create trigger performance_schema.bi_setup_instruments
before insert on performance_schema.SETUP_INSTRUMENTS before insert on performance_schema.setup_instruments
for each row begin end; for each row begin end;
ERROR 42000: Access denied for user 'pfs_user_2'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'pfs_user_2'@'localhost' to database 'performance_schema'
create trigger performance_schema.bi_events_waits_current create trigger performance_schema.bi_events_waits_current
before insert on performance_schema.EVENTS_WAITS_CURRENT before insert on performance_schema.events_waits_current
for each row begin end; for each row begin end;
ERROR 42000: Access denied for user 'pfs_user_2'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'pfs_user_2'@'localhost' to database 'performance_schema'
create trigger performance_schema.bi_file_instances create trigger performance_schema.bi_file_instances
before insert on performance_schema.FILE_INSTANCES before insert on performance_schema.file_instances
for each row begin end; for each row begin end;
ERROR 42000: Access denied for user 'pfs_user_2'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'pfs_user_2'@'localhost' to database 'performance_schema'
create table test.t1(a int) engine=PERFORMANCE_SCHEMA; create table test.t1(a int) engine=PERFORMANCE_SCHEMA;
ERROR HY000: Invalid performance_schema usage. ERROR HY000: Invalid performance_schema usage.
create table test.t1 like performance_schema.SETUP_INSTRUMENTS; create table test.t1 like performance_schema.setup_instruments;
ERROR HY000: Invalid performance_schema usage. ERROR HY000: Invalid performance_schema usage.
create table test.t1 like performance_schema.EVENTS_WAITS_CURRENT; create table test.t1 like performance_schema.events_waits_current;
ERROR HY000: Invalid performance_schema usage. ERROR HY000: Invalid performance_schema usage.
create table test.t1 like performance_schema.FILE_INSTANCES; create table test.t1 like performance_schema.file_instances;
ERROR HY000: Invalid performance_schema usage. ERROR HY000: Invalid performance_schema usage.
insert into performance_schema.SETUP_INSTRUMENTS insert into performance_schema.setup_instruments
set name="foo"; set name="foo";
ERROR 42000: INSERT command denied to user 'pfs_user_2'@'localhost' for table 'SETUP_INSTRUMENTS' ERROR 42000: INSERT command denied to user 'pfs_user_2'@'localhost' for table 'setup_instruments'
insert into performance_schema.EVENTS_WAITS_CURRENT insert into performance_schema.events_waits_current
set name="foo"; set name="foo";
ERROR 42000: INSERT command denied to user 'pfs_user_2'@'localhost' for table 'EVENTS_WAITS_CURRENT' ERROR 42000: INSERT command denied to user 'pfs_user_2'@'localhost' for table 'events_waits_current'
insert into performance_schema.FILE_INSTANCES insert into performance_schema.file_instances
set name="foo"; set name="foo";
ERROR 42000: INSERT command denied to user 'pfs_user_2'@'localhost' for table 'FILE_INSTANCES' ERROR 42000: INSERT command denied to user 'pfs_user_2'@'localhost' for table 'file_instances'
delete from performance_schema.SETUP_INSTRUMENTS; delete from performance_schema.setup_instruments;
ERROR 42000: DELETE command denied to user 'pfs_user_2'@'localhost' for table 'SETUP_INSTRUMENTS' ERROR 42000: DELETE command denied to user 'pfs_user_2'@'localhost' for table 'setup_instruments'
delete from performance_schema.EVENTS_WAITS_CURRENT; delete from performance_schema.events_waits_current;
ERROR 42000: DELETE command denied to user 'pfs_user_2'@'localhost' for table 'EVENTS_WAITS_CURRENT' ERROR 42000: DELETE command denied to user 'pfs_user_2'@'localhost' for table 'events_waits_current'
delete from performance_schema.FILE_INSTANCES; delete from performance_schema.file_instances;
ERROR 42000: DELETE command denied to user 'pfs_user_2'@'localhost' for table 'FILE_INSTANCES' ERROR 42000: DELETE command denied to user 'pfs_user_2'@'localhost' for table 'file_instances'
lock table performance_schema.SETUP_INSTRUMENTS read; lock table performance_schema.setup_instruments read;
unlock tables; unlock tables;
lock table performance_schema.SETUP_INSTRUMENTS write; lock table performance_schema.setup_instruments write;
unlock tables; unlock tables;
lock table performance_schema.EVENTS_WAITS_CURRENT read; lock table performance_schema.events_waits_current read;
ERROR 42000: SELECT,LOCK TABL command denied to user 'pfs_user_2'@'localhost' for table 'EVENTS_WAITS_CURRENT' ERROR 42000: SELECT,LOCK TABL command denied to user 'pfs_user_2'@'localhost' for table 'events_waits_current'
unlock tables; unlock tables;
lock table performance_schema.EVENTS_WAITS_CURRENT write; lock table performance_schema.events_waits_current write;
ERROR 42000: SELECT,LOCK TABL command denied to user 'pfs_user_2'@'localhost' for table 'EVENTS_WAITS_CURRENT' ERROR 42000: SELECT,LOCK TABL command denied to user 'pfs_user_2'@'localhost' for table 'events_waits_current'
unlock tables; unlock tables;
lock table performance_schema.FILE_INSTANCES read; lock table performance_schema.file_instances read;
ERROR 42000: SELECT,LOCK TABL command denied to user 'pfs_user_2'@'localhost' for table 'FILE_INSTANCES' ERROR 42000: SELECT,LOCK TABL command denied to user 'pfs_user_2'@'localhost' for table 'file_instances'
unlock tables; unlock tables;
lock table performance_schema.FILE_INSTANCES write; lock table performance_schema.file_instances write;
ERROR 42000: SELECT,LOCK TABL command denied to user 'pfs_user_2'@'localhost' for table 'FILE_INSTANCES' ERROR 42000: SELECT,LOCK TABL command denied to user 'pfs_user_2'@'localhost' for table 'file_instances'
unlock tables; unlock tables;
# #
# WL#4818, NFS2: Can use grants to give normal user access # WL#4818, NFS2: Can use grants to give normal user access
# to view data from _CURRENT and _HISTORY tables # to view data from _current and _history tables
# #
# Should work as pfs_user_1 and pfs_user_2, but not as pfs_user_3. # Should work as pfs_user_1 and pfs_user_2, but not as pfs_user_3.
# (Except for EVENTS_WAITS_CURRENT, which is granted.) # (Except for events_waits_current, which is granted.)
SELECT "can select" FROM performance_schema.EVENTS_WAITS_HISTORY LIMIT 1; SELECT "can select" FROM performance_schema.events_waits_history LIMIT 1;
can select can select
can select can select
SELECT "can select" FROM performance_schema.EVENTS_WAITS_HISTORY_LONG LIMIT 1; SELECT "can select" FROM performance_schema.events_waits_history_long LIMIT 1;
can select can select
can select can select
SELECT "can select" FROM performance_schema.EVENTS_WAITS_CURRENT LIMIT 1; SELECT "can select" FROM performance_schema.events_waits_current LIMIT 1;
can select can select
can select can select
SELECT "can select" FROM performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE LIMIT 1; SELECT "can select" FROM performance_schema.events_waits_summary_by_instance LIMIT 1;
can select can select
can select can select
SELECT "can select" FROM performance_schema.FILE_SUMMARY_BY_INSTANCE LIMIT 1; SELECT "can select" FROM performance_schema.file_summary_by_instance LIMIT 1;
can select can select
can select can select
drop table if exists test.t1; drop table if exists test.t1;
rename table performance_schema.SETUP_INSTRUMENTS to test.t1; rename table performance_schema.setup_instruments to test.t1;
ERROR 42000: Access denied for user 'pfs_user_3'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'pfs_user_3'@'localhost' to database 'performance_schema'
rename table performance_schema.EVENTS_WAITS_CURRENT to test.t1; rename table performance_schema.events_waits_current to test.t1;
ERROR 42000: Access denied for user 'pfs_user_3'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'pfs_user_3'@'localhost' to database 'performance_schema'
rename table performance_schema.FILE_INSTANCES to test.t1; rename table performance_schema.file_instances to test.t1;
ERROR 42000: Access denied for user 'pfs_user_3'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'pfs_user_3'@'localhost' to database 'performance_schema'
rename table performance_schema.SETUP_INSTRUMENTS to performance_schema.t1; rename table performance_schema.setup_instruments to performance_schema.t1;
ERROR 42000: Access denied for user 'pfs_user_3'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'pfs_user_3'@'localhost' to database 'performance_schema'
rename table performance_schema.EVENTS_WAITS_CURRENT to performance_schema.t1; rename table performance_schema.events_waits_current to performance_schema.t1;
ERROR 42000: Access denied for user 'pfs_user_3'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'pfs_user_3'@'localhost' to database 'performance_schema'
rename table performance_schema.FILE_INSTANCES to performance_schema.t1; rename table performance_schema.file_instances to performance_schema.t1;
ERROR 42000: Access denied for user 'pfs_user_3'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'pfs_user_3'@'localhost' to database 'performance_schema'
rename table performance_schema.SETUP_INSTRUMENTS rename table performance_schema.setup_instruments
to performance_schema.EVENTS_WAITS_CURRENT; to performance_schema.events_waits_current;
ERROR 42000: Access denied for user 'pfs_user_3'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'pfs_user_3'@'localhost' to database 'performance_schema'
rename table performance_schema.EVENTS_WAITS_CURRENT rename table performance_schema.events_waits_current
to performance_schema.SETUP_INSTRUMENTS; to performance_schema.setup_instruments;
ERROR 42000: Access denied for user 'pfs_user_3'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'pfs_user_3'@'localhost' to database 'performance_schema'
create procedure performance_schema.my_proc() begin end; create procedure performance_schema.my_proc() begin end;
ERROR 42000: Access denied for user 'pfs_user_3'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'pfs_user_3'@'localhost' to database 'performance_schema'
@ -434,73 +434,73 @@ create event performance_schema.my_event on schedule every 15 minute
do begin end; do begin end;
ERROR 42000: Access denied for user 'pfs_user_3'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'pfs_user_3'@'localhost' to database 'performance_schema'
create trigger performance_schema.bi_setup_instruments create trigger performance_schema.bi_setup_instruments
before insert on performance_schema.SETUP_INSTRUMENTS before insert on performance_schema.setup_instruments
for each row begin end; for each row begin end;
ERROR 42000: Access denied for user 'pfs_user_3'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'pfs_user_3'@'localhost' to database 'performance_schema'
create trigger performance_schema.bi_events_waits_current create trigger performance_schema.bi_events_waits_current
before insert on performance_schema.EVENTS_WAITS_CURRENT before insert on performance_schema.events_waits_current
for each row begin end; for each row begin end;
ERROR 42000: Access denied for user 'pfs_user_3'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'pfs_user_3'@'localhost' to database 'performance_schema'
create trigger performance_schema.bi_file_instances create trigger performance_schema.bi_file_instances
before insert on performance_schema.FILE_INSTANCES before insert on performance_schema.file_instances
for each row begin end; for each row begin end;
ERROR 42000: Access denied for user 'pfs_user_3'@'localhost' to database 'performance_schema' ERROR 42000: Access denied for user 'pfs_user_3'@'localhost' to database 'performance_schema'
create table test.t1(a int) engine=PERFORMANCE_SCHEMA; create table test.t1(a int) engine=PERFORMANCE_SCHEMA;
ERROR HY000: Invalid performance_schema usage. ERROR HY000: Invalid performance_schema usage.
create table test.t1 like performance_schema.SETUP_INSTRUMENTS; create table test.t1 like performance_schema.setup_instruments;
ERROR HY000: Invalid performance_schema usage. ERROR HY000: Invalid performance_schema usage.
create table test.t1 like performance_schema.EVENTS_WAITS_CURRENT; create table test.t1 like performance_schema.events_waits_current;
ERROR HY000: Invalid performance_schema usage. ERROR HY000: Invalid performance_schema usage.
create table test.t1 like performance_schema.FILE_INSTANCES; create table test.t1 like performance_schema.file_instances;
ERROR HY000: Invalid performance_schema usage. ERROR HY000: Invalid performance_schema usage.
insert into performance_schema.SETUP_INSTRUMENTS insert into performance_schema.setup_instruments
set name="foo"; set name="foo";
ERROR 42000: INSERT command denied to user 'pfs_user_3'@'localhost' for table 'SETUP_INSTRUMENTS' ERROR 42000: INSERT command denied to user 'pfs_user_3'@'localhost' for table 'setup_instruments'
insert into performance_schema.EVENTS_WAITS_CURRENT insert into performance_schema.events_waits_current
set name="foo"; set name="foo";
ERROR 42000: INSERT command denied to user 'pfs_user_3'@'localhost' for table 'EVENTS_WAITS_CURRENT' ERROR 42000: INSERT command denied to user 'pfs_user_3'@'localhost' for table 'events_waits_current'
insert into performance_schema.FILE_INSTANCES insert into performance_schema.file_instances
set name="foo"; set name="foo";
ERROR 42000: INSERT command denied to user 'pfs_user_3'@'localhost' for table 'FILE_INSTANCES' ERROR 42000: INSERT command denied to user 'pfs_user_3'@'localhost' for table 'file_instances'
delete from performance_schema.SETUP_INSTRUMENTS; delete from performance_schema.setup_instruments;
ERROR 42000: DELETE command denied to user 'pfs_user_3'@'localhost' for table 'SETUP_INSTRUMENTS' ERROR 42000: DELETE command denied to user 'pfs_user_3'@'localhost' for table 'setup_instruments'
delete from performance_schema.EVENTS_WAITS_CURRENT; delete from performance_schema.events_waits_current;
ERROR 42000: DELETE command denied to user 'pfs_user_3'@'localhost' for table 'EVENTS_WAITS_CURRENT' ERROR 42000: DELETE command denied to user 'pfs_user_3'@'localhost' for table 'events_waits_current'
delete from performance_schema.FILE_INSTANCES; delete from performance_schema.file_instances;
ERROR 42000: DELETE command denied to user 'pfs_user_3'@'localhost' for table 'FILE_INSTANCES' ERROR 42000: DELETE command denied to user 'pfs_user_3'@'localhost' for table 'file_instances'
lock table performance_schema.SETUP_INSTRUMENTS read; lock table performance_schema.setup_instruments read;
unlock tables; unlock tables;
lock table performance_schema.SETUP_INSTRUMENTS write; lock table performance_schema.setup_instruments write;
unlock tables; unlock tables;
lock table performance_schema.EVENTS_WAITS_CURRENT read; lock table performance_schema.events_waits_current read;
ERROR 42000: SELECT,LOCK TABL command denied to user 'pfs_user_3'@'localhost' for table 'EVENTS_WAITS_CURRENT' ERROR 42000: SELECT,LOCK TABL command denied to user 'pfs_user_3'@'localhost' for table 'events_waits_current'
unlock tables; unlock tables;
lock table performance_schema.EVENTS_WAITS_CURRENT write; lock table performance_schema.events_waits_current write;
ERROR 42000: SELECT,LOCK TABL command denied to user 'pfs_user_3'@'localhost' for table 'EVENTS_WAITS_CURRENT' ERROR 42000: SELECT,LOCK TABL command denied to user 'pfs_user_3'@'localhost' for table 'events_waits_current'
unlock tables; unlock tables;
lock table performance_schema.FILE_INSTANCES read; lock table performance_schema.file_instances read;
ERROR 42000: SELECT,LOCK TABL command denied to user 'pfs_user_3'@'localhost' for table 'FILE_INSTANCES' ERROR 42000: SELECT,LOCK TABL command denied to user 'pfs_user_3'@'localhost' for table 'file_instances'
unlock tables; unlock tables;
lock table performance_schema.FILE_INSTANCES write; lock table performance_schema.file_instances write;
ERROR 42000: SELECT,LOCK TABL command denied to user 'pfs_user_3'@'localhost' for table 'FILE_INSTANCES' ERROR 42000: SELECT,LOCK TABL command denied to user 'pfs_user_3'@'localhost' for table 'file_instances'
unlock tables; unlock tables;
# #
# WL#4818, NFS2: Can use grants to give normal user access # WL#4818, NFS2: Can use grants to give normal user access
# to view data from _CURRENT and _HISTORY tables # to view data from _current and _history tables
# #
# Should work as pfs_user_1 and pfs_user_2, but not as pfs_user_3. # Should work as pfs_user_1 and pfs_user_2, but not as pfs_user_3.
# (Except for EVENTS_WAITS_CURRENT, which is granted.) # (Except for events_waits_current, which is granted.)
SELECT "can select" FROM performance_schema.EVENTS_WAITS_HISTORY LIMIT 1; SELECT "can select" FROM performance_schema.events_waits_history LIMIT 1;
ERROR 42000: SELECT command denied to user 'pfs_user_3'@'localhost' for table 'EVENTS_WAITS_HISTORY' ERROR 42000: SELECT command denied to user 'pfs_user_3'@'localhost' for table 'events_waits_history'
SELECT "can select" FROM performance_schema.EVENTS_WAITS_HISTORY_LONG LIMIT 1; SELECT "can select" FROM performance_schema.events_waits_history_long LIMIT 1;
ERROR 42000: SELECT command denied to user 'pfs_user_3'@'localhost' for table 'EVENTS_WAITS_HISTORY_LONG' ERROR 42000: SELECT command denied to user 'pfs_user_3'@'localhost' for table 'events_waits_history_long'
SELECT "can select" FROM performance_schema.EVENTS_WAITS_CURRENT LIMIT 1; SELECT "can select" FROM performance_schema.events_waits_current LIMIT 1;
can select can select
can select can select
SELECT "can select" FROM performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE LIMIT 1; SELECT "can select" FROM performance_schema.events_waits_summary_by_instance LIMIT 1;
ERROR 42000: SELECT command denied to user 'pfs_user_3'@'localhost' for table 'EVENTS_WAITS_SUMMARY_BY_INSTANCE' ERROR 42000: SELECT command denied to user 'pfs_user_3'@'localhost' for table 'events_waits_summary_by_instance'
SELECT "can select" FROM performance_schema.FILE_SUMMARY_BY_INSTANCE LIMIT 1; SELECT "can select" FROM performance_schema.file_summary_by_instance LIMIT 1;
ERROR 42000: SELECT command denied to user 'pfs_user_3'@'localhost' for table 'FILE_SUMMARY_BY_INSTANCE' ERROR 42000: SELECT command denied to user 'pfs_user_3'@'localhost' for table 'file_summary_by_instance'
revoke all privileges, grant option from 'pfs_user_1'@localhost; revoke all privileges, grant option from 'pfs_user_1'@localhost;
revoke all privileges, grant option from 'pfs_user_2'@localhost; revoke all privileges, grant option from 'pfs_user_2'@localhost;
revoke all privileges, grant option from 'pfs_user_3'@localhost; revoke all privileges, grant option from 'pfs_user_3'@localhost;
@ -516,63 +516,63 @@ CREATE user pfs_user_4;
# without grants # without grants
# #
# Select as pfs_user_4 should fail without grant # Select as pfs_user_4 should fail without grant
SELECT event_id FROM performance_schema.EVENTS_WAITS_HISTORY; SELECT event_id FROM performance_schema.events_waits_history;
ERROR 42000: SELECT command denied to user 'pfs_user_4'@'localhost' for table 'EVENTS_WAITS_HISTORY' ERROR 42000: SELECT command denied to user 'pfs_user_4'@'localhost' for table 'events_waits_history'
SELECT event_id FROM performance_schema.EVENTS_WAITS_HISTORY_LONG; SELECT event_id FROM performance_schema.events_waits_history_long;
ERROR 42000: SELECT command denied to user 'pfs_user_4'@'localhost' for table 'EVENTS_WAITS_HISTORY_LONG' ERROR 42000: SELECT command denied to user 'pfs_user_4'@'localhost' for table 'events_waits_history_long'
SELECT event_id FROM performance_schema.EVENTS_WAITS_CURRENT; SELECT event_id FROM performance_schema.events_waits_current;
ERROR 42000: SELECT command denied to user 'pfs_user_4'@'localhost' for table 'EVENTS_WAITS_CURRENT' ERROR 42000: SELECT command denied to user 'pfs_user_4'@'localhost' for table 'events_waits_current'
SELECT event_name FROM performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE; SELECT event_name FROM performance_schema.events_waits_summary_by_instance;
ERROR 42000: SELECT command denied to user 'pfs_user_4'@'localhost' for table 'EVENTS_WAITS_SUMMARY_BY_INSTANCE' ERROR 42000: SELECT command denied to user 'pfs_user_4'@'localhost' for table 'events_waits_summary_by_instance'
SELECT event_name FROM performance_schema.FILE_SUMMARY_BY_INSTANCE; SELECT event_name FROM performance_schema.file_summary_by_instance;
ERROR 42000: SELECT command denied to user 'pfs_user_4'@'localhost' for table 'FILE_SUMMARY_BY_INSTANCE' ERROR 42000: SELECT command denied to user 'pfs_user_4'@'localhost' for table 'file_summary_by_instance'
# #
# WL#4818, NFS3: Normal user does not have access to change what is # WL#4818, NFS3: Normal user does not have access to change what is
# instrumented without grants # instrumented without grants
# #
# User pfs_user_4 should not be allowed to tweak instrumentation without # User pfs_user_4 should not be allowed to tweak instrumentation without
# explicit grant # explicit grant
UPDATE performance_schema.SETUP_INSTRUMENTS SET enabled = 'NO', timed = 'YES'; UPDATE performance_schema.setup_instruments SET enabled = 'NO', timed = 'YES';
ERROR 42000: UPDATE command denied to user 'pfs_user_4'@'localhost' for table 'SETUP_INSTRUMENTS' ERROR 42000: UPDATE command denied to user 'pfs_user_4'@'localhost' for table 'setup_instruments'
UPDATE performance_schema.SETUP_INSTRUMENTS SET enabled = 'YES' UPDATE performance_schema.setup_instruments SET enabled = 'YES'
WHERE name LIKE 'wait/synch/mutex/%' WHERE name LIKE 'wait/synch/mutex/%'
OR name LIKE 'wait/synch/rwlock/%'; OR name LIKE 'wait/synch/rwlock/%';
ERROR 42000: UPDATE command denied to user 'pfs_user_4'@'localhost' for table 'SETUP_INSTRUMENTS' ERROR 42000: UPDATE command denied to user 'pfs_user_4'@'localhost' for table 'setup_instruments'
UPDATE performance_schema.SETUP_CONSUMERS SET enabled = 'YES'; UPDATE performance_schema.setup_consumers SET enabled = 'YES';
ERROR 42000: UPDATE command denied to user 'pfs_user_4'@'localhost' for table 'SETUP_CONSUMERS' ERROR 42000: UPDATE command denied to user 'pfs_user_4'@'localhost' for table 'setup_consumers'
UPDATE performance_schema.SETUP_TIMERS SET timer_name = 'TICK'; UPDATE performance_schema.setup_timers SET timer_name = 'TICK';
ERROR 42000: UPDATE command denied to user 'pfs_user_4'@'localhost' for table 'SETUP_TIMERS' ERROR 42000: UPDATE command denied to user 'pfs_user_4'@'localhost' for table 'setup_timers'
TRUNCATE TABLE performance_schema.EVENTS_WAITS_HISTORY_LONG; TRUNCATE TABLE performance_schema.events_waits_history_long;
ERROR 42000: DROP command denied to user 'pfs_user_4'@'localhost' for table 'EVENTS_WAITS_HISTORY_LONG' ERROR 42000: DROP command denied to user 'pfs_user_4'@'localhost' for table 'events_waits_history_long'
TRUNCATE TABLE performance_schema.EVENTS_WAITS_HISTORY; TRUNCATE TABLE performance_schema.events_waits_history;
ERROR 42000: DROP command denied to user 'pfs_user_4'@'localhost' for table 'EVENTS_WAITS_HISTORY' ERROR 42000: DROP command denied to user 'pfs_user_4'@'localhost' for table 'events_waits_history'
TRUNCATE TABLE performance_schema.EVENTS_WAITS_CURRENT; TRUNCATE TABLE performance_schema.events_waits_current;
ERROR 42000: DROP command denied to user 'pfs_user_4'@'localhost' for table 'EVENTS_WAITS_CURRENT' ERROR 42000: DROP command denied to user 'pfs_user_4'@'localhost' for table 'events_waits_current'
# #
# WL#4814, NFS1: Can use grants to give normal user access # WL#4814, NFS1: Can use grants to give normal user access
# to turn on and off instrumentation # to turn on and off instrumentation
# #
# Grant access to change tables with the root account # Grant access to change tables with the root account
GRANT UPDATE ON performance_schema.SETUP_CONSUMERS TO pfs_user_4; GRANT UPDATE ON performance_schema.setup_consumers TO pfs_user_4;
GRANT UPDATE ON performance_schema.SETUP_TIMERS TO pfs_user_4; GRANT UPDATE ON performance_schema.setup_timers TO pfs_user_4;
GRANT UPDATE, SELECT ON performance_schema.SETUP_INSTRUMENTS TO pfs_user_4; GRANT UPDATE, SELECT ON performance_schema.setup_instruments TO pfs_user_4;
GRANT DROP ON performance_schema.EVENTS_WAITS_CURRENT TO pfs_user_4; GRANT DROP ON performance_schema.events_waits_current TO pfs_user_4;
GRANT DROP ON performance_schema.EVENTS_WAITS_HISTORY TO pfs_user_4; GRANT DROP ON performance_schema.events_waits_history TO pfs_user_4;
GRANT DROP ON performance_schema.EVENTS_WAITS_HISTORY_LONG TO pfs_user_4; GRANT DROP ON performance_schema.events_waits_history_long TO pfs_user_4;
# User pfs_user_4 should now be allowed to tweak instrumentation # User pfs_user_4 should now be allowed to tweak instrumentation
UPDATE performance_schema.SETUP_INSTRUMENTS SET enabled = 'NO', timed = 'YES'; UPDATE performance_schema.setup_instruments SET enabled = 'NO', timed = 'YES';
UPDATE performance_schema.SETUP_INSTRUMENTS SET enabled = 'YES' UPDATE performance_schema.setup_instruments SET enabled = 'YES'
WHERE name LIKE 'wait/synch/mutex/%' WHERE name LIKE 'wait/synch/mutex/%'
OR name LIKE 'wait/synch/rwlock/%'; OR name LIKE 'wait/synch/rwlock/%';
UPDATE performance_schema.SETUP_CONSUMERS SET enabled = 'YES'; UPDATE performance_schema.setup_consumers SET enabled = 'YES';
UPDATE performance_schema.SETUP_TIMERS SET timer_name = 'TICK'; UPDATE performance_schema.setup_timers SET timer_name = 'TICK';
TRUNCATE TABLE performance_schema.EVENTS_WAITS_HISTORY_LONG; TRUNCATE TABLE performance_schema.events_waits_history_long;
TRUNCATE TABLE performance_schema.EVENTS_WAITS_HISTORY; TRUNCATE TABLE performance_schema.events_waits_history;
TRUNCATE TABLE performance_schema.EVENTS_WAITS_CURRENT; TRUNCATE TABLE performance_schema.events_waits_current;
# Clean up # Clean up
REVOKE ALL PRIVILEGES, GRANT OPTION FROM pfs_user_4; REVOKE ALL PRIVILEGES, GRANT OPTION FROM pfs_user_4;
DROP USER pfs_user_4; DROP USER pfs_user_4;
flush privileges; flush privileges;
UPDATE performance_schema.SETUP_INSTRUMENTS SET enabled = 'YES', timed = 'YES'; UPDATE performance_schema.setup_instruments SET enabled = 'YES', timed = 'YES';
UPDATE performance_schema.SETUP_CONSUMERS SET enabled = 'YES'; UPDATE performance_schema.setup_consumers SET enabled = 'YES';
UPDATE performance_schema.SETUP_TIMERS SET timer_name = 'CYCLE'; UPDATE performance_schema.setup_timers SET timer_name = 'CYCLE';

8
mysql-test/suite/perfschema/r/query_cache.result
View File

@ -33,10 +33,10 @@ Qcache_inserts 1
show status like "Qcache_hits"; show status like "Qcache_hits";
Variable_name Value Variable_name Value
Qcache_hits 1 Qcache_hits 1
select spins from performance_schema.EVENTS_WAITS_CURRENT order by event_name limit 1; select spins from performance_schema.events_waits_current order by event_name limit 1;
spins spins
NULL NULL
select name from performance_schema.SETUP_INSTRUMENTS order by name limit 1; select name from performance_schema.setup_instruments order by name limit 1;
name name
wait/io/file/csv/data wait/io/file/csv/data
show status like "Qcache_queries_in_cache"; show status like "Qcache_queries_in_cache";
@ -48,10 +48,10 @@ Qcache_inserts 1
show status like "Qcache_hits"; show status like "Qcache_hits";
Variable_name Value Variable_name Value
Qcache_hits 1 Qcache_hits 1
select spins from performance_schema.EVENTS_WAITS_CURRENT order by event_name limit 1; select spins from performance_schema.events_waits_current order by event_name limit 1;
spins spins
NULL NULL
select name from performance_schema.SETUP_INSTRUMENTS order by name limit 1; select name from performance_schema.setup_instruments order by name limit 1;
name name
wait/io/file/csv/data wait/io/file/csv/data
show status like "Qcache_queries_in_cache"; show status like "Qcache_queries_in_cache";

18
mysql-test/suite/perfschema/r/read_only.result
View File

@ -13,9 +13,9 @@ show grants;
Grants for pfsuser@localhost Grants for pfsuser@localhost
GRANT USAGE ON *.* TO 'pfsuser'@'localhost' GRANT USAGE ON *.* TO 'pfsuser'@'localhost'
GRANT SELECT, UPDATE ON `performance_schema`.* TO 'pfsuser'@'localhost' GRANT SELECT, UPDATE ON `performance_schema`.* TO 'pfsuser'@'localhost'
select * from performance_schema.SETUP_INSTRUMENTS; select * from performance_schema.setup_instruments;
update performance_schema.SETUP_INSTRUMENTS set enabled='NO'; update performance_schema.setup_instruments set enabled='NO';
update performance_schema.SETUP_INSTRUMENTS set enabled='YES'; update performance_schema.setup_instruments set enabled='YES';
connection default; connection default;
set global read_only=1; set global read_only=1;
connection con1; connection con1;
@ -26,9 +26,9 @@ show grants;
Grants for pfsuser@localhost Grants for pfsuser@localhost
GRANT USAGE ON *.* TO 'pfsuser'@'localhost' GRANT USAGE ON *.* TO 'pfsuser'@'localhost'
GRANT SELECT, UPDATE ON `performance_schema`.* TO 'pfsuser'@'localhost' GRANT SELECT, UPDATE ON `performance_schema`.* TO 'pfsuser'@'localhost'
select * from performance_schema.SETUP_INSTRUMENTS; select * from performance_schema.setup_instruments;
update performance_schema.SETUP_INSTRUMENTS set enabled='NO'; update performance_schema.setup_instruments set enabled='NO';
update performance_schema.SETUP_INSTRUMENTS set enabled='YES'; update performance_schema.setup_instruments set enabled='YES';
connection default; connection default;
grant super on *.* to pfsuser@localhost; grant super on *.* to pfsuser@localhost;
flush privileges; flush privileges;
@ -40,9 +40,9 @@ show grants;
Grants for pfsuser@localhost Grants for pfsuser@localhost
GRANT SUPER ON *.* TO 'pfsuser'@'localhost' GRANT SUPER ON *.* TO 'pfsuser'@'localhost'
GRANT SELECT, UPDATE ON `performance_schema`.* TO 'pfsuser'@'localhost' GRANT SELECT, UPDATE ON `performance_schema`.* TO 'pfsuser'@'localhost'
select * from performance_schema.SETUP_INSTRUMENTS; select * from performance_schema.setup_instruments;
update performance_schema.SETUP_INSTRUMENTS set enabled='NO'; update performance_schema.setup_instruments set enabled='NO';
update performance_schema.SETUP_INSTRUMENTS set enabled='YES'; update performance_schema.setup_instruments set enabled='YES';
connection default; connection default;
set global read_only= @start_read_only; set global read_only= @start_read_only;
drop user pfsuser@localhost; drop user pfsuser@localhost;

102
mysql-test/suite/perfschema/r/schema.result
View File

@ -8,32 +8,32 @@ test
use performance_schema; use performance_schema;
show tables; show tables;
Tables_in_performance_schema Tables_in_performance_schema
COND_INSTANCES cond_instances
EVENTS_WAITS_CURRENT events_waits_current
EVENTS_WAITS_HISTORY events_waits_history
EVENTS_WAITS_HISTORY_LONG events_waits_history_long
EVENTS_WAITS_SUMMARY_BY_INSTANCE events_waits_summary_by_instance
EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME events_waits_summary_by_thread_by_event_name
EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME events_waits_summary_global_by_event_name
FILE_INSTANCES file_instances
FILE_SUMMARY_BY_EVENT_NAME file_summary_by_event_name
FILE_SUMMARY_BY_INSTANCE file_summary_by_instance
MUTEX_INSTANCES mutex_instances
PERFORMANCE_TIMERS performance_timers
RWLOCK_INSTANCES rwlock_instances
SETUP_CONSUMERS setup_consumers
SETUP_INSTRUMENTS setup_instruments
SETUP_TIMERS setup_timers
THREADS threads
show create table COND_INSTANCES; show create table cond_instances;
Table Create Table Table Create Table
COND_INSTANCES CREATE TABLE `COND_INSTANCES` ( cond_instances CREATE TABLE `cond_instances` (
`NAME` varchar(128) NOT NULL, `NAME` varchar(128) NOT NULL,
`OBJECT_INSTANCE_BEGIN` bigint(20) NOT NULL `OBJECT_INSTANCE_BEGIN` bigint(20) NOT NULL
) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8 ) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
show create table EVENTS_WAITS_CURRENT; show create table events_waits_current;
Table Create Table Table Create Table
EVENTS_WAITS_CURRENT CREATE TABLE `EVENTS_WAITS_CURRENT` ( events_waits_current CREATE TABLE `events_waits_current` (
`THREAD_ID` int(11) NOT NULL, `THREAD_ID` int(11) NOT NULL,
`EVENT_ID` bigint(20) unsigned NOT NULL, `EVENT_ID` bigint(20) unsigned NOT NULL,
`EVENT_NAME` varchar(128) NOT NULL, `EVENT_NAME` varchar(128) NOT NULL,
@ -51,9 +51,9 @@ EVENTS_WAITS_CURRENT CREATE TABLE `EVENTS_WAITS_CURRENT` (
`NUMBER_OF_BYTES` bigint(20) unsigned DEFAULT NULL, `NUMBER_OF_BYTES` bigint(20) unsigned DEFAULT NULL,
`FLAGS` int(10) unsigned DEFAULT NULL `FLAGS` int(10) unsigned DEFAULT NULL
) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8 ) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
show create table EVENTS_WAITS_HISTORY; show create table events_waits_history;
Table Create Table Table Create Table
EVENTS_WAITS_HISTORY CREATE TABLE `EVENTS_WAITS_HISTORY` ( events_waits_history CREATE TABLE `events_waits_history` (
`THREAD_ID` int(11) NOT NULL, `THREAD_ID` int(11) NOT NULL,
`EVENT_ID` bigint(20) unsigned NOT NULL, `EVENT_ID` bigint(20) unsigned NOT NULL,
`EVENT_NAME` varchar(128) NOT NULL, `EVENT_NAME` varchar(128) NOT NULL,
@ -71,9 +71,9 @@ EVENTS_WAITS_HISTORY CREATE TABLE `EVENTS_WAITS_HISTORY` (
`NUMBER_OF_BYTES` bigint(20) unsigned DEFAULT NULL, `NUMBER_OF_BYTES` bigint(20) unsigned DEFAULT NULL,
`FLAGS` int(10) unsigned DEFAULT NULL `FLAGS` int(10) unsigned DEFAULT NULL
) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8 ) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
show create table EVENTS_WAITS_HISTORY_LONG; show create table events_waits_history_long;
Table Create Table Table Create Table
EVENTS_WAITS_HISTORY_LONG CREATE TABLE `EVENTS_WAITS_HISTORY_LONG` ( events_waits_history_long CREATE TABLE `events_waits_history_long` (
`THREAD_ID` int(11) NOT NULL, `THREAD_ID` int(11) NOT NULL,
`EVENT_ID` bigint(20) unsigned NOT NULL, `EVENT_ID` bigint(20) unsigned NOT NULL,
`EVENT_NAME` varchar(128) NOT NULL, `EVENT_NAME` varchar(128) NOT NULL,
@ -91,9 +91,9 @@ EVENTS_WAITS_HISTORY_LONG CREATE TABLE `EVENTS_WAITS_HISTORY_LONG` (
`NUMBER_OF_BYTES` bigint(20) unsigned DEFAULT NULL, `NUMBER_OF_BYTES` bigint(20) unsigned DEFAULT NULL,
`FLAGS` int(10) unsigned DEFAULT NULL `FLAGS` int(10) unsigned DEFAULT NULL
) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8 ) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
show create table EVENTS_WAITS_SUMMARY_BY_INSTANCE; show create table events_waits_summary_by_instance;
Table Create Table Table Create Table
EVENTS_WAITS_SUMMARY_BY_INSTANCE CREATE TABLE `EVENTS_WAITS_SUMMARY_BY_INSTANCE` ( events_waits_summary_by_instance CREATE TABLE `events_waits_summary_by_instance` (
`EVENT_NAME` varchar(128) NOT NULL, `EVENT_NAME` varchar(128) NOT NULL,
`OBJECT_INSTANCE_BEGIN` bigint(20) NOT NULL, `OBJECT_INSTANCE_BEGIN` bigint(20) NOT NULL,
`COUNT_STAR` bigint(20) unsigned NOT NULL, `COUNT_STAR` bigint(20) unsigned NOT NULL,
@ -102,9 +102,9 @@ EVENTS_WAITS_SUMMARY_BY_INSTANCE CREATE TABLE `EVENTS_WAITS_SUMMARY_BY_INSTANCE`
`AVG_TIMER_WAIT` bigint(20) unsigned NOT NULL, `AVG_TIMER_WAIT` bigint(20) unsigned NOT NULL,
`MAX_TIMER_WAIT` bigint(20) unsigned NOT NULL `MAX_TIMER_WAIT` bigint(20) unsigned NOT NULL
) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8 ) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
show create table EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME; show create table events_waits_summary_by_thread_by_event_name;
Table Create Table Table Create Table
EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME CREATE TABLE `EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME` ( events_waits_summary_by_thread_by_event_name CREATE TABLE `events_waits_summary_by_thread_by_event_name` (
`THREAD_ID` int(11) NOT NULL, `THREAD_ID` int(11) NOT NULL,
`EVENT_NAME` varchar(128) NOT NULL, `EVENT_NAME` varchar(128) NOT NULL,
`COUNT_STAR` bigint(20) unsigned NOT NULL, `COUNT_STAR` bigint(20) unsigned NOT NULL,
@ -113,9 +113,9 @@ EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME CREATE TABLE `EVENTS_WAITS_SUMMARY_
`AVG_TIMER_WAIT` bigint(20) unsigned NOT NULL, `AVG_TIMER_WAIT` bigint(20) unsigned NOT NULL,
`MAX_TIMER_WAIT` bigint(20) unsigned NOT NULL `MAX_TIMER_WAIT` bigint(20) unsigned NOT NULL
) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8 ) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
show create table EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME; show create table events_waits_summary_global_by_event_name;
Table Create Table Table Create Table
EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME CREATE TABLE `EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME` ( events_waits_summary_global_by_event_name CREATE TABLE `events_waits_summary_global_by_event_name` (
`EVENT_NAME` varchar(128) NOT NULL, `EVENT_NAME` varchar(128) NOT NULL,
`COUNT_STAR` bigint(20) unsigned NOT NULL, `COUNT_STAR` bigint(20) unsigned NOT NULL,
`SUM_TIMER_WAIT` bigint(20) unsigned NOT NULL, `SUM_TIMER_WAIT` bigint(20) unsigned NOT NULL,
@ -123,25 +123,25 @@ EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME CREATE TABLE `EVENTS_WAITS_SUMMARY_GLO
`AVG_TIMER_WAIT` bigint(20) unsigned NOT NULL, `AVG_TIMER_WAIT` bigint(20) unsigned NOT NULL,
`MAX_TIMER_WAIT` bigint(20) unsigned NOT NULL `MAX_TIMER_WAIT` bigint(20) unsigned NOT NULL
) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8 ) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
show create table FILE_INSTANCES; show create table file_instances;
Table Create Table Table Create Table
FILE_INSTANCES CREATE TABLE `FILE_INSTANCES` ( file_instances CREATE TABLE `file_instances` (
`FILE_NAME` varchar(512) NOT NULL, `FILE_NAME` varchar(512) NOT NULL,
`EVENT_NAME` varchar(128) NOT NULL, `EVENT_NAME` varchar(128) NOT NULL,
`OPEN_COUNT` int(10) unsigned NOT NULL `OPEN_COUNT` int(10) unsigned NOT NULL
) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8 ) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
show create table FILE_SUMMARY_BY_EVENT_NAME; show create table file_summary_by_event_name;
Table Create Table Table Create Table
FILE_SUMMARY_BY_EVENT_NAME CREATE TABLE `FILE_SUMMARY_BY_EVENT_NAME` ( file_summary_by_event_name CREATE TABLE `file_summary_by_event_name` (
`EVENT_NAME` varchar(128) NOT NULL, `EVENT_NAME` varchar(128) NOT NULL,
`COUNT_READ` bigint(20) unsigned NOT NULL, `COUNT_READ` bigint(20) unsigned NOT NULL,
`COUNT_WRITE` bigint(20) unsigned NOT NULL, `COUNT_WRITE` bigint(20) unsigned NOT NULL,
`SUM_NUMBER_OF_BYTES_READ` bigint(20) unsigned NOT NULL, `SUM_NUMBER_OF_BYTES_READ` bigint(20) unsigned NOT NULL,
`SUM_NUMBER_OF_BYTES_WRITE` bigint(20) unsigned NOT NULL `SUM_NUMBER_OF_BYTES_WRITE` bigint(20) unsigned NOT NULL
) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8 ) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
show create table FILE_SUMMARY_BY_INSTANCE; show create table file_summary_by_instance;
Table Create Table Table Create Table
FILE_SUMMARY_BY_INSTANCE CREATE TABLE `FILE_SUMMARY_BY_INSTANCE` ( file_summary_by_instance CREATE TABLE `file_summary_by_instance` (
`FILE_NAME` varchar(512) NOT NULL, `FILE_NAME` varchar(512) NOT NULL,
`EVENT_NAME` varchar(128) NOT NULL, `EVENT_NAME` varchar(128) NOT NULL,
`COUNT_READ` bigint(20) unsigned NOT NULL, `COUNT_READ` bigint(20) unsigned NOT NULL,
@ -149,51 +149,51 @@ FILE_SUMMARY_BY_INSTANCE CREATE TABLE `FILE_SUMMARY_BY_INSTANCE` (
`SUM_NUMBER_OF_BYTES_READ` bigint(20) unsigned NOT NULL, `SUM_NUMBER_OF_BYTES_READ` bigint(20) unsigned NOT NULL,
`SUM_NUMBER_OF_BYTES_WRITE` bigint(20) unsigned NOT NULL `SUM_NUMBER_OF_BYTES_WRITE` bigint(20) unsigned NOT NULL
) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8 ) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
show create table MUTEX_INSTANCES; show create table mutex_instances;
Table Create Table Table Create Table
MUTEX_INSTANCES CREATE TABLE `MUTEX_INSTANCES` ( mutex_instances CREATE TABLE `mutex_instances` (
`NAME` varchar(128) NOT NULL, `NAME` varchar(128) NOT NULL,
`OBJECT_INSTANCE_BEGIN` bigint(20) NOT NULL, `OBJECT_INSTANCE_BEGIN` bigint(20) NOT NULL,
`LOCKED_BY_THREAD_ID` int(11) DEFAULT NULL `LOCKED_BY_THREAD_ID` int(11) DEFAULT NULL
) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8 ) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
show create table PERFORMANCE_TIMERS; show create table performance_timers;
Table Create Table Table Create Table
PERFORMANCE_TIMERS CREATE TABLE `PERFORMANCE_TIMERS` ( performance_timers CREATE TABLE `performance_timers` (
`TIMER_NAME` enum('CYCLE','NANOSECOND','MICROSECOND','MILLISECOND','TICK') NOT NULL, `TIMER_NAME` enum('CYCLE','NANOSECOND','MICROSECOND','MILLISECOND','TICK') NOT NULL,
`TIMER_FREQUENCY` bigint(20) DEFAULT NULL, `TIMER_FREQUENCY` bigint(20) DEFAULT NULL,
`TIMER_RESOLUTION` bigint(20) DEFAULT NULL, `TIMER_RESOLUTION` bigint(20) DEFAULT NULL,
`TIMER_OVERHEAD` bigint(20) DEFAULT NULL `TIMER_OVERHEAD` bigint(20) DEFAULT NULL
) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8 ) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
show create table RWLOCK_INSTANCES; show create table rwlock_instances;
Table Create Table Table Create Table
RWLOCK_INSTANCES CREATE TABLE `RWLOCK_INSTANCES` ( rwlock_instances CREATE TABLE `rwlock_instances` (
`NAME` varchar(128) NOT NULL, `NAME` varchar(128) NOT NULL,
`OBJECT_INSTANCE_BEGIN` bigint(20) NOT NULL, `OBJECT_INSTANCE_BEGIN` bigint(20) NOT NULL,
`WRITE_LOCKED_BY_THREAD_ID` int(11) DEFAULT NULL, `WRITE_LOCKED_BY_THREAD_ID` int(11) DEFAULT NULL,
`READ_LOCKED_BY_COUNT` int(10) unsigned NOT NULL `READ_LOCKED_BY_COUNT` int(10) unsigned NOT NULL
) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8 ) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
show create table SETUP_CONSUMERS; show create table setup_consumers;
Table Create Table Table Create Table
SETUP_CONSUMERS CREATE TABLE `SETUP_CONSUMERS` ( setup_consumers CREATE TABLE `setup_consumers` (
`NAME` varchar(64) NOT NULL, `NAME` varchar(64) NOT NULL,
`ENABLED` enum('YES','NO') NOT NULL `ENABLED` enum('YES','NO') NOT NULL
) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8 ) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
show create table SETUP_INSTRUMENTS; show create table setup_instruments;
Table Create Table Table Create Table
SETUP_INSTRUMENTS CREATE TABLE `SETUP_INSTRUMENTS` ( setup_instruments CREATE TABLE `setup_instruments` (
`NAME` varchar(128) NOT NULL, `NAME` varchar(128) NOT NULL,
`ENABLED` enum('YES','NO') NOT NULL, `ENABLED` enum('YES','NO') NOT NULL,
`TIMED` enum('YES','NO') NOT NULL `TIMED` enum('YES','NO') NOT NULL
) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8 ) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
show create table SETUP_TIMERS; show create table setup_timers;
Table Create Table Table Create Table
SETUP_TIMERS CREATE TABLE `SETUP_TIMERS` ( setup_timers CREATE TABLE `setup_timers` (
`NAME` varchar(64) NOT NULL, `NAME` varchar(64) NOT NULL,
`TIMER_NAME` enum('CYCLE','NANOSECOND','MICROSECOND','MILLISECOND','TICK') NOT NULL `TIMER_NAME` enum('CYCLE','NANOSECOND','MICROSECOND','MILLISECOND','TICK') NOT NULL
) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8 ) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
show create table THREADS; show create table threads;
Table Create Table Table Create Table
THREADS CREATE TABLE `THREADS` ( threads CREATE TABLE `threads` (
`THREAD_ID` int(11) NOT NULL, `THREAD_ID` int(11) NOT NULL,
`PROCESSLIST_ID` int(11) DEFAULT NULL, `PROCESSLIST_ID` int(11) DEFAULT NULL,
`NAME` varchar(128) NOT NULL `NAME` varchar(128) NOT NULL

42
mysql-test/suite/perfschema/r/selects.result
View File

@ -1,38 +1,38 @@
UPDATE performance_schema.SETUP_INSTRUMENTS SET enabled = 'YES', timed = 'YES'; UPDATE performance_schema.setup_instruments SET enabled = 'YES', timed = 'YES';
DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (id INT PRIMARY KEY, b CHAR(100) DEFAULT 'initial value') CREATE TABLE t1 (id INT PRIMARY KEY, b CHAR(100) DEFAULT 'initial value')
ENGINE=MyISAM; ENGINE=MyISAM;
INSERT INTO t1 (id) VALUES (1), (2), (3), (4), (5), (6), (7), (8); INSERT INTO t1 (id) VALUES (1), (2), (3), (4), (5), (6), (7), (8);
SELECT OPERATION, SUM(NUMBER_OF_BYTES) AS TOTAL SELECT OPERATION, SUM(NUMBER_OF_BYTES) AS TOTAL
FROM performance_schema.EVENTS_WAITS_HISTORY_LONG FROM performance_schema.events_waits_history_long
GROUP BY OPERATION GROUP BY OPERATION
HAVING TOTAL IS NOT NULL HAVING TOTAL IS NOT NULL
ORDER BY OPERATION ORDER BY OPERATION
LIMIT 1; LIMIT 1;
OPERATION TOTAL OPERATION TOTAL
chsize [NUM_BYTES] chsize [NUM_BYTES]
SELECT EVENT_ID FROM performance_schema.EVENTS_WAITS_CURRENT SELECT EVENT_ID FROM performance_schema.events_waits_current
WHERE THREAD_ID IN WHERE THREAD_ID IN
(SELECT THREAD_ID FROM performance_schema.THREADS) (SELECT THREAD_ID FROM performance_schema.threads)
AND EVENT_NAME IN AND EVENT_NAME IN
(SELECT NAME FROM performance_schema.SETUP_INSTRUMENTS (SELECT NAME FROM performance_schema.setup_instruments
WHERE NAME LIKE "wait/synch/%") WHERE NAME LIKE "wait/synch/%")
LIMIT 1; LIMIT 1;
EVENT_ID EVENT_ID
[EVENT_ID] [EVENT_ID]
SELECT DISTINCT EVENT_ID SELECT DISTINCT EVENT_ID
FROM performance_schema.EVENTS_WAITS_CURRENT FROM performance_schema.events_waits_current
JOIN performance_schema.EVENTS_WAITS_HISTORY USING (EVENT_ID) JOIN performance_schema.events_waits_history USING (EVENT_ID)
JOIN performance_schema.EVENTS_WAITS_HISTORY_LONG USING (EVENT_ID) JOIN performance_schema.events_waits_history_long USING (EVENT_ID)
ORDER BY EVENT_ID ORDER BY EVENT_ID
LIMIT 1; LIMIT 1;
EVENT_ID EVENT_ID
[EVENT_ID] [EVENT_ID]
SELECT t1.THREAD_ID, t2.EVENT_ID, t3.EVENT_NAME, t4.TIMER_WAIT SELECT t1.THREAD_ID, t2.EVENT_ID, t3.EVENT_NAME, t4.TIMER_WAIT
FROM performance_schema.EVENTS_WAITS_HISTORY t1 FROM performance_schema.events_waits_history t1
JOIN performance_schema.EVENTS_WAITS_HISTORY t2 USING (EVENT_ID) JOIN performance_schema.events_waits_history t2 USING (EVENT_ID)
JOIN performance_schema.EVENTS_WAITS_HISTORY t3 ON (t2.THREAD_ID = t3.THREAD_ID) JOIN performance_schema.events_waits_history t3 ON (t2.THREAD_ID = t3.THREAD_ID)
JOIN performance_schema.EVENTS_WAITS_HISTORY t4 ON (t3.EVENT_NAME = t4.EVENT_NAME) JOIN performance_schema.events_waits_history t4 ON (t3.EVENT_NAME = t4.EVENT_NAME)
ORDER BY t1.EVENT_ID, t2.EVENT_ID ORDER BY t1.EVENT_ID, t2.EVENT_ID
LIMIT 5; LIMIT 5;
THREAD_ID EVENT_ID EVENT_NAME TIMER_WAIT THREAD_ID EVENT_ID EVENT_NAME TIMER_WAIT
@ -42,11 +42,11 @@ THREAD_ID EVENT_ID EVENT_NAME TIMER_WAIT
[THREAD_ID] [EVENT_ID] [EVENT_NAME] [TIMER_WAIT] [THREAD_ID] [EVENT_ID] [EVENT_NAME] [TIMER_WAIT]
[THREAD_ID] [EVENT_ID] [EVENT_NAME] [TIMER_WAIT] [THREAD_ID] [EVENT_ID] [EVENT_NAME] [TIMER_WAIT]
SELECT THREAD_ID, EVENT_ID FROM ( SELECT THREAD_ID, EVENT_ID FROM (
SELECT THREAD_ID, EVENT_ID FROM performance_schema.EVENTS_WAITS_CURRENT SELECT THREAD_ID, EVENT_ID FROM performance_schema.events_waits_current
UNION UNION
SELECT THREAD_ID, EVENT_ID FROM performance_schema.EVENTS_WAITS_HISTORY SELECT THREAD_ID, EVENT_ID FROM performance_schema.events_waits_history
UNION UNION
SELECT THREAD_ID, EVENT_ID FROM performance_schema.EVENTS_WAITS_HISTORY_LONG SELECT THREAD_ID, EVENT_ID FROM performance_schema.events_waits_history_long
) t1 ORDER BY THREAD_ID, EVENT_ID ) t1 ORDER BY THREAD_ID, EVENT_ID
LIMIT 5; LIMIT 5;
THREAD_ID EVENT_ID THREAD_ID EVENT_ID
@ -58,14 +58,14 @@ THREAD_ID EVENT_ID
DROP TABLE IF EXISTS t_event; DROP TABLE IF EXISTS t_event;
DROP EVENT IF EXISTS t_ps_event; DROP EVENT IF EXISTS t_ps_event;
CREATE TABLE t_event AS CREATE TABLE t_event AS
SELECT EVENT_ID FROM performance_schema.EVENTS_WAITS_CURRENT SELECT EVENT_ID FROM performance_schema.events_waits_current
WHERE 1 = 2; WHERE 1 = 2;
CREATE EVENT t_ps_event CREATE EVENT t_ps_event
ON SCHEDULE AT CURRENT_TIMESTAMP + INTERVAL 1 SECOND ON SCHEDULE AT CURRENT_TIMESTAMP + INTERVAL 1 SECOND
DO INSERT INTO t_event DO INSERT INTO t_event
SELECT DISTINCT EVENT_ID SELECT DISTINCT EVENT_ID
FROM performance_schema.EVENTS_WAITS_CURRENT FROM performance_schema.events_waits_current
JOIN performance_schema.EVENTS_WAITS_HISTORY USING (EVENT_ID) JOIN performance_schema.events_waits_history USING (EVENT_ID)
ORDER BY EVENT_ID ORDER BY EVENT_ID
LIMIT 1; LIMIT 1;
ALTER TABLE t1 ADD COLUMN c INT; ALTER TABLE t1 ADD COLUMN c INT;
@ -73,7 +73,7 @@ DROP TRIGGER IF EXISTS t_ps_trigger;
CREATE TRIGGER t_ps_trigger BEFORE INSERT ON t1 CREATE TRIGGER t_ps_trigger BEFORE INSERT ON t1
FOR EACH ROW BEGIN FOR EACH ROW BEGIN
SET NEW.c = (SELECT MAX(EVENT_ID) SET NEW.c = (SELECT MAX(EVENT_ID)
FROM performance_schema.EVENTS_WAITS_CURRENT); FROM performance_schema.events_waits_current);
END; END;
| |
INSERT INTO t1 (id) VALUES (11), (12), (13); INSERT INTO t1 (id) VALUES (11), (12), (13);
@ -86,7 +86,7 @@ DROP TRIGGER t_ps_trigger;
DROP PROCEDURE IF EXISTS t_ps_proc; DROP PROCEDURE IF EXISTS t_ps_proc;
CREATE PROCEDURE t_ps_proc(IN conid INT, OUT pid INT) CREATE PROCEDURE t_ps_proc(IN conid INT, OUT pid INT)
BEGIN BEGIN
SELECT thread_id FROM performance_schema.THREADS SELECT thread_id FROM performance_schema.threads
WHERE PROCESSLIST_ID = conid INTO pid; WHERE PROCESSLIST_ID = conid INTO pid;
END; END;
| |
@ -94,7 +94,7 @@ CALL t_ps_proc(connection_id(), @p_id);
DROP FUNCTION IF EXISTS t_ps_proc; DROP FUNCTION IF EXISTS t_ps_proc;
CREATE FUNCTION t_ps_func(conid INT) RETURNS int CREATE FUNCTION t_ps_func(conid INT) RETURNS int
BEGIN BEGIN
return (SELECT thread_id FROM performance_schema.THREADS return (SELECT thread_id FROM performance_schema.threads
WHERE PROCESSLIST_ID = conid); WHERE PROCESSLIST_ID = conid);
END; END;
| |

98
mysql-test/suite/perfschema/r/server_init.result
View File

@ -1,197 +1,197 @@
use performance_schema; use performance_schema;
select count(name) from MUTEX_INSTANCES select count(name) from mutex_instances
where name like "wait/synch/mutex/mysys/THR_LOCK_threads"; where name like "wait/synch/mutex/mysys/THR_LOCK_threads";
count(name) count(name)
1 1
select count(name) from MUTEX_INSTANCES select count(name) from mutex_instances
where name like "wait/synch/mutex/mysys/THR_LOCK_malloc"; where name like "wait/synch/mutex/mysys/THR_LOCK_malloc";
count(name) count(name)
1 1
select count(name) from MUTEX_INSTANCES select count(name) from mutex_instances
where name like "wait/synch/mutex/mysys/THR_LOCK_open"; where name like "wait/synch/mutex/mysys/THR_LOCK_open";
count(name) count(name)
1 1
select count(name) from MUTEX_INSTANCES select count(name) from mutex_instances
where name like "wait/synch/mutex/mysys/THR_LOCK_isam"; where name like "wait/synch/mutex/mysys/THR_LOCK_isam";
count(name) count(name)
1 1
select count(name) from MUTEX_INSTANCES select count(name) from mutex_instances
where name like "wait/synch/mutex/mysys/THR_LOCK_myisam"; where name like "wait/synch/mutex/mysys/THR_LOCK_myisam";
count(name) count(name)
1 1
select count(name) from MUTEX_INSTANCES select count(name) from mutex_instances
where name like "wait/synch/mutex/mysys/THR_LOCK_heap"; where name like "wait/synch/mutex/mysys/THR_LOCK_heap";
count(name) count(name)
1 1
select count(name) from MUTEX_INSTANCES select count(name) from mutex_instances
where name like "wait/synch/mutex/mysys/THR_LOCK_net"; where name like "wait/synch/mutex/mysys/THR_LOCK_net";
count(name) count(name)
1 1
select count(name) from MUTEX_INSTANCES select count(name) from mutex_instances
where name like "wait/synch/mutex/mysys/THR_LOCK_charset"; where name like "wait/synch/mutex/mysys/THR_LOCK_charset";
count(name) count(name)
1 1
select count(name) from MUTEX_INSTANCES select count(name) from mutex_instances
where name like "wait/synch/mutex/mysys/THR_LOCK_time"; where name like "wait/synch/mutex/mysys/THR_LOCK_time";
count(name) count(name)
1 1
select count(name) from COND_INSTANCES select count(name) from cond_instances
where name like "wait/synch/cond/mysys/THR_COND_threads"; where name like "wait/synch/cond/mysys/THR_COND_threads";
count(name) count(name)
1 1
select count(name) from MUTEX_INSTANCES select count(name) from mutex_instances
where name like "wait/synch/mutex/sql/LOCK_open"; where name like "wait/synch/mutex/sql/LOCK_open";
count(name) count(name)
1 1
select count(name) from MUTEX_INSTANCES select count(name) from mutex_instances
where name like "wait/synch/mutex/sql/LOCK_thread_count"; where name like "wait/synch/mutex/sql/LOCK_thread_count";
count(name) count(name)
1 1
select count(name) from MUTEX_INSTANCES select count(name) from mutex_instances
where name like "wait/synch/mutex/sql/LOCK_status"; where name like "wait/synch/mutex/sql/LOCK_status";
count(name) count(name)
1 1
select count(name) from MUTEX_INSTANCES select count(name) from mutex_instances
where name like "wait/synch/mutex/sql/LOCK_error_log"; where name like "wait/synch/mutex/sql/LOCK_error_log";
count(name) count(name)
1 1
select count(name) from MUTEX_INSTANCES select count(name) from mutex_instances
where name like "wait/synch/mutex/sql/LOCK_delayed_insert"; where name like "wait/synch/mutex/sql/LOCK_delayed_insert";
count(name) count(name)
1 1
select count(name) from MUTEX_INSTANCES select count(name) from mutex_instances
where name like "wait/synch/mutex/sql/LOCK_uuid_generator"; where name like "wait/synch/mutex/sql/LOCK_uuid_generator";
count(name) count(name)
1 1
select count(name) from MUTEX_INSTANCES select count(name) from mutex_instances
where name like "wait/synch/mutex/sql/LOCK_delayed_status"; where name like "wait/synch/mutex/sql/LOCK_delayed_status";
count(name) count(name)
1 1
select count(name) from MUTEX_INSTANCES select count(name) from mutex_instances
where name like "wait/synch/mutex/sql/LOCK_delayed_create"; where name like "wait/synch/mutex/sql/LOCK_delayed_create";
count(name) count(name)
1 1
select count(name) from MUTEX_INSTANCES select count(name) from mutex_instances
where name like "wait/synch/mutex/sql/LOCK_crypt"; where name like "wait/synch/mutex/sql/LOCK_crypt";
count(name) count(name)
1 1
select count(name) from MUTEX_INSTANCES select count(name) from mutex_instances
where name like "wait/synch/mutex/sql/LOCK_slave_list"; where name like "wait/synch/mutex/sql/LOCK_slave_list";
count(name) count(name)
1 1
select count(name) from MUTEX_INSTANCES select count(name) from mutex_instances
where name like "wait/synch/mutex/sql/LOCK_active_mi"; where name like "wait/synch/mutex/sql/LOCK_active_mi";
count(name) count(name)
1 1
select count(name) from MUTEX_INSTANCES select count(name) from mutex_instances
where name like "wait/synch/mutex/sql/LOCK_manager"; where name like "wait/synch/mutex/sql/LOCK_manager";
count(name) count(name)
1 1
select count(name) from MUTEX_INSTANCES select count(name) from mutex_instances
where name like "wait/synch/mutex/sql/LOCK_global_system_variables"; where name like "wait/synch/mutex/sql/LOCK_global_system_variables";
count(name) count(name)
1 1
select count(name) from MUTEX_INSTANCES select count(name) from mutex_instances
where name like "wait/synch/mutex/sql/LOCK_user_conn"; where name like "wait/synch/mutex/sql/LOCK_user_conn";
count(name) count(name)
1 1
select count(name) from MUTEX_INSTANCES select count(name) from mutex_instances
where name like "wait/synch/mutex/sql/LOCK_prepared_stmt_count"; where name like "wait/synch/mutex/sql/LOCK_prepared_stmt_count";
count(name) count(name)
1 1
select count(name) from MUTEX_INSTANCES select count(name) from mutex_instances
where name like "wait/synch/mutex/sql/LOCK_connection_count"; where name like "wait/synch/mutex/sql/LOCK_connection_count";
count(name) count(name)
1 1
select count(name) from MUTEX_INSTANCES select count(name) from mutex_instances
where name like "wait/synch/mutex/sql/LOCK_server_started"; where name like "wait/synch/mutex/sql/LOCK_server_started";
count(name) count(name)
1 1
select count(name) from MUTEX_INSTANCES select count(name) from mutex_instances
where name like "wait/synch/mutex/sql/LOCK_rpl_status"; where name like "wait/synch/mutex/sql/LOCK_rpl_status";
count(name) count(name)
1 1
select count(name) from MUTEX_INSTANCES select count(name) from mutex_instances
where name like "wait/synch/mutex/sql/Query_cache::structure_guard_mutex"; where name like "wait/synch/mutex/sql/Query_cache::structure_guard_mutex";
count(name) count(name)
1 1
select count(name) from MUTEX_INSTANCES select count(name) from mutex_instances
where name like "wait/synch/mutex/sql/LOCK_event_queue"; where name like "wait/synch/mutex/sql/LOCK_event_queue";
count(name) count(name)
1 1
select count(name) from MUTEX_INSTANCES select count(name) from mutex_instances
where name like "wait/synch/mutex/sql/LOCK_user_locks"; where name like "wait/synch/mutex/sql/LOCK_user_locks";
count(name) count(name)
1 1
select count(name) from MUTEX_INSTANCES select count(name) from mutex_instances
where name like "wait/synch/mutex/sql/Cversion_lock"; where name like "wait/synch/mutex/sql/Cversion_lock";
count(name) count(name)
1 1
select count(name) from MUTEX_INSTANCES select count(name) from mutex_instances
where name like "wait/synch/mutex/sql/LOCK_audit_mask"; where name like "wait/synch/mutex/sql/LOCK_audit_mask";
count(name) count(name)
1 1
select count(name) from MUTEX_INSTANCES select count(name) from mutex_instances
where name like "wait/synch/mutex/sql/LOCK_xid_cache"; where name like "wait/synch/mutex/sql/LOCK_xid_cache";
count(name) count(name)
1 1
select count(name) from MUTEX_INSTANCES select count(name) from mutex_instances
where name like "wait/synch/mutex/sql/LOCK_plugin"; where name like "wait/synch/mutex/sql/LOCK_plugin";
count(name) count(name)
1 1
select count(name) from MUTEX_INSTANCES select count(name) from mutex_instances
where name like "wait/synch/mutex/sql/tz_LOCK"; where name like "wait/synch/mutex/sql/tz_LOCK";
count(name) count(name)
1 1
select count(name) from RWLOCK_INSTANCES select count(name) from rwlock_instances
where name like "wait/synch/rwlock/sql/LOCK_grant"; where name like "wait/synch/rwlock/sql/LOCK_grant";
count(name) count(name)
1 1
select count(name) from RWLOCK_INSTANCES select count(name) from rwlock_instances
where name like "wait/synch/rwlock/sql/LOCK_sys_init_connect"; where name like "wait/synch/rwlock/sql/LOCK_sys_init_connect";
count(name) count(name)
1 1
select count(name) from RWLOCK_INSTANCES select count(name) from rwlock_instances
where name like "wait/synch/rwlock/sql/LOCK_sys_init_slave"; where name like "wait/synch/rwlock/sql/LOCK_sys_init_slave";
count(name) count(name)
1 1
select count(name) from RWLOCK_INSTANCES select count(name) from rwlock_instances
where name like "wait/synch/rwlock/sql/LOCK_system_variables_hash"; where name like "wait/synch/rwlock/sql/LOCK_system_variables_hash";
count(name) count(name)
1 1
select count(name) from COND_INSTANCES select count(name) from cond_instances
where name like "wait/synch/cond/sql/COND_server_started"; where name like "wait/synch/cond/sql/COND_server_started";
count(name) count(name)
1 1
select count(name) from COND_INSTANCES select count(name) from cond_instances
where name like "wait/synch/cond/sql/COND_refresh"; where name like "wait/synch/cond/sql/COND_refresh";
count(name) count(name)
0 0
select count(name) from COND_INSTANCES select count(name) from cond_instances
where name like "wait/synch/cond/sql/COND_thread_count"; where name like "wait/synch/cond/sql/COND_thread_count";
count(name) count(name)
1 1
select count(name) from COND_INSTANCES select count(name) from cond_instances
where name like "wait/synch/cond/sql/COND_manager"; where name like "wait/synch/cond/sql/COND_manager";
count(name) count(name)
1 1
select count(name) from COND_INSTANCES select count(name) from cond_instances
where name like "wait/synch/cond/sql/COND_thread_cache"; where name like "wait/synch/cond/sql/COND_thread_cache";
count(name) count(name)
1 1
select count(name) from COND_INSTANCES select count(name) from cond_instances
where name like "wait/synch/cond/sql/COND_flush_thread_cache"; where name like "wait/synch/cond/sql/COND_flush_thread_cache";
count(name) count(name)
1 1
select count(name) from COND_INSTANCES select count(name) from cond_instances
where name like "wait/synch/cond/sql/COND_rpl_status"; where name like "wait/synch/cond/sql/COND_rpl_status";
count(name) count(name)
1 1
select count(name) from COND_INSTANCES select count(name) from cond_instances
where name like "wait/synch/cond/sql/Query_cache::COND_cache_status_changed"; where name like "wait/synch/cond/sql/Query_cache::COND_cache_status_changed";
count(name) count(name)
1 1
select count(name) from COND_INSTANCES select count(name) from cond_instances
where name like "wait/synch/cond/sql/COND_queue_state"; where name like "wait/synch/cond/sql/COND_queue_state";
count(name) count(name)
1 1

46
mysql-test/suite/perfschema/r/start_server_no_cond_class.result
View File

@ -5,35 +5,35 @@ mtr
mysql mysql
performance_schema performance_schema
test test
select count(*) from performance_schema.PERFORMANCE_TIMERS; select count(*) from performance_schema.performance_timers;
count(*) count(*)
5 5
select count(*) from performance_schema.SETUP_CONSUMERS; select count(*) from performance_schema.setup_consumers;
count(*) count(*)
8 8
select count(*) > 0 from performance_schema.SETUP_INSTRUMENTS; select count(*) > 0 from performance_schema.setup_instruments;
count(*) > 0 count(*) > 0
1 1
select count(*) from performance_schema.SETUP_TIMERS; select count(*) from performance_schema.setup_timers;
count(*) count(*)
1 1
select * from performance_schema.COND_INSTANCES; select * from performance_schema.cond_instances;
select * from performance_schema.EVENTS_WAITS_CURRENT; select * from performance_schema.events_waits_current;
select * from performance_schema.EVENTS_WAITS_HISTORY; select * from performance_schema.events_waits_history;
select * from performance_schema.EVENTS_WAITS_HISTORY_LONG; select * from performance_schema.events_waits_history_long;
select * from performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE; select * from performance_schema.events_waits_summary_by_instance;
select * from performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME; select * from performance_schema.events_waits_summary_by_thread_by_event_name;
select * from performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME; select * from performance_schema.events_waits_summary_global_by_event_name;
select * from performance_schema.FILE_INSTANCES; select * from performance_schema.file_instances;
select * from performance_schema.FILE_SUMMARY_BY_EVENT_NAME; select * from performance_schema.file_summary_by_event_name;
select * from performance_schema.FILE_SUMMARY_BY_INSTANCE; select * from performance_schema.file_summary_by_instance;
select * from performance_schema.MUTEX_INSTANCES; select * from performance_schema.mutex_instances;
select * from performance_schema.PERFORMANCE_TIMERS; select * from performance_schema.performance_timers;
select * from performance_schema.RWLOCK_INSTANCES; select * from performance_schema.rwlock_instances;
select * from performance_schema.SETUP_CONSUMERS; select * from performance_schema.setup_consumers;
select * from performance_schema.SETUP_INSTRUMENTS; select * from performance_schema.setup_instruments;
select * from performance_schema.SETUP_TIMERS; select * from performance_schema.setup_timers;
select * from performance_schema.THREADS; select * from performance_schema.threads;
show variables like "performance_schema%"; show variables like "performance_schema%";
Variable_name Value Variable_name Value
performance_schema ON performance_schema ON
@ -57,7 +57,7 @@ show status like "performance_schema%";
show variables like "performance_schema_max_cond_classes"; show variables like "performance_schema_max_cond_classes";
Variable_name Value Variable_name Value
performance_schema_max_cond_classes 0 performance_schema_max_cond_classes 0
select count(*) from performance_schema.SETUP_INSTRUMENTS select count(*) from performance_schema.setup_instruments
where name like "wait/synch/cond/%"; where name like "wait/synch/cond/%";
count(*) count(*)
0 0
@ -65,7 +65,7 @@ select variable_value > 0 from information_schema.global_status
where variable_name like 'PERFORMANCE_SCHEMA_COND_CLASSES_LOST'; where variable_name like 'PERFORMANCE_SCHEMA_COND_CLASSES_LOST';
variable_value > 0 variable_value > 0
1 1
select count(*) from performance_schema.COND_INSTANCES; select count(*) from performance_schema.cond_instances;
count(*) count(*)
0 0
show status like "performance_schema_cond_instances_lost"; show status like "performance_schema_cond_instances_lost";

46
mysql-test/suite/perfschema/r/start_server_no_cond_inst.result
View File

@ -5,35 +5,35 @@ mtr
mysql mysql
performance_schema performance_schema
test test
select count(*) from performance_schema.PERFORMANCE_TIMERS; select count(*) from performance_schema.performance_timers;
count(*) count(*)
5 5
select count(*) from performance_schema.SETUP_CONSUMERS; select count(*) from performance_schema.setup_consumers;
count(*) count(*)
8 8
select count(*) > 0 from performance_schema.SETUP_INSTRUMENTS; select count(*) > 0 from performance_schema.setup_instruments;
count(*) > 0 count(*) > 0
1 1
select count(*) from performance_schema.SETUP_TIMERS; select count(*) from performance_schema.setup_timers;
count(*) count(*)
1 1
select * from performance_schema.COND_INSTANCES; select * from performance_schema.cond_instances;
select * from performance_schema.EVENTS_WAITS_CURRENT; select * from performance_schema.events_waits_current;
select * from performance_schema.EVENTS_WAITS_HISTORY; select * from performance_schema.events_waits_history;
select * from performance_schema.EVENTS_WAITS_HISTORY_LONG; select * from performance_schema.events_waits_history_long;
select * from performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE; select * from performance_schema.events_waits_summary_by_instance;
select * from performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME; select * from performance_schema.events_waits_summary_by_thread_by_event_name;
select * from performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME; select * from performance_schema.events_waits_summary_global_by_event_name;
select * from performance_schema.FILE_INSTANCES; select * from performance_schema.file_instances;
select * from performance_schema.FILE_SUMMARY_BY_EVENT_NAME; select * from performance_schema.file_summary_by_event_name;
select * from performance_schema.FILE_SUMMARY_BY_INSTANCE; select * from performance_schema.file_summary_by_instance;
select * from performance_schema.MUTEX_INSTANCES; select * from performance_schema.mutex_instances;
select * from performance_schema.PERFORMANCE_TIMERS; select * from performance_schema.performance_timers;
select * from performance_schema.RWLOCK_INSTANCES; select * from performance_schema.rwlock_instances;
select * from performance_schema.SETUP_CONSUMERS; select * from performance_schema.setup_consumers;
select * from performance_schema.SETUP_INSTRUMENTS; select * from performance_schema.setup_instruments;
select * from performance_schema.SETUP_TIMERS; select * from performance_schema.setup_timers;
select * from performance_schema.THREADS; select * from performance_schema.threads;
show variables like "performance_schema%"; show variables like "performance_schema%";
Variable_name Value Variable_name Value
performance_schema ON performance_schema ON
@ -57,7 +57,7 @@ show status like "performance_schema%";
show variables like "performance_schema_max_cond_classes"; show variables like "performance_schema_max_cond_classes";
Variable_name Value Variable_name Value
performance_schema_max_cond_classes 80 performance_schema_max_cond_classes 80
select count(*) > 0 from performance_schema.SETUP_INSTRUMENTS select count(*) > 0 from performance_schema.setup_instruments
where name like "wait/synch/cond/%"; where name like "wait/synch/cond/%";
count(*) > 0 count(*) > 0
1 1
@ -67,7 +67,7 @@ Performance_schema_cond_classes_lost 0
show variables like "performance_schema_max_cond_instances"; show variables like "performance_schema_max_cond_instances";
Variable_name Value Variable_name Value
performance_schema_max_cond_instances 0 performance_schema_max_cond_instances 0
select count(*) from performance_schema.COND_INSTANCES; select count(*) from performance_schema.cond_instances;
count(*) count(*)
0 0
select variable_value > 0 from information_schema.global_status select variable_value > 0 from information_schema.global_status

46
mysql-test/suite/perfschema/r/start_server_no_file_class.result
View File

@ -5,35 +5,35 @@ mtr
mysql mysql
performance_schema performance_schema
test test
select count(*) from performance_schema.PERFORMANCE_TIMERS; select count(*) from performance_schema.performance_timers;
count(*) count(*)
5 5
select count(*) from performance_schema.SETUP_CONSUMERS; select count(*) from performance_schema.setup_consumers;
count(*) count(*)
8 8
select count(*) > 0 from performance_schema.SETUP_INSTRUMENTS; select count(*) > 0 from performance_schema.setup_instruments;
count(*) > 0 count(*) > 0
1 1
select count(*) from performance_schema.SETUP_TIMERS; select count(*) from performance_schema.setup_timers;
count(*) count(*)
1 1
select * from performance_schema.COND_INSTANCES; select * from performance_schema.cond_instances;
select * from performance_schema.EVENTS_WAITS_CURRENT; select * from performance_schema.events_waits_current;
select * from performance_schema.EVENTS_WAITS_HISTORY; select * from performance_schema.events_waits_history;
select * from performance_schema.EVENTS_WAITS_HISTORY_LONG; select * from performance_schema.events_waits_history_long;
select * from performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE; select * from performance_schema.events_waits_summary_by_instance;
select * from performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME; select * from performance_schema.events_waits_summary_by_thread_by_event_name;
select * from performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME; select * from performance_schema.events_waits_summary_global_by_event_name;
select * from performance_schema.FILE_INSTANCES; select * from performance_schema.file_instances;
select * from performance_schema.FILE_SUMMARY_BY_EVENT_NAME; select * from performance_schema.file_summary_by_event_name;
select * from performance_schema.FILE_SUMMARY_BY_INSTANCE; select * from performance_schema.file_summary_by_instance;
select * from performance_schema.MUTEX_INSTANCES; select * from performance_schema.mutex_instances;
select * from performance_schema.PERFORMANCE_TIMERS; select * from performance_schema.performance_timers;
select * from performance_schema.RWLOCK_INSTANCES; select * from performance_schema.rwlock_instances;
select * from performance_schema.SETUP_CONSUMERS; select * from performance_schema.setup_consumers;
select * from performance_schema.SETUP_INSTRUMENTS; select * from performance_schema.setup_instruments;
select * from performance_schema.SETUP_TIMERS; select * from performance_schema.setup_timers;
select * from performance_schema.THREADS; select * from performance_schema.threads;
show variables like "performance_schema%"; show variables like "performance_schema%";
Variable_name Value Variable_name Value
performance_schema ON performance_schema ON
@ -57,7 +57,7 @@ show status like "performance_schema%";
show variables like "performance_schema_max_file_classes"; show variables like "performance_schema_max_file_classes";
Variable_name Value Variable_name Value
performance_schema_max_file_classes 0 performance_schema_max_file_classes 0
select count(*) from performance_schema.SETUP_INSTRUMENTS select count(*) from performance_schema.setup_instruments
where name like "wait/io/file/%"; where name like "wait/io/file/%";
count(*) count(*)
0 0
@ -65,7 +65,7 @@ select variable_value > 0 from information_schema.global_status
where variable_name like 'PERFORMANCE_SCHEMA_FILE_CLASSES_LOST'; where variable_name like 'PERFORMANCE_SCHEMA_FILE_CLASSES_LOST';
variable_value > 0 variable_value > 0
1 1
select count(*) from performance_schema.FILE_INSTANCES; select count(*) from performance_schema.file_instances;
count(*) count(*)
0 0
show status like "performance_schema_file_instances_lost"; show status like "performance_schema_file_instances_lost";

46
mysql-test/suite/perfschema/r/start_server_no_file_inst.result
View File

@ -5,35 +5,35 @@ mtr
mysql mysql
performance_schema performance_schema
test test
select count(*) from performance_schema.PERFORMANCE_TIMERS; select count(*) from performance_schema.performance_timers;
count(*) count(*)
5 5
select count(*) from performance_schema.SETUP_CONSUMERS; select count(*) from performance_schema.setup_consumers;
count(*) count(*)
8 8
select count(*) > 0 from performance_schema.SETUP_INSTRUMENTS; select count(*) > 0 from performance_schema.setup_instruments;
count(*) > 0 count(*) > 0
1 1
select count(*) from performance_schema.SETUP_TIMERS; select count(*) from performance_schema.setup_timers;
count(*) count(*)
1 1
select * from performance_schema.COND_INSTANCES; select * from performance_schema.cond_instances;
select * from performance_schema.EVENTS_WAITS_CURRENT; select * from performance_schema.events_waits_current;
select * from performance_schema.EVENTS_WAITS_HISTORY; select * from performance_schema.events_waits_history;
select * from performance_schema.EVENTS_WAITS_HISTORY_LONG; select * from performance_schema.events_waits_history_long;
select * from performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE; select * from performance_schema.events_waits_summary_by_instance;
select * from performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME; select * from performance_schema.events_waits_summary_by_thread_by_event_name;
select * from performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME; select * from performance_schema.events_waits_summary_global_by_event_name;
select * from performance_schema.FILE_INSTANCES; select * from performance_schema.file_instances;
select * from performance_schema.FILE_SUMMARY_BY_EVENT_NAME; select * from performance_schema.file_summary_by_event_name;
select * from performance_schema.FILE_SUMMARY_BY_INSTANCE; select * from performance_schema.file_summary_by_instance;
select * from performance_schema.MUTEX_INSTANCES; select * from performance_schema.mutex_instances;
select * from performance_schema.PERFORMANCE_TIMERS; select * from performance_schema.performance_timers;
select * from performance_schema.RWLOCK_INSTANCES; select * from performance_schema.rwlock_instances;
select * from performance_schema.SETUP_CONSUMERS; select * from performance_schema.setup_consumers;
select * from performance_schema.SETUP_INSTRUMENTS; select * from performance_schema.setup_instruments;
select * from performance_schema.SETUP_TIMERS; select * from performance_schema.setup_timers;
select * from performance_schema.THREADS; select * from performance_schema.threads;
show variables like "performance_schema%"; show variables like "performance_schema%";
Variable_name Value Variable_name Value
performance_schema ON performance_schema ON
@ -57,7 +57,7 @@ show status like "performance_schema%";
show variables like "performance_schema_max_file_classes"; show variables like "performance_schema_max_file_classes";
Variable_name Value Variable_name Value
performance_schema_max_file_classes 50 performance_schema_max_file_classes 50
select count(*) > 0 from performance_schema.SETUP_INSTRUMENTS select count(*) > 0 from performance_schema.setup_instruments
where name like "wait/io/file/%"; where name like "wait/io/file/%";
count(*) > 0 count(*) > 0
1 1
@ -67,7 +67,7 @@ Performance_schema_file_classes_lost 0
show variables like "performance_schema_max_file_instances"; show variables like "performance_schema_max_file_instances";
Variable_name Value Variable_name Value
performance_schema_max_file_instances 0 performance_schema_max_file_instances 0
select count(*) from performance_schema.FILE_INSTANCES; select count(*) from performance_schema.file_instances;
count(*) count(*)
0 0
select variable_value > 0 from information_schema.global_status select variable_value > 0 from information_schema.global_status

46
mysql-test/suite/perfschema/r/start_server_no_mutex_class.result
View File

@ -5,35 +5,35 @@ mtr
mysql mysql
performance_schema performance_schema
test test
select count(*) from performance_schema.PERFORMANCE_TIMERS; select count(*) from performance_schema.performance_timers;
count(*) count(*)
5 5
select count(*) from performance_schema.SETUP_CONSUMERS; select count(*) from performance_schema.setup_consumers;
count(*) count(*)
8 8
select count(*) > 0 from performance_schema.SETUP_INSTRUMENTS; select count(*) > 0 from performance_schema.setup_instruments;
count(*) > 0 count(*) > 0
1 1
select count(*) from performance_schema.SETUP_TIMERS; select count(*) from performance_schema.setup_timers;
count(*) count(*)
1 1
select * from performance_schema.COND_INSTANCES; select * from performance_schema.cond_instances;
select * from performance_schema.EVENTS_WAITS_CURRENT; select * from performance_schema.events_waits_current;
select * from performance_schema.EVENTS_WAITS_HISTORY; select * from performance_schema.events_waits_history;
select * from performance_schema.EVENTS_WAITS_HISTORY_LONG; select * from performance_schema.events_waits_history_long;
select * from performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE; select * from performance_schema.events_waits_summary_by_instance;
select * from performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME; select * from performance_schema.events_waits_summary_by_thread_by_event_name;
select * from performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME; select * from performance_schema.events_waits_summary_global_by_event_name;
select * from performance_schema.FILE_INSTANCES; select * from performance_schema.file_instances;
select * from performance_schema.FILE_SUMMARY_BY_EVENT_NAME; select * from performance_schema.file_summary_by_event_name;
select * from performance_schema.FILE_SUMMARY_BY_INSTANCE; select * from performance_schema.file_summary_by_instance;
select * from performance_schema.MUTEX_INSTANCES; select * from performance_schema.mutex_instances;
select * from performance_schema.PERFORMANCE_TIMERS; select * from performance_schema.performance_timers;
select * from performance_schema.RWLOCK_INSTANCES; select * from performance_schema.rwlock_instances;
select * from performance_schema.SETUP_CONSUMERS; select * from performance_schema.setup_consumers;
select * from performance_schema.SETUP_INSTRUMENTS; select * from performance_schema.setup_instruments;
select * from performance_schema.SETUP_TIMERS; select * from performance_schema.setup_timers;
select * from performance_schema.THREADS; select * from performance_schema.threads;
show variables like "performance_schema%"; show variables like "performance_schema%";
Variable_name Value Variable_name Value
performance_schema ON performance_schema ON
@ -57,7 +57,7 @@ show status like "performance_schema%";
show variables like "performance_schema_max_mutex_classes"; show variables like "performance_schema_max_mutex_classes";
Variable_name Value Variable_name Value
performance_schema_max_mutex_classes 0 performance_schema_max_mutex_classes 0
select count(*) from performance_schema.SETUP_INSTRUMENTS select count(*) from performance_schema.setup_instruments
where name like "wait/synch/mutex/%"; where name like "wait/synch/mutex/%";
count(*) count(*)
0 0
@ -65,7 +65,7 @@ select variable_value > 0 from information_schema.global_status
where variable_name like 'PERFORMANCE_SCHEMA_MUTEX_CLASSES_LOST'; where variable_name like 'PERFORMANCE_SCHEMA_MUTEX_CLASSES_LOST';
variable_value > 0 variable_value > 0
1 1
select count(*) from performance_schema.MUTEX_INSTANCES; select count(*) from performance_schema.mutex_instances;
count(*) count(*)
0 0
show status like "performance_schema_mutex_instances_lost"; show status like "performance_schema_mutex_instances_lost";

46
mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result
View File

@ -5,35 +5,35 @@ mtr
mysql mysql
performance_schema performance_schema
test test
select count(*) from performance_schema.PERFORMANCE_TIMERS; select count(*) from performance_schema.performance_timers;
count(*) count(*)
5 5
select count(*) from performance_schema.SETUP_CONSUMERS; select count(*) from performance_schema.setup_consumers;
count(*) count(*)
8 8
select count(*) > 0 from performance_schema.SETUP_INSTRUMENTS; select count(*) > 0 from performance_schema.setup_instruments;
count(*) > 0 count(*) > 0
1 1
select count(*) from performance_schema.SETUP_TIMERS; select count(*) from performance_schema.setup_timers;
count(*) count(*)
1 1
select * from performance_schema.COND_INSTANCES; select * from performance_schema.cond_instances;
select * from performance_schema.EVENTS_WAITS_CURRENT; select * from performance_schema.events_waits_current;
select * from performance_schema.EVENTS_WAITS_HISTORY; select * from performance_schema.events_waits_history;
select * from performance_schema.EVENTS_WAITS_HISTORY_LONG; select * from performance_schema.events_waits_history_long;
select * from performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE; select * from performance_schema.events_waits_summary_by_instance;
select * from performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME; select * from performance_schema.events_waits_summary_by_thread_by_event_name;
select * from performance_schema.EVENTS_WAITS_SUMMARY_GLOBAL_BY_EVENT_NAME; select * from performance_schema.events_waits_summary_global_by_event_name;
select * from performance_schema.FILE_INSTANCES; select * from performance_schema.file_instances;
select * from performance_schema.FILE_SUMMARY_BY_EVENT_NAME; select * from performance_schema.file_summary_by_event_name;
select * from performance_schema.FILE_SUMMARY_BY_INSTANCE; select * from performance_schema.file_summary_by_instance;
select * from performance_schema.MUTEX_INSTANCES; select * from performance_schema.mutex_instances;
select * from performance_schema.PERFORMANCE_TIMERS; select * from performance_schema.performance_timers;
select * from performance_schema.RWLOCK_INSTANCES; select * from performance_schema.rwlock_instances;
select * from performance_schema.SETUP_CONSUMERS; select * from performance_schema.setup_consumers;
select * from performance_schema.SETUP_INSTRUMENTS; select * from performance_schema.setup_instruments;
select * from performance_schema.SETUP_TIMERS; select * from performance_schema.setup_timers;
select * from performance_schema.THREADS; select * from performance_schema.threads;
show variables like "performance_schema%"; show variables like "performance_schema%";
Variable_name Value Variable_name Value
performance_schema ON performance_schema ON
@ -57,7 +57,7 @@ show status like "performance_schema%";
show variables like "performance_schema_max_mutex_classes"; show variables like "performance_schema_max_mutex_classes";
Variable_name Value Variable_name Value
performance_schema_max_mutex_classes 200 performance_schema_max_mutex_classes 200
select count(*) > 0 from performance_schema.SETUP_INSTRUMENTS select count(*) > 0 from performance_schema.setup_instruments
where name like "wait/synch/mutex/%"; where name like "wait/synch/mutex/%";
count(*) > 0 count(*) > 0
1 1
@ -67,7 +67,7 @@ Performance_schema_mutex_classes_lost 0
show variables like "performance_schema_max_mutex_instances"; show variables like "performance_schema_max_mutex_instances";
Variable_name Value Variable_name Value
performance_schema_max_mutex_instances 0 performance_schema_max_mutex_instances 0
select count(*) from performance_schema.MUTEX_INSTANCES; select count(*) from performance_schema.mutex_instances;
count(*) count(*)
0 0
select variable_value > 0 from information_schema.global_status select variable_value > 0 from information_schema.global_status

Some files were not shown because too many files have changed in this diff Show More