diff options
Diffstat (limited to 'mysql-test/suite/perfschema/include')
5 files changed, 18 insertions, 3 deletions
diff --git a/mysql-test/suite/perfschema/include/connection_setup.inc b/mysql-test/suite/perfschema/include/connection_setup.inc index a661d43d063..93b8e959ee3 100644 --- a/mysql-test/suite/perfschema/include/connection_setup.inc +++ b/mysql-test/suite/perfschema/include/connection_setup.inc @@ -53,10 +53,15 @@ --disable_query_log +create user user1@localhost; grant ALL on *.* to user1@localhost; +create user user2@localhost; grant ALL on *.* to user2@localhost; +create user user3@localhost; grant ALL on *.* to user3@localhost; +create user user4@localhost; grant ALL on *.* to user4@localhost; +create user user5@localhost; grant ALL on *.* to user5@localhost; flush privileges; diff --git a/mysql-test/suite/perfschema/include/event_aggregate_setup.inc b/mysql-test/suite/perfschema/include/event_aggregate_setup.inc index ec35e60d463..7dfefd25235 100644 --- a/mysql-test/suite/perfschema/include/event_aggregate_setup.inc +++ b/mysql-test/suite/perfschema/include/event_aggregate_setup.inc @@ -66,10 +66,13 @@ --source ../include/wait_for_pfs_thread_count.inc --disable_query_log - +create user user1@localhost; grant ALL on *.* to user1@localhost; +create user user2@localhost; grant ALL on *.* to user2@localhost; +create user user3@localhost; grant ALL on *.* to user3@localhost; +create user user4@localhost; grant ALL on *.* to user4@localhost; flush privileges; diff --git a/mysql-test/suite/perfschema/include/stage_setup.inc b/mysql-test/suite/perfschema/include/stage_setup.inc index 639b1df8c02..85ade046939 100644 --- a/mysql-test/suite/perfschema/include/stage_setup.inc +++ b/mysql-test/suite/perfschema/include/stage_setup.inc @@ -28,9 +28,13 @@ --disable_query_log +create user user1@localhost; grant ALL on *.* to user1@localhost; +create user user2@localhost; grant ALL on *.* to user2@localhost; +create user user3@localhost; grant ALL on *.* to user3@localhost; +create user user4@localhost; grant ALL on *.* to user4@localhost; flush privileges; diff --git a/mysql-test/suite/perfschema/include/table_aggregate_setup.inc b/mysql-test/suite/perfschema/include/table_aggregate_setup.inc index 522cdb9346d..79aa5482838 100644 --- a/mysql-test/suite/perfschema/include/table_aggregate_setup.inc +++ b/mysql-test/suite/perfschema/include/table_aggregate_setup.inc @@ -71,9 +71,13 @@ --source ../include/wait_for_pfs_thread_count.inc --disable_query_log +create user user1@localhost; grant ALL on *.* to user1@localhost; +create user user2@localhost; grant ALL on *.* to user2@localhost; +create user user3@localhost; grant ALL on *.* to user3@localhost; +create user user4@localhost; grant ALL on *.* to user4@localhost; flush privileges; diff --git a/mysql-test/suite/perfschema/include/upgrade_check.inc b/mysql-test/suite/perfschema/include/upgrade_check.inc index 52d4cfd1e63..327d63cc633 100644 --- a/mysql-test/suite/perfschema/include/upgrade_check.inc +++ b/mysql-test/suite/perfschema/include/upgrade_check.inc @@ -3,11 +3,10 @@ # --source include/count_sessions.inc ---error 1 --exec $MYSQL_UPGRADE --skip-verbose --force > $out_file 2> $err_file --source include/wait_until_count_sessions.inc -# Verify that mysql_upgrade complained about the performance_schema +# Verify that mysql_upgrade does not complain about the performance_schema --replace_regex /at line [0-9]+/at line ###/ --cat_file $err_file |