From aed9c656a919b94c9451f8618a332f4ba421c21c Mon Sep 17 00:00:00 2001 From: Alexander Barkov Date: Mon, 4 Sep 2023 15:28:50 +0400 Subject: [PATCH] MDEV-32101 CREATE PACKAGE [BODY] for sql_mode=DEFAULT This patch adds PACKAGE support with SQL/PSM dialect for sql_mode=DEFAULT: - CREATE PACKAGE - DROP PACKAGE - CREATE PACKAGE BODY - DROP PACKAGE BODY - Package function and procedure invocation from outside of the package: -- using two step identifiers SELECT pkg.f1(); CALL pkg.p1() -- using three step identifiers SELECT db.pkg.f1(); CALL db.pkg.p1(); This is a non-standard MariaDB extension. However, later this code can be used to implement the SQL Standard and DB2 dialects of CREATE MODULE. --- mysql-test/main/sp-package-code.result | 260 ++++ mysql-test/main/sp-package-code.test | 200 +++ mysql-test/main/sp-package-security.result | 309 ++++ mysql-test/main/sp-package-security.test | 322 ++++ mysql-test/main/sp-package.result | 51 + mysql-test/main/sp-package.test | 46 + .../suite/compat/oracle/r/sp-package.result | 19 +- .../suite/compat/oracle/t/sp-package.test | 25 +- .../suite/perfschema/r/event_aggregate.result | 1334 ++++++++--------- .../perfschema/r/event_aggregate_no_a.result | 918 ++++++------ .../r/event_aggregate_no_a_no_h.result | 784 +++++----- .../r/event_aggregate_no_a_no_u.result | 478 +++--- .../r/event_aggregate_no_a_no_u_no_h.result | 344 ++--- .../perfschema/r/event_aggregate_no_h.result | 1200 +++++++-------- .../perfschema/r/event_aggregate_no_u.result | 894 +++++------ .../r/event_aggregate_no_u_no_h.result | 760 +++++----- sql/sp.cc | 2 +- sql/sp.h | 6 + sql/sql_lex.cc | 36 +- sql/sql_lex.h | 8 +- sql/sql_yacc.yy | 415 ++--- 21 files changed, 4865 insertions(+), 3546 deletions(-) create mode 100644 mysql-test/main/sp-package-code.result create mode 100644 mysql-test/main/sp-package-code.test create mode 100644 mysql-test/main/sp-package-security.result create mode 100644 mysql-test/main/sp-package-security.test create mode 100644 mysql-test/main/sp-package.result create mode 100644 mysql-test/main/sp-package.test diff --git a/mysql-test/main/sp-package-code.result b/mysql-test/main/sp-package-code.result new file mode 100644 index 0000000000000..f69cb7ec671a1 --- /dev/null +++ b/mysql-test/main/sp-package-code.result @@ -0,0 +1,260 @@ +# +# MDEV-32101 CREATE PACKAGE [BODY] for sql_mode=DEFAULT +# +CREATE PACKAGE pkg1 +PROCEDURE p1(); +FUNCTION f1() RETURNS INT; +END; +$$ +CREATE PACKAGE BODY pkg1 +PROCEDURE p1() +BEGIN SELECT 1; +END; +FUNCTION f1() RETURNS INT RETURN 1; +END; +$$ +SHOW PROCEDURE CODE pkg1.p1; +Pos Instruction +0 stmt 0 "SELECT 1" +SHOW FUNCTION CODE pkg1.f1; +Pos Instruction +0 freturn int 1 +SHOW PACKAGE BODY CODE pkg1; +Pos Instruction +DROP PACKAGE pkg1; +CREATE PACKAGE pkg1 +PROCEDURE p1(); +FUNCTION f1() RETURNS INT; +PROCEDURE p2show(); +PROCEDURE p2public(); +FUNCTION f2public() RETURNS TEXT; +END; +$$ +CREATE PACKAGE BODY pkg1 +DECLARE a INT DEFAULT 10; +PROCEDURE p1() +BEGIN +DECLARE b INT DEFAULT 20; +SET b=a; +SET b=a+1; +SET a=b; +SET a=b+1; +SET a=a+1; +SET @a=@a+2; +SELECT f1() FROM DUAL; +END; +FUNCTION f1() RETURNS INT +BEGIN +RETURN a; +END; +PROCEDURE p2private() +BEGIN +SELECT 'This is p2private'; +END; +PROCEDURE p2public() +BEGIN +SELECT 'This is p2public'; +END; +FUNCTION f2private() RETURNS TEXT +BEGIN +RETURN 'This is f2private'; +END; +FUNCTION f2public() RETURNS TEXT +BEGIN +RETURN 'This is f2public'; +END; +PROCEDURE p2show() +BEGIN +SHOW FUNCTION CODE f2public; +SHOW FUNCTION CODE f2private; +SHOW PROCEDURE CODE p2public; +SHOW PROCEDURE CODE p2private; +SHOW PROCEDURE CODE p2show; +END; +-- Initialization section +SET a=a+1; +BEGIN +DECLARE b INT; +SET b=a; +SET b=a+1; +SET a=b; +SET a=b+1; +END; +END; +$$ +SHOW PROCEDURE CODE pkg1.p1; +Pos Instruction +0 set b@0 20 +1 set b@0 PACKAGE_BODY.a@0 +2 set b@0 PACKAGE_BODY.a@0 + 1 +3 set PACKAGE_BODY.a@0 b@0 +4 set PACKAGE_BODY.a@0 b@0 + 1 +5 set PACKAGE_BODY.a@0 PACKAGE_BODY.a@0 + 1 +6 stmt 31 "SET @a=@a+2" +7 stmt 0 "SELECT f1() FROM DUAL" +SHOW FUNCTION CODE pkg1.f1; +Pos Instruction +0 freturn int PACKAGE_BODY.a@0 +SHOW PACKAGE BODY CODE pkg1; +Pos Instruction +0 set a@0 10 +1 set a@0 a@0 + 1 +2 set b@1 NULL +3 set b@1 a@0 +4 set b@1 a@0 + 1 +5 set a@0 b@1 +6 set a@0 b@1 + 1 +CALL pkg1.p2show; +Pos Instruction +0 freturn blob 'This is f2public' +Pos Instruction +0 freturn blob 'This is f2private' +Pos Instruction +0 stmt 0 "SELECT 'This is p2public'" +Pos Instruction +0 stmt 0 "SELECT 'This is p2private'" +Pos Instruction +0 stmt 110 "SHOW FUNCTION CODE f2public" +1 stmt 110 "SHOW FUNCTION CODE f2private" +2 stmt 109 "SHOW PROCEDURE CODE p2public" +3 stmt 109 "SHOW PROCEDURE CODE p2private" +4 stmt 109 "SHOW PROCEDURE CODE p2show" +DROP PACKAGE pkg1; +CREATE TABLE t1 (a INT); +CREATE PACKAGE pkg1 +PROCEDURE p1(); +END; +$$ +CREATE PACKAGE BODY pkg1 +DECLARE a TYPE OF t1.a DEFAULT 10; +PROCEDURE p1() +BEGIN +DECLARE b TYPE OF t1.a DEFAULT 20; +SET b=a; +SET b=a+1; +SET b=b+1; +SET a=b; +SET a=b+1; +SET a=a+1; +END; +-- Initialization section +SET a=a+1; +BEGIN +DECLARE b TYPE OF t1.a; +SET b=a; +SET b=a+1; +SET a=b; +SET a=b+1; +END; +END; +$$ +SHOW PROCEDURE CODE pkg1.p1; +Pos Instruction +0 set b@0 20 +1 set b@0 PACKAGE_BODY.a@0 +2 set b@0 PACKAGE_BODY.a@0 + 1 +3 set b@0 b@0 + 1 +4 set PACKAGE_BODY.a@0 b@0 +5 set PACKAGE_BODY.a@0 b@0 + 1 +6 set PACKAGE_BODY.a@0 PACKAGE_BODY.a@0 + 1 +SHOW PACKAGE BODY CODE pkg1; +Pos Instruction +0 set a@0 10 +1 set a@0 a@0 + 1 +2 set b@1 NULL +3 set b@1 a@0 +4 set b@1 a@0 + 1 +5 set a@0 b@1 +6 set a@0 b@1 + 1 +DROP PACKAGE pkg1; +DROP TABLE t1; +CREATE PACKAGE pkg1 +PROCEDURE p1(); +END; +$$ +CREATE PACKAGE BODY pkg1 +DECLARE a ROW(a INT,b TEXT) DEFAULT ROW(10,'x10'); +PROCEDURE p1() +BEGIN +DECLARE b ROW(a INT,b TEXT) DEFAULT ROW(20,'x20'); +SET b=a; +SET a=b; +SET b.a=a.a+1; +SET a.a=b.a+1; +SET a.a=a.a+1; +END; +-- Initialization section +SET a.a:=a.a+1; +BEGIN +DECLARE b ROW(a INT,b TEXT) DEFAULT ROW(30,'x30'); +SET b=a; +SET b.a=a.a+1; +SET a=b; +SET a.a=b.a+1; +END; +END; +$$ +SHOW PROCEDURE CODE pkg1.p1; +Pos Instruction +0 set b@0 (20,'x20') +1 set b@0 PACKAGE_BODY.a@0 +2 set PACKAGE_BODY.a@0 b@0 +3 set b.a@0[0] PACKAGE_BODY.a.a@0[0] + 1 +4 set PACKAGE_BODY.a.a@0[0] b.a@0[0] + 1 +5 set PACKAGE_BODY.a.a@0[0] PACKAGE_BODY.a.a@0[0] + 1 +SHOW PACKAGE BODY CODE pkg1; +Pos Instruction +0 set a@0 (10,'x10') +1 set a.a@0[0] a.a@0[0] + 1 +2 set b@1 (30,'x30') +3 set b@1 a@0 +4 set b.a@1[0] a.a@0[0] + 1 +5 set a@0 b@1 +6 set a.a@0[0] b.a@1[0] + 1 +DROP PACKAGE pkg1; +CREATE TABLE t1 (a INT, b TEXT); +CREATE PACKAGE pkg1 +PROCEDURE p1(); +END; +$$ +CREATE PACKAGE BODY pkg1 +DECLARE a ROW TYPE OF t1 DEFAULT ROW(10,'x10'); +PROCEDURE p1() +BEGIN +DECLARE b ROW TYPE OF t1 DEFAULT ROW(20,'x20'); +SET b=a; +SET a=b; +SET b.a=a.a+1; +SET a.a=b.a+1; +SET a.a=a.a+1; +END; +-- Initialization section +SET a.a=a.a+1; +BEGIN +DECLARE b ROW TYPE OF t1 DEFAULT ROW(30,'x30'); +SET b=a; +SET b.a=a.a+1; +SET a=b; +SET a.a=b.a+1; +END; +END; +$$ +SHOW PROCEDURE CODE pkg1.p1; +Pos Instruction +0 set b@0 (20,'x20') +1 set b@0 PACKAGE_BODY.a@0 +2 set PACKAGE_BODY.a@0 b@0 +3 set b.a@0["a"] PACKAGE_BODY.a.a@0["a"] + 1 +4 set PACKAGE_BODY.a.a@0["a"] b.a@0["a"] + 1 +5 set PACKAGE_BODY.a.a@0["a"] PACKAGE_BODY.a.a@0["a"] + 1 +SHOW PACKAGE BODY CODE pkg1; +Pos Instruction +0 set a@0 (10,'x10') +1 set a.a@0["a"] a.a@0["a"] + 1 +2 set b@1 (30,'x30') +3 set b@1 a@0 +4 set b.a@1["a"] a.a@0["a"] + 1 +5 set a@0 b@1 +6 set a.a@0["a"] b.a@1["a"] + 1 +DROP PACKAGE pkg1; +DROP TABLE t1; diff --git a/mysql-test/main/sp-package-code.test b/mysql-test/main/sp-package-code.test new file mode 100644 index 0000000000000..e99c25e7aa214 --- /dev/null +++ b/mysql-test/main/sp-package-code.test @@ -0,0 +1,200 @@ +-- source include/have_debug.inc + +--echo # +--echo # MDEV-32101 CREATE PACKAGE [BODY] for sql_mode=DEFAULT +--echo # + +DELIMITER $$; +CREATE PACKAGE pkg1 + PROCEDURE p1(); + FUNCTION f1() RETURNS INT; +END; +$$ +CREATE PACKAGE BODY pkg1 + PROCEDURE p1() + BEGIN SELECT 1; + END; + FUNCTION f1() RETURNS INT RETURN 1; +END; +$$ +DELIMITER ;$$ +SHOW PROCEDURE CODE pkg1.p1; +SHOW FUNCTION CODE pkg1.f1; +SHOW PACKAGE BODY CODE pkg1; +DROP PACKAGE pkg1; + +DELIMITER $$; +CREATE PACKAGE pkg1 + PROCEDURE p1(); + FUNCTION f1() RETURNS INT; + PROCEDURE p2show(); + PROCEDURE p2public(); + FUNCTION f2public() RETURNS TEXT; +END; +$$ +CREATE PACKAGE BODY pkg1 + DECLARE a INT DEFAULT 10; + PROCEDURE p1() + BEGIN + DECLARE b INT DEFAULT 20; + SET b=a; + SET b=a+1; + SET a=b; + SET a=b+1; + SET a=a+1; + SET @a=@a+2; + SELECT f1() FROM DUAL; + END; + FUNCTION f1() RETURNS INT + BEGIN + RETURN a; + END; + PROCEDURE p2private() + BEGIN + SELECT 'This is p2private'; + END; + PROCEDURE p2public() + BEGIN + SELECT 'This is p2public'; + END; + FUNCTION f2private() RETURNS TEXT + BEGIN + RETURN 'This is f2private'; + END; + FUNCTION f2public() RETURNS TEXT + BEGIN + RETURN 'This is f2public'; + END; + PROCEDURE p2show() + BEGIN + SHOW FUNCTION CODE f2public; + SHOW FUNCTION CODE f2private; + SHOW PROCEDURE CODE p2public; + SHOW PROCEDURE CODE p2private; + SHOW PROCEDURE CODE p2show; + END; + -- Initialization section + SET a=a+1; + BEGIN + DECLARE b INT; + SET b=a; + SET b=a+1; + SET a=b; + SET a=b+1; + END; +END; +$$ +DELIMITER ;$$ + +SHOW PROCEDURE CODE pkg1.p1; +SHOW FUNCTION CODE pkg1.f1; +SHOW PACKAGE BODY CODE pkg1; +CALL pkg1.p2show; + +DROP PACKAGE pkg1; + + +CREATE TABLE t1 (a INT); +DELIMITER $$; +CREATE PACKAGE pkg1 + PROCEDURE p1(); +END; +$$ +CREATE PACKAGE BODY pkg1 + DECLARE a TYPE OF t1.a DEFAULT 10; + PROCEDURE p1() + BEGIN + DECLARE b TYPE OF t1.a DEFAULT 20; + SET b=a; + SET b=a+1; + SET b=b+1; + SET a=b; + SET a=b+1; + SET a=a+1; + END; + -- Initialization section + SET a=a+1; + BEGIN + DECLARE b TYPE OF t1.a; + SET b=a; + SET b=a+1; + SET a=b; + SET a=b+1; + END; +END; +$$ +DELIMITER ;$$ +SHOW PROCEDURE CODE pkg1.p1; +SHOW PACKAGE BODY CODE pkg1; +DROP PACKAGE pkg1; +DROP TABLE t1; + + +DELIMITER $$; +CREATE PACKAGE pkg1 + PROCEDURE p1(); +END; +$$ +CREATE PACKAGE BODY pkg1 + DECLARE a ROW(a INT,b TEXT) DEFAULT ROW(10,'x10'); + PROCEDURE p1() + BEGIN + DECLARE b ROW(a INT,b TEXT) DEFAULT ROW(20,'x20'); + SET b=a; + SET a=b; + SET b.a=a.a+1; + SET a.a=b.a+1; + SET a.a=a.a+1; + END; + -- Initialization section + SET a.a:=a.a+1; + BEGIN + DECLARE b ROW(a INT,b TEXT) DEFAULT ROW(30,'x30'); + SET b=a; + SET b.a=a.a+1; + SET a=b; + SET a.a=b.a+1; + END; +END; +$$ +DELIMITER ;$$ +SHOW PROCEDURE CODE pkg1.p1; +SHOW PACKAGE BODY CODE pkg1; +DROP PACKAGE pkg1; + + +CREATE TABLE t1 (a INT, b TEXT); +DELIMITER $$; +CREATE PACKAGE pkg1 + PROCEDURE p1(); +END; +$$ +CREATE PACKAGE BODY pkg1 + DECLARE a ROW TYPE OF t1 DEFAULT ROW(10,'x10'); + PROCEDURE p1() + BEGIN + DECLARE b ROW TYPE OF t1 DEFAULT ROW(20,'x20'); + SET b=a; + SET a=b; + SET b.a=a.a+1; + SET a.a=b.a+1; + SET a.a=a.a+1; + END; + -- Initialization section + SET a.a=a.a+1; + BEGIN + DECLARE b ROW TYPE OF t1 DEFAULT ROW(30,'x30'); + SET b=a; + SET b.a=a.a+1; + SET a=b; + SET a.a=b.a+1; + END; +END; +$$ +DELIMITER ;$$ +SHOW PROCEDURE CODE pkg1.p1; +SHOW PACKAGE BODY CODE pkg1; +DROP PACKAGE pkg1; +DROP TABLE t1; + + diff --git a/mysql-test/main/sp-package-security.result b/mysql-test/main/sp-package-security.result new file mode 100644 index 0000000000000..8958a35e6dcdb --- /dev/null +++ b/mysql-test/main/sp-package-security.result @@ -0,0 +1,309 @@ +CREATE DATABASE db1; +CREATE USER u1@localhost IDENTIFIED BY ''; +GRANT SELECT ON db1.* TO u1@localhost; +connect conn1,localhost,u1,,db1; +SELECT CURRENT_USER; +CURRENT_USER +u1@localhost +# +# User u1 cannot drop PROCEDURE, PACKAGE, PACKAGE BODY by default +# +DROP PROCEDURE p1; +ERROR 42000: alter routine command denied to user 'u1'@'localhost' for routine 'db1.p1' +DROP PACKAGE pkg1; +ERROR 42000: alter routine command denied to user 'u1'@'localhost' for routine 'db1.pkg1' +DROP PACKAGE BODY pkg1; +ERROR 42000: alter routine command denied to user 'u1'@'localhost' for routine 'db1.pkg1' +# +# User u1 cannot create PROCEDURE, PACKAGE, PACKAGE BODY by default +# +CREATE PROCEDURE p1() +BEGIN +END; +$$ +ERROR 42000: Access denied for user 'u1'@'localhost' to database 'db1' +CREATE PACKAGE pkg1 +PROCEDURE p1(); +END; +$$ +ERROR 42000: Access denied for user 'u1'@'localhost' to database 'db1' +CREATE PACKAGE BODY pkg1 AS +PROCEDURE p1() AS BEGIN END; +END; +$$ +ERROR 42000: PACKAGE db1.pkg1 does not exist +# +# Now create a PACKAGE by root +# +connection default; +USE db1; +CREATE PROCEDURE p1root() +BEGIN +SELECT 1; +END; +$$ +CREATE PACKAGE pkg1 +PROCEDURE p1(); +FUNCTION f1() RETURNS TEXT; +END; +$$ +SHOW CREATE PACKAGE pkg1; +Package sql_mode Create Package character_set_client collation_connection Database Collation +pkg1 STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION CREATE DEFINER=`root`@`localhost` PACKAGE `pkg1` PROCEDURE p1(); +FUNCTION f1() RETURNS TEXT; +END latin1 latin1_swedish_ci latin1_swedish_ci +# +# u1 cannot SHOW yet: +# - the standalone procedure earlier created by root +# - the package specifications earlier create by root +# +connection conn1; +SHOW CREATE PROCEDURE p1root; +ERROR 42000: PROCEDURE p1root does not exist +SHOW CREATE PACKAGE pkg1; +ERROR 42000: PACKAGE pkg1 does not exist +# +# User u1 still cannot create a PACKAGE BODY +# +connection conn1; +CREATE PACKAGE BODY pkg1 +PROCEDURE p1() BEGIN END; +FUNCTION f1() RETURNS TEXT BEGIN RETURN 'This is f1'; END; +END; +$$ +ERROR 42000: Access denied for user 'u1'@'localhost' to database 'db1' +# +# Now grant EXECUTE: +# - on the standalone procedure earlier created by root +# - on the package specification earlier created by root +# +connection default; +GRANT EXECUTE ON PROCEDURE db1.p1root TO u1@localhost; +GRANT EXECUTE ON PACKAGE db1.pkg1 TO u1@localhost; +# +# Now u1 can do SHOW for: +# - the standalone procedure earlier created by root +# - the package specification earlier created by root +# +disconnect conn1; +connect conn1,localhost,u1,,db1; +SHOW CREATE PROCEDURE db1.p1root; +Procedure sql_mode Create Procedure character_set_client collation_connection Database Collation +p1root STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION NULL latin1 latin1_swedish_ci latin1_swedish_ci +SHOW CREATE PACKAGE db1.pkg1; +Package sql_mode Create Package character_set_client collation_connection Database Collation +pkg1 STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION NULL latin1 latin1_swedish_ci latin1_swedish_ci +# +# Now revoke EXECUTE and grant CREATE ROUTINE instead +# +connection default; +REVOKE EXECUTE ON PROCEDURE db1.p1root FROM u1@localhost; +REVOKE EXECUTE ON PACKAGE db1.pkg1 FROM u1@localhost; +GRANT CREATE ROUTINE ON db1.* TO u1@localhost; +# +# Reconnect u1 to make new grants have effect +# +disconnect conn1; +connect conn1,localhost,u1,,db1; +# +# Now u1 can SHOW: +# - standalone routines earlier created by root +# - package specifications earlier created by root +# +SHOW CREATE PROCEDURE p1root; +Procedure sql_mode Create Procedure character_set_client collation_connection Database Collation +p1root STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION NULL latin1 latin1_swedish_ci latin1_swedish_ci +SHOW CREATE PACKAGE pkg1; +Package sql_mode Create Package character_set_client collation_connection Database Collation +pkg1 STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION NULL latin1 latin1_swedish_ci latin1_swedish_ci +# +# Now u1 can CREATE, DROP and EXECUTE its own standalone procedures +# +CREATE PROCEDURE p1() +BEGIN +END; +$$ +SHOW GRANTS; +Grants for u1@localhost +GRANT USAGE ON *.* TO `u1`@`localhost` +GRANT SELECT, CREATE ROUTINE ON `db1`.* TO `u1`@`localhost` +GRANT EXECUTE, ALTER ROUTINE ON PROCEDURE `db1`.`p1` TO `u1`@`localhost` +CALL p1; +DROP PROCEDURE p1; +SHOW GRANTS; +Grants for u1@localhost +GRANT USAGE ON *.* TO `u1`@`localhost` +GRANT SELECT, CREATE ROUTINE ON `db1`.* TO `u1`@`localhost` +# +# Now u1 can also CREATE, DROP its own package specifications +# +CREATE PACKAGE pkg2 +PROCEDURE p1(); +FUNCTION f1() RETURNS TEXT; +END; +$$ +SHOW CREATE PACKAGE pkg2; +Package sql_mode Create Package character_set_client collation_connection Database Collation +pkg2 STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION CREATE DEFINER=`u1`@`localhost` PACKAGE `pkg2` PROCEDURE p1(); +FUNCTION f1() RETURNS TEXT; +END latin1 latin1_swedish_ci latin1_swedish_ci +SHOW GRANTS; +Grants for u1@localhost +GRANT USAGE ON *.* TO `u1`@`localhost` +GRANT SELECT, CREATE ROUTINE ON `db1`.* TO `u1`@`localhost` +GRANT EXECUTE, ALTER ROUTINE ON PACKAGE `db1`.`pkg2` TO `u1`@`localhost` +DROP PACKAGE pkg2; +SHOW GRANTS; +Grants for u1@localhost +GRANT USAGE ON *.* TO `u1`@`localhost` +GRANT SELECT, CREATE ROUTINE ON `db1`.* TO `u1`@`localhost` +# +# Now u1 can also CREATE, DROP package bodies and EXECUTE package body routines +# +CREATE PACKAGE BODY pkg1 +PROCEDURE p1() BEGIN SELECT 'This is pkg1.p1' AS `comment`; END; +FUNCTION f1() RETURNS TEXT BEGIN RETURN 'This is pkg1.f1'; END; +END; +$$ +SHOW CREATE PACKAGE pkg1; +Package sql_mode Create Package character_set_client collation_connection Database Collation +pkg1 STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION NULL latin1 latin1_swedish_ci latin1_swedish_ci +SHOW CREATE PACKAGE BODY pkg1; +Package body sql_mode Create Package Body character_set_client collation_connection Database Collation +pkg1 STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION CREATE DEFINER=`u1`@`localhost` PACKAGE BODY `pkg1` PROCEDURE p1() BEGIN SELECT 'This is pkg1.p1' AS `comment`; END; +FUNCTION f1() RETURNS TEXT BEGIN RETURN 'This is pkg1.f1'; END; +END latin1 latin1_swedish_ci latin1_swedish_ci +SHOW GRANTS; +Grants for u1@localhost +GRANT USAGE ON *.* TO `u1`@`localhost` +GRANT SELECT, CREATE ROUTINE ON `db1`.* TO `u1`@`localhost` +GRANT EXECUTE, ALTER ROUTINE ON PACKAGE BODY `db1`.`pkg1` TO `u1`@`localhost` +CALL pkg1.p1; +comment +This is pkg1.p1 +SELECT pkg1.f1(); +pkg1.f1() +This is pkg1.f1 +DROP PACKAGE BODY pkg1; +SHOW GRANTS; +Grants for u1@localhost +GRANT USAGE ON *.* TO `u1`@`localhost` +GRANT SELECT, CREATE ROUTINE ON `db1`.* TO `u1`@`localhost` +# +# Now create a PACKAGE BODY by root. +# u1 does not have EXECUTE access by default. +# +connection default; +CREATE PACKAGE BODY pkg1 +PROCEDURE p1() BEGIN SELECT 'This is pkg1.p1' AS `comment`; END; +FUNCTION f1() RETURNS TEXT RETURN 'This is pkg1.f1'; +END; +$$ +connection conn1; +SHOW CREATE PACKAGE pkg1; +Package sql_mode Create Package character_set_client collation_connection Database Collation +pkg1 STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION NULL latin1 latin1_swedish_ci latin1_swedish_ci +SHOW CREATE PACKAGE BODY pkg1; +Package body sql_mode Create Package Body character_set_client collation_connection Database Collation +pkg1 STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION NULL latin1 latin1_swedish_ci latin1_swedish_ci +CALL pkg1.p1; +ERROR 42000: execute command denied to user 'u1'@'localhost' for routine 'db1.pkg1' +SELECT pkg1.f1(); +ERROR 42000: execute command denied to user 'u1'@'localhost' for routine 'db1.pkg1' +# +# Now grant EXECUTE to u1 on the PACKAGE BODY created by root +# +connection default; +GRANT EXECUTE ON PACKAGE BODY db1.pkg1 TO u1@localhost; +disconnect conn1; +connect conn1,localhost,u1,,db1; +SELECT CURRENT_USER; +CURRENT_USER +u1@localhost +SHOW GRANTS; +Grants for u1@localhost +GRANT USAGE ON *.* TO `u1`@`localhost` +GRANT SELECT, CREATE ROUTINE ON `db1`.* TO `u1`@`localhost` +GRANT EXECUTE ON PACKAGE BODY `db1`.`pkg1` TO `u1`@`localhost` +CALL pkg1.p1; +comment +This is pkg1.p1 +SELECT pkg1.f1(); +pkg1.f1() +This is pkg1.f1 +connection default; +DROP PACKAGE BODY pkg1; +# +# u1 still cannot DROP the package specification earlier created by root. +# +connection conn1; +DROP PACKAGE pkg1; +ERROR 42000: alter routine command denied to user 'u1'@'localhost' for routine 'db1.pkg1' +# +# Grant ALTER ROUTINE to u1 +# +connection default; +GRANT ALTER ROUTINE ON db1.* TO u1@localhost; +# +# Now u1 can DROP: +# - the standalone procedure earlier created by root +# - the package specification earlier created by root +# +disconnect conn1; +connect conn1,localhost,u1,,db1; +DROP PACKAGE pkg1; +DROP PROCEDURE p1root; +disconnect conn1; +connection default; +DROP USER u1@localhost; +DROP DATABASE db1; +USE test; +# +# Creator=root, definer=xxx +# +CREATE USER xxx@localhost; +CREATE DEFINER=xxx@localhost PACKAGE p1 +PROCEDURE p1(); +END; +$$ +CREATE DEFINER=xxx@localhost PACKAGE BODY p1 +PROCEDURE p1() +BEGIN +SELECT SESSION_USER(), CURRENT_USER(), 'p1.p1' AS msg; +END; +SELECT SESSION_USER(), CURRENT_USER(), 'package body p1' AS msg; +END; +$$ +CALL p1.p1; +ERROR 42000: execute command denied to user 'xxx'@'localhost' for routine 'test.p1' +GRANT EXECUTE ON PACKAGE BODY test.p1 TO xxx@localhost; +CALL p1.p1; +SESSION_USER() CURRENT_USER() msg +root@localhost xxx@localhost package body p1 +SESSION_USER() CURRENT_USER() msg +root@localhost xxx@localhost p1.p1 +DROP PACKAGE p1; +DROP USER xxx@localhost; +# +# Creator=root, definer=xxx, SQL SECURITY INVOKER +# +CREATE USER xxx@localhost; +CREATE DEFINER=xxx@localhost PACKAGE p1 +PROCEDURE p1(); +END; +$$ +CREATE DEFINER=xxx@localhost PACKAGE BODY p1 SQL SECURITY INVOKER +PROCEDURE p1() +BEGIN +SELECT SESSION_USER(), CURRENT_USER(), 'p1.p1' AS msg; +END; +SELECT SESSION_USER(), CURRENT_USER(), 'package body p1' AS msg; +END; +$$ +CALL p1.p1; +SESSION_USER() CURRENT_USER() msg +root@localhost root@localhost package body p1 +SESSION_USER() CURRENT_USER() msg +root@localhost root@localhost p1.p1 +DROP PACKAGE p1; +DROP USER xxx@localhost; diff --git a/mysql-test/main/sp-package-security.test b/mysql-test/main/sp-package-security.test new file mode 100644 index 0000000000000..c4acb2ce6611f --- /dev/null +++ b/mysql-test/main/sp-package-security.test @@ -0,0 +1,322 @@ +--source include/not_embedded.inc +--source include/default_charset.inc + +CREATE DATABASE db1; +CREATE USER u1@localhost IDENTIFIED BY ''; +GRANT SELECT ON db1.* TO u1@localhost; + +connect (conn1,localhost,u1,,db1); +SELECT CURRENT_USER; + +--echo # +--echo # User u1 cannot drop PROCEDURE, PACKAGE, PACKAGE BODY by default +--echo # + +--error ER_PROCACCESS_DENIED_ERROR +DROP PROCEDURE p1; +--error ER_PROCACCESS_DENIED_ERROR +DROP PACKAGE pkg1; +--error ER_PROCACCESS_DENIED_ERROR +DROP PACKAGE BODY pkg1; + +--echo # +--echo # User u1 cannot create PROCEDURE, PACKAGE, PACKAGE BODY by default +--echo # + +DELIMITER $$; +--error ER_DBACCESS_DENIED_ERROR +CREATE PROCEDURE p1() +BEGIN +END; +$$ +DELIMITER ;$$ + +DELIMITER $$; +--error ER_DBACCESS_DENIED_ERROR +CREATE PACKAGE pkg1 + PROCEDURE p1(); +END; +$$ +DELIMITER ;$$ + +# TODO: this should probably return ER_DBACCESS_DENIED_ERROR +# here, and in the same place in compat/oracle.sp-package-security.test +DELIMITER $$; +--error ER_SP_DOES_NOT_EXIST +CREATE PACKAGE BODY pkg1 AS + PROCEDURE p1() AS BEGIN END; +END; +$$ +DELIMITER ;$$ + + +--echo # +--echo # Now create a PACKAGE by root +--echo # + +connection default; +USE db1; + +DELIMITER $$; +CREATE PROCEDURE p1root() +BEGIN + SELECT 1; +END; +$$ +DELIMITER ;$$ + +DELIMITER $$; +CREATE PACKAGE pkg1 + PROCEDURE p1(); + FUNCTION f1() RETURNS TEXT; +END; +$$ +DELIMITER ;$$ +SHOW CREATE PACKAGE pkg1; + +--echo # +--echo # u1 cannot SHOW yet: +--echo # - the standalone procedure earlier created by root +--echo # - the package specifications earlier create by root +--echo # + +connection conn1; +--error ER_SP_DOES_NOT_EXIST +SHOW CREATE PROCEDURE p1root; +--error ER_SP_DOES_NOT_EXIST +SHOW CREATE PACKAGE pkg1; + + +--echo # +--echo # User u1 still cannot create a PACKAGE BODY +--echo # + +connection conn1; +DELIMITER $$; +--error ER_DBACCESS_DENIED_ERROR +CREATE PACKAGE BODY pkg1 + PROCEDURE p1() BEGIN END; + FUNCTION f1() RETURNS TEXT BEGIN RETURN 'This is f1'; END; +END; +$$ +DELIMITER ;$$ + + +--echo # +--echo # Now grant EXECUTE: +--echo # - on the standalone procedure earlier created by root +--echo # - on the package specification earlier created by root +--echo # +connection default; +GRANT EXECUTE ON PROCEDURE db1.p1root TO u1@localhost; +GRANT EXECUTE ON PACKAGE db1.pkg1 TO u1@localhost; + +--echo # +--echo # Now u1 can do SHOW for: +--echo # - the standalone procedure earlier created by root +--echo # - the package specification earlier created by root +--echo # + +disconnect conn1; +connect (conn1,localhost,u1,,db1); +SHOW CREATE PROCEDURE db1.p1root; +SHOW CREATE PACKAGE db1.pkg1; + + +--echo # +--echo # Now revoke EXECUTE and grant CREATE ROUTINE instead +--echo # + +connection default; +REVOKE EXECUTE ON PROCEDURE db1.p1root FROM u1@localhost; +REVOKE EXECUTE ON PACKAGE db1.pkg1 FROM u1@localhost; +GRANT CREATE ROUTINE ON db1.* TO u1@localhost; + +--echo # +--echo # Reconnect u1 to make new grants have effect +--echo # + +disconnect conn1; +connect (conn1,localhost,u1,,db1); + +--echo # +--echo # Now u1 can SHOW: +--echo # - standalone routines earlier created by root +--echo # - package specifications earlier created by root +--echo # +SHOW CREATE PROCEDURE p1root; +SHOW CREATE PACKAGE pkg1; + +--echo # +--echo # Now u1 can CREATE, DROP and EXECUTE its own standalone procedures +--echo # + +DELIMITER $$; +CREATE PROCEDURE p1() +BEGIN +END; +$$ +DELIMITER ;$$ +SHOW GRANTS; +CALL p1; +DROP PROCEDURE p1; +SHOW GRANTS; + +--echo # +--echo # Now u1 can also CREATE, DROP its own package specifications +--echo # + +DELIMITER $$; +CREATE PACKAGE pkg2 + PROCEDURE p1(); + FUNCTION f1() RETURNS TEXT; +END; +$$ +DELIMITER ;$$ +SHOW CREATE PACKAGE pkg2; +SHOW GRANTS; +DROP PACKAGE pkg2; +SHOW GRANTS; + + +--echo # +--echo # Now u1 can also CREATE, DROP package bodies and EXECUTE package body routines +--echo # + +DELIMITER $$; +CREATE PACKAGE BODY pkg1 + PROCEDURE p1() BEGIN SELECT 'This is pkg1.p1' AS `comment`; END; + FUNCTION f1() RETURNS TEXT BEGIN RETURN 'This is pkg1.f1'; END; +END; +$$ +DELIMITER ;$$ +SHOW CREATE PACKAGE pkg1; +SHOW CREATE PACKAGE BODY pkg1; +SHOW GRANTS; +CALL pkg1.p1; +SELECT pkg1.f1(); +DROP PACKAGE BODY pkg1; +SHOW GRANTS; + +--echo # +--echo # Now create a PACKAGE BODY by root. +--echo # u1 does not have EXECUTE access by default. +--echo # + +connection default; +DELIMITER $$; +CREATE PACKAGE BODY pkg1 + PROCEDURE p1() BEGIN SELECT 'This is pkg1.p1' AS `comment`; END; + FUNCTION f1() RETURNS TEXT RETURN 'This is pkg1.f1'; +END; +$$ +DELIMITER ;$$ + +connection conn1; +SHOW CREATE PACKAGE pkg1; +SHOW CREATE PACKAGE BODY pkg1; +--error ER_PROCACCESS_DENIED_ERROR +CALL pkg1.p1; +--error ER_PROCACCESS_DENIED_ERROR +SELECT pkg1.f1(); + +--echo # +--echo # Now grant EXECUTE to u1 on the PACKAGE BODY created by root +--echo # + +connection default; +GRANT EXECUTE ON PACKAGE BODY db1.pkg1 TO u1@localhost; +disconnect conn1; +connect (conn1,localhost,u1,,db1); +SELECT CURRENT_USER; +SHOW GRANTS; +CALL pkg1.p1; +SELECT pkg1.f1(); + +connection default; +DROP PACKAGE BODY pkg1; + + +--echo # +--echo # u1 still cannot DROP the package specification earlier created by root. +--echo # + +connection conn1; +--error ER_PROCACCESS_DENIED_ERROR +DROP PACKAGE pkg1; + +--echo # +--echo # Grant ALTER ROUTINE to u1 +--echo # + +connection default; +GRANT ALTER ROUTINE ON db1.* TO u1@localhost; + +--echo # +--echo # Now u1 can DROP: +--echo # - the standalone procedure earlier created by root +--echo # - the package specification earlier created by root +--echo # + +disconnect conn1; +connect (conn1,localhost,u1,,db1); +DROP PACKAGE pkg1; +DROP PROCEDURE p1root; + +disconnect conn1; +connection default; + +DROP USER u1@localhost; +DROP DATABASE db1; +USE test; + + +--echo # +--echo # Creator=root, definer=xxx +--echo # + +CREATE USER xxx@localhost; +DELIMITER $$; +CREATE DEFINER=xxx@localhost PACKAGE p1 + PROCEDURE p1(); +END; +$$ +CREATE DEFINER=xxx@localhost PACKAGE BODY p1 + PROCEDURE p1() + BEGIN + SELECT SESSION_USER(), CURRENT_USER(), 'p1.p1' AS msg; + END; + SELECT SESSION_USER(), CURRENT_USER(), 'package body p1' AS msg; +END; +$$ +DELIMITER ;$$ +--error ER_PROCACCESS_DENIED_ERROR +CALL p1.p1; +GRANT EXECUTE ON PACKAGE BODY test.p1 TO xxx@localhost; +CALL p1.p1; +DROP PACKAGE p1; +DROP USER xxx@localhost; + + +--echo # +--echo # Creator=root, definer=xxx, SQL SECURITY INVOKER +--echo # + +CREATE USER xxx@localhost; +DELIMITER $$; +CREATE DEFINER=xxx@localhost PACKAGE p1 + PROCEDURE p1(); +END; +$$ +CREATE DEFINER=xxx@localhost PACKAGE BODY p1 SQL SECURITY INVOKER + PROCEDURE p1() + BEGIN + SELECT SESSION_USER(), CURRENT_USER(), 'p1.p1' AS msg; + END; + SELECT SESSION_USER(), CURRENT_USER(), 'package body p1' AS msg; +END; +$$ +DELIMITER ;$$ +CALL p1.p1; +DROP PACKAGE p1; +DROP USER xxx@localhost; diff --git a/mysql-test/main/sp-package.result b/mysql-test/main/sp-package.result new file mode 100644 index 0000000000000..00efc6715a186 --- /dev/null +++ b/mysql-test/main/sp-package.result @@ -0,0 +1,51 @@ +SET sql_mode=''; +CREATE OR REPLACE PACKAGE pkg +PROCEDURE p1(); +FUNCTION f1() RETURNS INT; +END; +$$ +CREATE OR REPLACE PACKAGE BODY pkg +-- variable declarations +DECLARE a INT DEFAULT 11; +DECLARE b INT DEFAULT 10; +-- routine declarations +PROCEDURE p1() +BEGIN +SELECT CURRENT_USER; +END; +FUNCTION f1() RETURNS INT +BEGIN +RETURN a; +END; +-- initialization section +SET a=a-b; +END; +$$ +SHOW CREATE PACKAGE pkg; +Package sql_mode Create Package character_set_client collation_connection Database Collation +pkg CREATE DEFINER=`root`@`localhost` PACKAGE `pkg` PROCEDURE p1(); +FUNCTION f1() RETURNS INT; +END latin1 latin1_swedish_ci latin1_swedish_ci +SHOW CREATE PACKAGE BODY pkg; +Package body sql_mode Create Package Body character_set_client collation_connection Database Collation +pkg CREATE DEFINER=`root`@`localhost` PACKAGE BODY `pkg` DECLARE a INT DEFAULT 11; +DECLARE b INT DEFAULT 10; +-- routine declarations +PROCEDURE p1() +BEGIN +SELECT CURRENT_USER; +END; +FUNCTION f1() RETURNS INT +BEGIN +RETURN a; +END; +-- initialization section +SET a=a-b; +END latin1 latin1_swedish_ci latin1_swedish_ci +CALL pkg.p1(); +CURRENT_USER +root@localhost +SELECT pkg.f1(); +pkg.f1() +1 +DROP PACKAGE pkg; diff --git a/mysql-test/main/sp-package.test b/mysql-test/main/sp-package.test new file mode 100644 index 0000000000000..80704d6b5b526 --- /dev/null +++ b/mysql-test/main/sp-package.test @@ -0,0 +1,46 @@ +# +# CREATE PACKAGE for sql_mode=''; +# Resebmles SQL Standard 'CREATE MODULE'. +# + +SET sql_mode=''; + +DELIMITER $$; +CREATE OR REPLACE PACKAGE pkg + PROCEDURE p1(); + FUNCTION f1() RETURNS INT; +END; +$$ +DELIMITER ;$$ + + +DELIMITER $$; +CREATE OR REPLACE PACKAGE BODY pkg + -- variable declarations + DECLARE a INT DEFAULT 11; + DECLARE b INT DEFAULT 10; + + -- routine declarations + PROCEDURE p1() + BEGIN + SELECT CURRENT_USER; + END; + FUNCTION f1() RETURNS INT + BEGIN + RETURN a; + END; + + -- initialization section + SET a=a-b; +END; +$$ +DELIMITER ;$$ + + +SHOW CREATE PACKAGE pkg; +SHOW CREATE PACKAGE BODY pkg; + +CALL pkg.p1(); +SELECT pkg.f1(); + +DROP PACKAGE pkg; diff --git a/mysql-test/suite/compat/oracle/r/sp-package.result b/mysql-test/suite/compat/oracle/r/sp-package.result index 0260e2200ad2d..fde8af6027095 100644 --- a/mysql-test/suite/compat/oracle/r/sp-package.result +++ b/mysql-test/suite/compat/oracle/r/sp-package.result @@ -3148,7 +3148,24 @@ collation_connection latin1_swedish_ci DROP VIEW v_test; SET sql_mode=DEFAULT; CREATE VIEW v_test AS SELECT 1 AS c1 FROM DUAL WHERE 1=test1.f_test(); -ERROR 42000: FUNCTION test1.f_test does not exist +SELECT * FROM v_test; +c1 +1 +SHOW CREATE VIEW v_test; +View v_test +Create View CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v_test` AS select 1 AS `c1` from DUAL where 1 = `test`.`test1`.`f_test`() +character_set_client latin1 +collation_connection latin1_swedish_ci +SET sql_mode=ORACLE; +SELECT * FROM v_test; +c1 +1 +SHOW CREATE VIEW v_test; +View v_test +Create View CREATE VIEW "v_test" AS select 1 AS "c1" from DUAL where 1 = "test"."test1"."f_test"() +character_set_client latin1 +collation_connection latin1_swedish_ci +DROP VIEW v_test; SET sql_mode=ORACLE; CREATE VIEW v_test AS SELECT 1 AS c1 FROM DUAL WHERE 1=test.test1.f_test(); SELECT * FROM v_test; diff --git a/mysql-test/suite/compat/oracle/t/sp-package.test b/mysql-test/suite/compat/oracle/t/sp-package.test index b6310eedc53ad..aefede41c8ba1 100644 --- a/mysql-test/suite/compat/oracle/t/sp-package.test +++ b/mysql-test/suite/compat/oracle/t/sp-package.test @@ -2854,13 +2854,18 @@ END test1; $$ DELIMITER ;$$ - +# +# A VIEW created with sql_mode=ORACLE, calling a package routine +# SET sql_mode=ORACLE; CREATE VIEW v_test AS SELECT 1 AS c1 FROM DUAL WHERE 1=test1.f_test(); SELECT * FROM v_test; --vertical_results SHOW CREATE VIEW v_test; --horizontal_results +# +# It also works with sql_mode=DEFALT +# SET sql_mode=DEFAULT; SELECT * FROM v_test; --vertical_results @@ -2868,10 +2873,24 @@ SHOW CREATE VIEW v_test; --horizontal_results DROP VIEW v_test; - +# +# A VIEW created with sql_mode=DEFAULT, calling a package routine +# SET sql_mode=DEFAULT; ---error ER_SP_DOES_NOT_EXIST CREATE VIEW v_test AS SELECT 1 AS c1 FROM DUAL WHERE 1=test1.f_test(); +SELECT * FROM v_test; +--vertical_results +SHOW CREATE VIEW v_test; +# +# It also works with sql_mode=ORACLE +# +--horizontal_results +SET sql_mode=ORACLE; +SELECT * FROM v_test; +--vertical_results +SHOW CREATE VIEW v_test; +--horizontal_results +DROP VIEW v_test; SET sql_mode=ORACLE; diff --git a/mysql-test/suite/perfschema/r/event_aggregate.result b/mysql-test/suite/perfschema/r/event_aggregate.result index 805378f585024..795232a9bcc12 100644 --- a/mysql-test/suite/perfschema/r/event_aggregate.result +++ b/mysql-test/suite/perfschema/r/event_aggregate.result @@ -248,37 +248,37 @@ wait/synch/rwlock/sql/LOCK_grant 1 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 11 +user1 localhost stage/sql/closing tables 12 user1 localhost stage/sql/init 3 -user1 localhost stage/sql/Opening tables 7 +user1 localhost stage/sql/Opening tables 8 user1 localhost stage/sql/starting 6 execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 11 +user1 stage/sql/closing tables 12 user1 stage/sql/init 3 -user1 stage/sql/Opening tables 7 +user1 stage/sql/Opening tables 8 user1 stage/sql/starting 6 execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 4 -localhost stage/sql/closing tables 11 +localhost stage/sql/closing tables 12 localhost stage/sql/init 3 -localhost stage/sql/Opening tables 7 +localhost stage/sql/Opening tables 8 localhost stage/sql/starting 6 execute dump_stages_global; event_name count_star stage/sql/checking permissions 4 -stage/sql/closing tables 11 +stage/sql/closing tables 12 stage/sql/init 3 -stage/sql/Opening tables 7 +stage/sql/Opening tables 8 stage/sql/starting 6 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 4 -stage/sql/closing tables 11 +stage/sql/closing tables 12 stage/sql/init 3 -stage/sql/Opening tables 7 +stage/sql/Opening tables 8 stage/sql/starting 6 execute dump_statements_account; user host event_name count_star @@ -315,19 +315,19 @@ statement/sql/insert 1 statement/sql/select 3 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 +user1 localhost transaction 3 execute dump_transactions_user; user event_name count_star -user1 transaction 2 +user1 transaction 3 execute dump_transactions_host; host event_name count_star -localhost transaction 2 +localhost transaction 3 execute dump_transactions_global; event_name count_star -transaction 2 +transaction 3 execute dump_transactions_history; event_name count(event_name) -transaction 2 +transaction 3 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -380,9 +380,9 @@ wait/synch/rwlock/sql/LOCK_grant 1 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 11 +user1 localhost stage/sql/closing tables 12 user1 localhost stage/sql/init 3 -user1 localhost stage/sql/Opening tables 7 +user1 localhost stage/sql/Opening tables 8 user1 localhost stage/sql/starting 6 user2 localhost stage/sql/checking permissions 0 user2 localhost stage/sql/closing tables 0 @@ -392,9 +392,9 @@ user2 localhost stage/sql/starting 0 execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 11 +user1 stage/sql/closing tables 12 user1 stage/sql/init 3 -user1 stage/sql/Opening tables 7 +user1 stage/sql/Opening tables 8 user1 stage/sql/starting 6 user2 stage/sql/checking permissions 0 user2 stage/sql/closing tables 0 @@ -404,23 +404,23 @@ user2 stage/sql/starting 0 execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 4 -localhost stage/sql/closing tables 11 +localhost stage/sql/closing tables 12 localhost stage/sql/init 3 -localhost stage/sql/Opening tables 7 +localhost stage/sql/Opening tables 8 localhost stage/sql/starting 6 execute dump_stages_global; event_name count_star stage/sql/checking permissions 4 -stage/sql/closing tables 11 +stage/sql/closing tables 12 stage/sql/init 3 -stage/sql/Opening tables 7 +stage/sql/Opening tables 8 stage/sql/starting 6 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 4 -stage/sql/closing tables 11 +stage/sql/closing tables 12 stage/sql/init 3 -stage/sql/Opening tables 7 +stage/sql/Opening tables 8 stage/sql/starting 6 execute dump_statements_account; user host event_name count_star @@ -467,21 +467,21 @@ statement/sql/insert 1 statement/sql/select 3 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 +user1 localhost transaction 3 user2 localhost transaction 0 execute dump_transactions_user; user event_name count_star -user1 transaction 2 +user1 transaction 3 user2 transaction 0 execute dump_transactions_host; host event_name count_star -localhost transaction 2 +localhost transaction 3 execute dump_transactions_global; event_name count_star -transaction 2 +transaction 3 execute dump_transactions_history; event_name count(event_name) -transaction 2 +transaction 3 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -548,47 +548,47 @@ wait/synch/rwlock/sql/LOCK_grant 2 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 11 +user1 localhost stage/sql/closing tables 12 user1 localhost stage/sql/init 3 -user1 localhost stage/sql/Opening tables 7 +user1 localhost stage/sql/Opening tables 8 user1 localhost stage/sql/starting 6 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 10 +user2 localhost stage/sql/closing tables 11 user2 localhost stage/sql/init 3 -user2 localhost stage/sql/Opening tables 6 +user2 localhost stage/sql/Opening tables 7 user2 localhost stage/sql/starting 6 execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 11 +user1 stage/sql/closing tables 12 user1 stage/sql/init 3 -user1 stage/sql/Opening tables 7 +user1 stage/sql/Opening tables 8 user1 stage/sql/starting 6 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 10 +user2 stage/sql/closing tables 11 user2 stage/sql/init 3 -user2 stage/sql/Opening tables 6 +user2 stage/sql/Opening tables 7 user2 stage/sql/starting 6 execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 8 -localhost stage/sql/closing tables 21 +localhost stage/sql/closing tables 23 localhost stage/sql/init 6 -localhost stage/sql/Opening tables 13 +localhost stage/sql/Opening tables 15 localhost stage/sql/starting 12 execute dump_stages_global; event_name count_star stage/sql/checking permissions 8 -stage/sql/closing tables 21 +stage/sql/closing tables 23 stage/sql/init 6 -stage/sql/Opening tables 13 +stage/sql/Opening tables 15 stage/sql/starting 12 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 8 -stage/sql/closing tables 21 +stage/sql/closing tables 23 stage/sql/init 6 -stage/sql/Opening tables 13 +stage/sql/Opening tables 15 stage/sql/starting 12 execute dump_statements_account; user host event_name count_star @@ -635,21 +635,21 @@ statement/sql/insert 2 statement/sql/select 6 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 +user1 transaction 3 +user2 transaction 3 execute dump_transactions_host; host event_name count_star -localhost transaction 4 +localhost transaction 6 execute dump_transactions_global; event_name count_star -transaction 4 +transaction 6 execute dump_transactions_history; event_name count(event_name) -transaction 4 +transaction 6 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -709,14 +709,14 @@ wait/synch/rwlock/sql/LOCK_grant 2 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 11 +user1 localhost stage/sql/closing tables 12 user1 localhost stage/sql/init 3 -user1 localhost stage/sql/Opening tables 7 +user1 localhost stage/sql/Opening tables 8 user1 localhost stage/sql/starting 6 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 10 +user2 localhost stage/sql/closing tables 11 user2 localhost stage/sql/init 3 -user2 localhost stage/sql/Opening tables 6 +user2 localhost stage/sql/Opening tables 7 user2 localhost stage/sql/starting 6 user3 localhost stage/sql/checking permissions 0 user3 localhost stage/sql/closing tables 0 @@ -726,14 +726,14 @@ user3 localhost stage/sql/starting 0 execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 11 +user1 stage/sql/closing tables 12 user1 stage/sql/init 3 -user1 stage/sql/Opening tables 7 +user1 stage/sql/Opening tables 8 user1 stage/sql/starting 6 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 10 +user2 stage/sql/closing tables 11 user2 stage/sql/init 3 -user2 stage/sql/Opening tables 6 +user2 stage/sql/Opening tables 7 user2 stage/sql/starting 6 user3 stage/sql/checking permissions 0 user3 stage/sql/closing tables 0 @@ -743,23 +743,23 @@ user3 stage/sql/starting 0 execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 8 -localhost stage/sql/closing tables 21 +localhost stage/sql/closing tables 23 localhost stage/sql/init 6 -localhost stage/sql/Opening tables 13 +localhost stage/sql/Opening tables 15 localhost stage/sql/starting 12 execute dump_stages_global; event_name count_star stage/sql/checking permissions 8 -stage/sql/closing tables 21 +stage/sql/closing tables 23 stage/sql/init 6 -stage/sql/Opening tables 13 +stage/sql/Opening tables 15 stage/sql/starting 12 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 8 -stage/sql/closing tables 21 +stage/sql/closing tables 23 stage/sql/init 6 -stage/sql/Opening tables 13 +stage/sql/Opening tables 15 stage/sql/starting 12 execute dump_statements_account; user host event_name count_star @@ -816,23 +816,23 @@ statement/sql/insert 2 statement/sql/select 6 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 user3 localhost transaction 0 execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 +user1 transaction 3 +user2 transaction 3 user3 transaction 0 execute dump_transactions_host; host event_name count_star -localhost transaction 4 +localhost transaction 6 execute dump_transactions_global; event_name count_star -transaction 4 +transaction 6 execute dump_transactions_history; event_name count(event_name) -transaction 4 +transaction 6 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -906,57 +906,57 @@ wait/synch/rwlock/sql/LOCK_grant 3 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 11 +user1 localhost stage/sql/closing tables 12 user1 localhost stage/sql/init 3 -user1 localhost stage/sql/Opening tables 7 +user1 localhost stage/sql/Opening tables 8 user1 localhost stage/sql/starting 6 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 10 +user2 localhost stage/sql/closing tables 11 user2 localhost stage/sql/init 3 -user2 localhost stage/sql/Opening tables 6 +user2 localhost stage/sql/Opening tables 7 user2 localhost stage/sql/starting 6 user3 localhost stage/sql/checking permissions 4 -user3 localhost stage/sql/closing tables 10 +user3 localhost stage/sql/closing tables 11 user3 localhost stage/sql/init 3 -user3 localhost stage/sql/Opening tables 6 +user3 localhost stage/sql/Opening tables 7 user3 localhost stage/sql/starting 6 execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 11 +user1 stage/sql/closing tables 12 user1 stage/sql/init 3 -user1 stage/sql/Opening tables 7 +user1 stage/sql/Opening tables 8 user1 stage/sql/starting 6 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 10 +user2 stage/sql/closing tables 11 user2 stage/sql/init 3 -user2 stage/sql/Opening tables 6 +user2 stage/sql/Opening tables 7 user2 stage/sql/starting 6 user3 stage/sql/checking permissions 4 -user3 stage/sql/closing tables 10 +user3 stage/sql/closing tables 11 user3 stage/sql/init 3 -user3 stage/sql/Opening tables 6 +user3 stage/sql/Opening tables 7 user3 stage/sql/starting 6 execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 12 -localhost stage/sql/closing tables 31 +localhost stage/sql/closing tables 34 localhost stage/sql/init 9 -localhost stage/sql/Opening tables 19 +localhost stage/sql/Opening tables 22 localhost stage/sql/starting 18 execute dump_stages_global; event_name count_star stage/sql/checking permissions 12 -stage/sql/closing tables 31 +stage/sql/closing tables 34 stage/sql/init 9 -stage/sql/Opening tables 19 +stage/sql/Opening tables 22 stage/sql/starting 18 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 12 -stage/sql/closing tables 31 +stage/sql/closing tables 34 stage/sql/init 9 -stage/sql/Opening tables 19 +stage/sql/Opening tables 22 stage/sql/starting 18 execute dump_statements_account; user host event_name count_star @@ -1013,23 +1013,23 @@ statement/sql/insert 3 statement/sql/select 9 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 execute dump_transactions_host; host event_name count_star -localhost transaction 6 +localhost transaction 9 execute dump_transactions_global; event_name count_star -transaction 6 +transaction 9 execute dump_transactions_history; event_name count(event_name) -transaction 6 +transaction 9 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -1096,19 +1096,19 @@ wait/synch/rwlock/sql/LOCK_grant 3 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 11 +user1 localhost stage/sql/closing tables 12 user1 localhost stage/sql/init 3 -user1 localhost stage/sql/Opening tables 7 +user1 localhost stage/sql/Opening tables 8 user1 localhost stage/sql/starting 6 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 10 +user2 localhost stage/sql/closing tables 11 user2 localhost stage/sql/init 3 -user2 localhost stage/sql/Opening tables 6 +user2 localhost stage/sql/Opening tables 7 user2 localhost stage/sql/starting 6 user3 localhost stage/sql/checking permissions 4 -user3 localhost stage/sql/closing tables 10 +user3 localhost stage/sql/closing tables 11 user3 localhost stage/sql/init 3 -user3 localhost stage/sql/Opening tables 6 +user3 localhost stage/sql/Opening tables 7 user3 localhost stage/sql/starting 6 user4 localhost stage/sql/checking permissions 0 user4 localhost stage/sql/closing tables 0 @@ -1118,19 +1118,19 @@ user4 localhost stage/sql/starting 0 execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 11 +user1 stage/sql/closing tables 12 user1 stage/sql/init 3 -user1 stage/sql/Opening tables 7 +user1 stage/sql/Opening tables 8 user1 stage/sql/starting 6 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 10 +user2 stage/sql/closing tables 11 user2 stage/sql/init 3 -user2 stage/sql/Opening tables 6 +user2 stage/sql/Opening tables 7 user2 stage/sql/starting 6 user3 stage/sql/checking permissions 4 -user3 stage/sql/closing tables 10 +user3 stage/sql/closing tables 11 user3 stage/sql/init 3 -user3 stage/sql/Opening tables 6 +user3 stage/sql/Opening tables 7 user3 stage/sql/starting 6 user4 stage/sql/checking permissions 0 user4 stage/sql/closing tables 0 @@ -1140,23 +1140,23 @@ user4 stage/sql/starting 0 execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 12 -localhost stage/sql/closing tables 31 +localhost stage/sql/closing tables 34 localhost stage/sql/init 9 -localhost stage/sql/Opening tables 19 +localhost stage/sql/Opening tables 22 localhost stage/sql/starting 18 execute dump_stages_global; event_name count_star stage/sql/checking permissions 12 -stage/sql/closing tables 31 +stage/sql/closing tables 34 stage/sql/init 9 -stage/sql/Opening tables 19 +stage/sql/Opening tables 22 stage/sql/starting 18 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 12 -stage/sql/closing tables 31 +stage/sql/closing tables 34 stage/sql/init 9 -stage/sql/Opening tables 19 +stage/sql/Opening tables 22 stage/sql/starting 18 execute dump_statements_account; user host event_name count_star @@ -1223,25 +1223,25 @@ statement/sql/insert 3 statement/sql/select 9 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 user4 localhost transaction 0 execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 user4 transaction 0 execute dump_transactions_host; host event_name count_star -localhost transaction 6 +localhost transaction 9 execute dump_transactions_global; event_name count_star -transaction 6 +transaction 9 execute dump_transactions_history; event_name count(event_name) -transaction 6 +transaction 9 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -1322,67 +1322,67 @@ wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 11 +user1 localhost stage/sql/closing tables 12 user1 localhost stage/sql/init 3 -user1 localhost stage/sql/Opening tables 7 +user1 localhost stage/sql/Opening tables 8 user1 localhost stage/sql/starting 6 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 10 +user2 localhost stage/sql/closing tables 11 user2 localhost stage/sql/init 3 -user2 localhost stage/sql/Opening tables 6 +user2 localhost stage/sql/Opening tables 7 user2 localhost stage/sql/starting 6 user3 localhost stage/sql/checking permissions 4 -user3 localhost stage/sql/closing tables 10 +user3 localhost stage/sql/closing tables 11 user3 localhost stage/sql/init 3 -user3 localhost stage/sql/Opening tables 6 +user3 localhost stage/sql/Opening tables 7 user3 localhost stage/sql/starting 6 user4 localhost stage/sql/checking permissions 4 -user4 localhost stage/sql/closing tables 10 +user4 localhost stage/sql/closing tables 11 user4 localhost stage/sql/init 3 -user4 localhost stage/sql/Opening tables 6 +user4 localhost stage/sql/Opening tables 7 user4 localhost stage/sql/starting 6 execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 11 +user1 stage/sql/closing tables 12 user1 stage/sql/init 3 -user1 stage/sql/Opening tables 7 +user1 stage/sql/Opening tables 8 user1 stage/sql/starting 6 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 10 +user2 stage/sql/closing tables 11 user2 stage/sql/init 3 -user2 stage/sql/Opening tables 6 +user2 stage/sql/Opening tables 7 user2 stage/sql/starting 6 user3 stage/sql/checking permissions 4 -user3 stage/sql/closing tables 10 +user3 stage/sql/closing tables 11 user3 stage/sql/init 3 -user3 stage/sql/Opening tables 6 +user3 stage/sql/Opening tables 7 user3 stage/sql/starting 6 user4 stage/sql/checking permissions 4 -user4 stage/sql/closing tables 10 +user4 stage/sql/closing tables 11 user4 stage/sql/init 3 -user4 stage/sql/Opening tables 6 +user4 stage/sql/Opening tables 7 user4 stage/sql/starting 6 execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 16 -localhost stage/sql/closing tables 41 +localhost stage/sql/closing tables 45 localhost stage/sql/init 12 -localhost stage/sql/Opening tables 25 +localhost stage/sql/Opening tables 29 localhost stage/sql/starting 24 execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 24 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 24 execute dump_statements_account; user host event_name count_star @@ -1449,25 +1449,25 @@ statement/sql/insert 4 statement/sql/select 12 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 -user4 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 +user4 localhost transaction 3 execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 -user4 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 +user4 transaction 3 execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -1535,67 +1535,67 @@ wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 11 +user1 localhost stage/sql/closing tables 12 user1 localhost stage/sql/init 3 -user1 localhost stage/sql/Opening tables 7 +user1 localhost stage/sql/Opening tables 8 user1 localhost stage/sql/starting 7 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 10 +user2 localhost stage/sql/closing tables 11 user2 localhost stage/sql/init 3 -user2 localhost stage/sql/Opening tables 6 +user2 localhost stage/sql/Opening tables 7 user2 localhost stage/sql/starting 6 user3 localhost stage/sql/checking permissions 4 -user3 localhost stage/sql/closing tables 10 +user3 localhost stage/sql/closing tables 11 user3 localhost stage/sql/init 3 -user3 localhost stage/sql/Opening tables 6 +user3 localhost stage/sql/Opening tables 7 user3 localhost stage/sql/starting 6 user4 localhost stage/sql/checking permissions 4 -user4 localhost stage/sql/closing tables 10 +user4 localhost stage/sql/closing tables 11 user4 localhost stage/sql/init 3 -user4 localhost stage/sql/Opening tables 6 +user4 localhost stage/sql/Opening tables 7 user4 localhost stage/sql/starting 6 execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 11 +user1 stage/sql/closing tables 12 user1 stage/sql/init 3 -user1 stage/sql/Opening tables 7 +user1 stage/sql/Opening tables 8 user1 stage/sql/starting 7 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 10 +user2 stage/sql/closing tables 11 user2 stage/sql/init 3 -user2 stage/sql/Opening tables 6 +user2 stage/sql/Opening tables 7 user2 stage/sql/starting 6 user3 stage/sql/checking permissions 4 -user3 stage/sql/closing tables 10 +user3 stage/sql/closing tables 11 user3 stage/sql/init 3 -user3 stage/sql/Opening tables 6 +user3 stage/sql/Opening tables 7 user3 stage/sql/starting 6 user4 stage/sql/checking permissions 4 -user4 stage/sql/closing tables 10 +user4 stage/sql/closing tables 11 user4 stage/sql/init 3 -user4 stage/sql/Opening tables 6 +user4 stage/sql/Opening tables 7 user4 stage/sql/starting 6 execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 16 -localhost stage/sql/closing tables 41 +localhost stage/sql/closing tables 45 localhost stage/sql/init 12 -localhost stage/sql/Opening tables 25 +localhost stage/sql/Opening tables 29 localhost stage/sql/starting 25 execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 25 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 25 execute dump_statements_account; user host event_name count_star @@ -1663,25 +1663,25 @@ statement/sql/insert 4 statement/sql/select 12 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 -user4 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 +user4 localhost transaction 3 execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 -user4 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 +user4 transaction 3 execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -1748,67 +1748,67 @@ wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 11 +user1 localhost stage/sql/closing tables 12 user1 localhost stage/sql/init 3 -user1 localhost stage/sql/Opening tables 7 +user1 localhost stage/sql/Opening tables 8 user1 localhost stage/sql/starting 7 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 10 +user2 localhost stage/sql/closing tables 11 user2 localhost stage/sql/init 3 -user2 localhost stage/sql/Opening tables 6 +user2 localhost stage/sql/Opening tables 7 user2 localhost stage/sql/starting 7 user3 localhost stage/sql/checking permissions 4 -user3 localhost stage/sql/closing tables 10 +user3 localhost stage/sql/closing tables 11 user3 localhost stage/sql/init 3 -user3 localhost stage/sql/Opening tables 6 +user3 localhost stage/sql/Opening tables 7 user3 localhost stage/sql/starting 6 user4 localhost stage/sql/checking permissions 4 -user4 localhost stage/sql/closing tables 10 +user4 localhost stage/sql/closing tables 11 user4 localhost stage/sql/init 3 -user4 localhost stage/sql/Opening tables 6 +user4 localhost stage/sql/Opening tables 7 user4 localhost stage/sql/starting 6 execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 11 +user1 stage/sql/closing tables 12 user1 stage/sql/init 3 -user1 stage/sql/Opening tables 7 +user1 stage/sql/Opening tables 8 user1 stage/sql/starting 7 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 10 +user2 stage/sql/closing tables 11 user2 stage/sql/init 3 -user2 stage/sql/Opening tables 6 +user2 stage/sql/Opening tables 7 user2 stage/sql/starting 7 user3 stage/sql/checking permissions 4 -user3 stage/sql/closing tables 10 +user3 stage/sql/closing tables 11 user3 stage/sql/init 3 -user3 stage/sql/Opening tables 6 +user3 stage/sql/Opening tables 7 user3 stage/sql/starting 6 user4 stage/sql/checking permissions 4 -user4 stage/sql/closing tables 10 +user4 stage/sql/closing tables 11 user4 stage/sql/init 3 -user4 stage/sql/Opening tables 6 +user4 stage/sql/Opening tables 7 user4 stage/sql/starting 6 execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 16 -localhost stage/sql/closing tables 41 +localhost stage/sql/closing tables 45 localhost stage/sql/init 12 -localhost stage/sql/Opening tables 25 +localhost stage/sql/Opening tables 29 localhost stage/sql/starting 26 execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 26 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 26 execute dump_statements_account; user host event_name count_star @@ -1876,25 +1876,25 @@ statement/sql/insert 4 statement/sql/select 12 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 -user4 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 +user4 localhost transaction 3 execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 -user4 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 +user4 transaction 3 execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -1960,67 +1960,67 @@ wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 11 +user1 localhost stage/sql/closing tables 12 user1 localhost stage/sql/init 3 -user1 localhost stage/sql/Opening tables 7 +user1 localhost stage/sql/Opening tables 8 user1 localhost stage/sql/starting 7 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 10 +user2 localhost stage/sql/closing tables 11 user2 localhost stage/sql/init 3 -user2 localhost stage/sql/Opening tables 6 +user2 localhost stage/sql/Opening tables 7 user2 localhost stage/sql/starting 7 user3 localhost stage/sql/checking permissions 4 -user3 localhost stage/sql/closing tables 10 +user3 localhost stage/sql/closing tables 11 user3 localhost stage/sql/init 3 -user3 localhost stage/sql/Opening tables 6 +user3 localhost stage/sql/Opening tables 7 user3 localhost stage/sql/starting 7 user4 localhost stage/sql/checking permissions 4 -user4 localhost stage/sql/closing tables 10 +user4 localhost stage/sql/closing tables 11 user4 localhost stage/sql/init 3 -user4 localhost stage/sql/Opening tables 6 +user4 localhost stage/sql/Opening tables 7 user4 localhost stage/sql/starting 6 execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 11 +user1 stage/sql/closing tables 12 user1 stage/sql/init 3 -user1 stage/sql/Opening tables 7 +user1 stage/sql/Opening tables 8 user1 stage/sql/starting 7 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 10 +user2 stage/sql/closing tables 11 user2 stage/sql/init 3 -user2 stage/sql/Opening tables 6 +user2 stage/sql/Opening tables 7 user2 stage/sql/starting 7 user3 stage/sql/checking permissions 4 -user3 stage/sql/closing tables 10 +user3 stage/sql/closing tables 11 user3 stage/sql/init 3 -user3 stage/sql/Opening tables 6 +user3 stage/sql/Opening tables 7 user3 stage/sql/starting 7 user4 stage/sql/checking permissions 4 -user4 stage/sql/closing tables 10 +user4 stage/sql/closing tables 11 user4 stage/sql/init 3 -user4 stage/sql/Opening tables 6 +user4 stage/sql/Opening tables 7 user4 stage/sql/starting 6 execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 16 -localhost stage/sql/closing tables 41 +localhost stage/sql/closing tables 45 localhost stage/sql/init 12 -localhost stage/sql/Opening tables 25 +localhost stage/sql/Opening tables 29 localhost stage/sql/starting 27 execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 27 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 27 execute dump_statements_account; user host event_name count_star @@ -2088,25 +2088,25 @@ statement/sql/insert 4 statement/sql/select 12 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 -user4 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 +user4 localhost transaction 3 execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 -user4 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 +user4 transaction 3 execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -2171,67 +2171,67 @@ wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 11 +user1 localhost stage/sql/closing tables 12 user1 localhost stage/sql/init 3 -user1 localhost stage/sql/Opening tables 7 +user1 localhost stage/sql/Opening tables 8 user1 localhost stage/sql/starting 7 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 10 +user2 localhost stage/sql/closing tables 11 user2 localhost stage/sql/init 3 -user2 localhost stage/sql/Opening tables 6 +user2 localhost stage/sql/Opening tables 7 user2 localhost stage/sql/starting 7 user3 localhost stage/sql/checking permissions 4 -user3 localhost stage/sql/closing tables 10 +user3 localhost stage/sql/closing tables 11 user3 localhost stage/sql/init 3 -user3 localhost stage/sql/Opening tables 6 +user3 localhost stage/sql/Opening tables 7 user3 localhost stage/sql/starting 7 user4 localhost stage/sql/checking permissions 4 -user4 localhost stage/sql/closing tables 10 +user4 localhost stage/sql/closing tables 11 user4 localhost stage/sql/init 3 -user4 localhost stage/sql/Opening tables 6 +user4 localhost stage/sql/Opening tables 7 user4 localhost stage/sql/starting 7 execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 11 +user1 stage/sql/closing tables 12 user1 stage/sql/init 3 -user1 stage/sql/Opening tables 7 +user1 stage/sql/Opening tables 8 user1 stage/sql/starting 7 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 10 +user2 stage/sql/closing tables 11 user2 stage/sql/init 3 -user2 stage/sql/Opening tables 6 +user2 stage/sql/Opening tables 7 user2 stage/sql/starting 7 user3 stage/sql/checking permissions 4 -user3 stage/sql/closing tables 10 +user3 stage/sql/closing tables 11 user3 stage/sql/init 3 -user3 stage/sql/Opening tables 6 +user3 stage/sql/Opening tables 7 user3 stage/sql/starting 7 user4 stage/sql/checking permissions 4 -user4 stage/sql/closing tables 10 +user4 stage/sql/closing tables 11 user4 stage/sql/init 3 -user4 stage/sql/Opening tables 6 +user4 stage/sql/Opening tables 7 user4 stage/sql/starting 7 execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 16 -localhost stage/sql/closing tables 41 +localhost stage/sql/closing tables 45 localhost stage/sql/init 12 -localhost stage/sql/Opening tables 25 +localhost stage/sql/Opening tables 29 localhost stage/sql/starting 28 execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -2299,25 +2299,25 @@ statement/sql/insert 4 statement/sql/select 12 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 -user4 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 +user4 localhost transaction 3 execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 -user4 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 +user4 transaction 3 execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -2383,67 +2383,67 @@ wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 11 +user1 localhost stage/sql/closing tables 12 user1 localhost stage/sql/init 3 -user1 localhost stage/sql/Opening tables 7 +user1 localhost stage/sql/Opening tables 8 user1 localhost stage/sql/starting 7 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 10 +user2 localhost stage/sql/closing tables 11 user2 localhost stage/sql/init 3 -user2 localhost stage/sql/Opening tables 6 +user2 localhost stage/sql/Opening tables 7 user2 localhost stage/sql/starting 7 user3 localhost stage/sql/checking permissions 4 -user3 localhost stage/sql/closing tables 10 +user3 localhost stage/sql/closing tables 11 user3 localhost stage/sql/init 3 -user3 localhost stage/sql/Opening tables 6 +user3 localhost stage/sql/Opening tables 7 user3 localhost stage/sql/starting 7 user4 localhost stage/sql/checking permissions 4 -user4 localhost stage/sql/closing tables 10 +user4 localhost stage/sql/closing tables 11 user4 localhost stage/sql/init 3 -user4 localhost stage/sql/Opening tables 6 +user4 localhost stage/sql/Opening tables 7 user4 localhost stage/sql/starting 7 execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 11 +user1 stage/sql/closing tables 12 user1 stage/sql/init 3 -user1 stage/sql/Opening tables 7 +user1 stage/sql/Opening tables 8 user1 stage/sql/starting 7 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 10 +user2 stage/sql/closing tables 11 user2 stage/sql/init 3 -user2 stage/sql/Opening tables 6 +user2 stage/sql/Opening tables 7 user2 stage/sql/starting 7 user3 stage/sql/checking permissions 4 -user3 stage/sql/closing tables 10 +user3 stage/sql/closing tables 11 user3 stage/sql/init 3 -user3 stage/sql/Opening tables 6 +user3 stage/sql/Opening tables 7 user3 stage/sql/starting 7 user4 stage/sql/checking permissions 4 -user4 stage/sql/closing tables 10 +user4 stage/sql/closing tables 11 user4 stage/sql/init 3 -user4 stage/sql/Opening tables 6 +user4 stage/sql/Opening tables 7 user4 stage/sql/starting 7 execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 16 -localhost stage/sql/closing tables 41 +localhost stage/sql/closing tables 45 localhost stage/sql/init 12 -localhost stage/sql/Opening tables 25 +localhost stage/sql/Opening tables 29 localhost stage/sql/starting 28 execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -2511,25 +2511,25 @@ statement/sql/insert 4 statement/sql/select 12 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 -user4 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 +user4 localhost transaction 3 execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 -user4 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 +user4 transaction 3 execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -2594,67 +2594,67 @@ wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 11 +user1 localhost stage/sql/closing tables 12 user1 localhost stage/sql/init 3 -user1 localhost stage/sql/Opening tables 7 +user1 localhost stage/sql/Opening tables 8 user1 localhost stage/sql/starting 7 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 10 +user2 localhost stage/sql/closing tables 11 user2 localhost stage/sql/init 3 -user2 localhost stage/sql/Opening tables 6 +user2 localhost stage/sql/Opening tables 7 user2 localhost stage/sql/starting 7 user3 localhost stage/sql/checking permissions 4 -user3 localhost stage/sql/closing tables 10 +user3 localhost stage/sql/closing tables 11 user3 localhost stage/sql/init 3 -user3 localhost stage/sql/Opening tables 6 +user3 localhost stage/sql/Opening tables 7 user3 localhost stage/sql/starting 7 user4 localhost stage/sql/checking permissions 4 -user4 localhost stage/sql/closing tables 10 +user4 localhost stage/sql/closing tables 11 user4 localhost stage/sql/init 3 -user4 localhost stage/sql/Opening tables 6 +user4 localhost stage/sql/Opening tables 7 user4 localhost stage/sql/starting 7 execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 11 +user1 stage/sql/closing tables 12 user1 stage/sql/init 3 -user1 stage/sql/Opening tables 7 +user1 stage/sql/Opening tables 8 user1 stage/sql/starting 7 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 10 +user2 stage/sql/closing tables 11 user2 stage/sql/init 3 -user2 stage/sql/Opening tables 6 +user2 stage/sql/Opening tables 7 user2 stage/sql/starting 7 user3 stage/sql/checking permissions 4 -user3 stage/sql/closing tables 10 +user3 stage/sql/closing tables 11 user3 stage/sql/init 3 -user3 stage/sql/Opening tables 6 +user3 stage/sql/Opening tables 7 user3 stage/sql/starting 7 user4 stage/sql/checking permissions 4 -user4 stage/sql/closing tables 10 +user4 stage/sql/closing tables 11 user4 stage/sql/init 3 -user4 stage/sql/Opening tables 6 +user4 stage/sql/Opening tables 7 user4 stage/sql/starting 7 execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 16 -localhost stage/sql/closing tables 41 +localhost stage/sql/closing tables 45 localhost stage/sql/init 12 -localhost stage/sql/Opening tables 25 +localhost stage/sql/Opening tables 29 localhost stage/sql/starting 28 execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -2722,25 +2722,25 @@ statement/sql/insert 4 statement/sql/select 12 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 -user4 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 +user4 localhost transaction 3 execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 -user4 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 +user4 transaction 3 execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -2805,67 +2805,67 @@ wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 11 +user1 localhost stage/sql/closing tables 12 user1 localhost stage/sql/init 3 -user1 localhost stage/sql/Opening tables 7 +user1 localhost stage/sql/Opening tables 8 user1 localhost stage/sql/starting 7 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 10 +user2 localhost stage/sql/closing tables 11 user2 localhost stage/sql/init 3 -user2 localhost stage/sql/Opening tables 6 +user2 localhost stage/sql/Opening tables 7 user2 localhost stage/sql/starting 7 user3 localhost stage/sql/checking permissions 4 -user3 localhost stage/sql/closing tables 10 +user3 localhost stage/sql/closing tables 11 user3 localhost stage/sql/init 3 -user3 localhost stage/sql/Opening tables 6 +user3 localhost stage/sql/Opening tables 7 user3 localhost stage/sql/starting 7 user4 localhost stage/sql/checking permissions 4 -user4 localhost stage/sql/closing tables 10 +user4 localhost stage/sql/closing tables 11 user4 localhost stage/sql/init 3 -user4 localhost stage/sql/Opening tables 6 +user4 localhost stage/sql/Opening tables 7 user4 localhost stage/sql/starting 7 execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 11 +user1 stage/sql/closing tables 12 user1 stage/sql/init 3 -user1 stage/sql/Opening tables 7 +user1 stage/sql/Opening tables 8 user1 stage/sql/starting 7 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 10 +user2 stage/sql/closing tables 11 user2 stage/sql/init 3 -user2 stage/sql/Opening tables 6 +user2 stage/sql/Opening tables 7 user2 stage/sql/starting 7 user3 stage/sql/checking permissions 4 -user3 stage/sql/closing tables 10 +user3 stage/sql/closing tables 11 user3 stage/sql/init 3 -user3 stage/sql/Opening tables 6 +user3 stage/sql/Opening tables 7 user3 stage/sql/starting 7 user4 stage/sql/checking permissions 4 -user4 stage/sql/closing tables 10 +user4 stage/sql/closing tables 11 user4 stage/sql/init 3 -user4 stage/sql/Opening tables 6 +user4 stage/sql/Opening tables 7 user4 stage/sql/starting 7 execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 16 -localhost stage/sql/closing tables 41 +localhost stage/sql/closing tables 45 localhost stage/sql/init 12 -localhost stage/sql/Opening tables 25 +localhost stage/sql/Opening tables 29 localhost stage/sql/starting 28 execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -2933,25 +2933,25 @@ statement/sql/insert 4 statement/sql/select 12 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 -user4 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 +user4 localhost transaction 3 execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 -user4 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 +user4 transaction 3 execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -3016,67 +3016,67 @@ wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 11 +user1 localhost stage/sql/closing tables 12 user1 localhost stage/sql/init 3 -user1 localhost stage/sql/Opening tables 7 +user1 localhost stage/sql/Opening tables 8 user1 localhost stage/sql/starting 7 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 10 +user2 localhost stage/sql/closing tables 11 user2 localhost stage/sql/init 3 -user2 localhost stage/sql/Opening tables 6 +user2 localhost stage/sql/Opening tables 7 user2 localhost stage/sql/starting 7 user3 localhost stage/sql/checking permissions 4 -user3 localhost stage/sql/closing tables 10 +user3 localhost stage/sql/closing tables 11 user3 localhost stage/sql/init 3 -user3 localhost stage/sql/Opening tables 6 +user3 localhost stage/sql/Opening tables 7 user3 localhost stage/sql/starting 7 user4 localhost stage/sql/checking permissions 4 -user4 localhost stage/sql/closing tables 10 +user4 localhost stage/sql/closing tables 11 user4 localhost stage/sql/init 3 -user4 localhost stage/sql/Opening tables 6 +user4 localhost stage/sql/Opening tables 7 user4 localhost stage/sql/starting 7 execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 11 +user1 stage/sql/closing tables 12 user1 stage/sql/init 3 -user1 stage/sql/Opening tables 7 +user1 stage/sql/Opening tables 8 user1 stage/sql/starting 7 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 10 +user2 stage/sql/closing tables 11 user2 stage/sql/init 3 -user2 stage/sql/Opening tables 6 +user2 stage/sql/Opening tables 7 user2 stage/sql/starting 7 user3 stage/sql/checking permissions 4 -user3 stage/sql/closing tables 10 +user3 stage/sql/closing tables 11 user3 stage/sql/init 3 -user3 stage/sql/Opening tables 6 +user3 stage/sql/Opening tables 7 user3 stage/sql/starting 7 user4 stage/sql/checking permissions 4 -user4 stage/sql/closing tables 10 +user4 stage/sql/closing tables 11 user4 stage/sql/init 3 -user4 stage/sql/Opening tables 6 +user4 stage/sql/Opening tables 7 user4 stage/sql/starting 7 execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 16 -localhost stage/sql/closing tables 41 +localhost stage/sql/closing tables 45 localhost stage/sql/init 12 -localhost stage/sql/Opening tables 25 +localhost stage/sql/Opening tables 29 localhost stage/sql/starting 28 execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -3144,25 +3144,25 @@ statement/sql/insert 4 statement/sql/select 12 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 -user4 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 +user4 localhost transaction 3 execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 -user4 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 +user4 transaction 3 execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -3227,67 +3227,67 @@ wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 11 +user1 localhost stage/sql/closing tables 12 user1 localhost stage/sql/init 3 -user1 localhost stage/sql/Opening tables 7 +user1 localhost stage/sql/Opening tables 8 user1 localhost stage/sql/starting 7 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 10 +user2 localhost stage/sql/closing tables 11 user2 localhost stage/sql/init 3 -user2 localhost stage/sql/Opening tables 6 +user2 localhost stage/sql/Opening tables 7 user2 localhost stage/sql/starting 7 user3 localhost stage/sql/checking permissions 4 -user3 localhost stage/sql/closing tables 10 +user3 localhost stage/sql/closing tables 11 user3 localhost stage/sql/init 3 -user3 localhost stage/sql/Opening tables 6 +user3 localhost stage/sql/Opening tables 7 user3 localhost stage/sql/starting 7 user4 localhost stage/sql/checking permissions 4 -user4 localhost stage/sql/closing tables 10 +user4 localhost stage/sql/closing tables 11 user4 localhost stage/sql/init 3 -user4 localhost stage/sql/Opening tables 6 +user4 localhost stage/sql/Opening tables 7 user4 localhost stage/sql/starting 7 execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 11 +user1 stage/sql/closing tables 12 user1 stage/sql/init 3 -user1 stage/sql/Opening tables 7 +user1 stage/sql/Opening tables 8 user1 stage/sql/starting 7 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 10 +user2 stage/sql/closing tables 11 user2 stage/sql/init 3 -user2 stage/sql/Opening tables 6 +user2 stage/sql/Opening tables 7 user2 stage/sql/starting 7 user3 stage/sql/checking permissions 4 -user3 stage/sql/closing tables 10 +user3 stage/sql/closing tables 11 user3 stage/sql/init 3 -user3 stage/sql/Opening tables 6 +user3 stage/sql/Opening tables 7 user3 stage/sql/starting 7 user4 stage/sql/checking permissions 4 -user4 stage/sql/closing tables 10 +user4 stage/sql/closing tables 11 user4 stage/sql/init 3 -user4 stage/sql/Opening tables 6 +user4 stage/sql/Opening tables 7 user4 stage/sql/starting 7 execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 16 -localhost stage/sql/closing tables 41 +localhost stage/sql/closing tables 45 localhost stage/sql/init 12 -localhost stage/sql/Opening tables 25 +localhost stage/sql/Opening tables 29 localhost stage/sql/starting 28 execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -3355,25 +3355,25 @@ statement/sql/insert 4 statement/sql/select 12 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 -user4 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 +user4 localhost transaction 3 execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 -user4 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 +user4 transaction 3 execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -3438,67 +3438,67 @@ wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 11 +user1 localhost stage/sql/closing tables 12 user1 localhost stage/sql/init 3 -user1 localhost stage/sql/Opening tables 7 +user1 localhost stage/sql/Opening tables 8 user1 localhost stage/sql/starting 7 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 10 +user2 localhost stage/sql/closing tables 11 user2 localhost stage/sql/init 3 -user2 localhost stage/sql/Opening tables 6 +user2 localhost stage/sql/Opening tables 7 user2 localhost stage/sql/starting 7 user3 localhost stage/sql/checking permissions 4 -user3 localhost stage/sql/closing tables 10 +user3 localhost stage/sql/closing tables 11 user3 localhost stage/sql/init 3 -user3 localhost stage/sql/Opening tables 6 +user3 localhost stage/sql/Opening tables 7 user3 localhost stage/sql/starting 7 user4 localhost stage/sql/checking permissions 4 -user4 localhost stage/sql/closing tables 10 +user4 localhost stage/sql/closing tables 11 user4 localhost stage/sql/init 3 -user4 localhost stage/sql/Opening tables 6 +user4 localhost stage/sql/Opening tables 7 user4 localhost stage/sql/starting 7 execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 11 +user1 stage/sql/closing tables 12 user1 stage/sql/init 3 -user1 stage/sql/Opening tables 7 +user1 stage/sql/Opening tables 8 user1 stage/sql/starting 7 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 10 +user2 stage/sql/closing tables 11 user2 stage/sql/init 3 -user2 stage/sql/Opening tables 6 +user2 stage/sql/Opening tables 7 user2 stage/sql/starting 7 user3 stage/sql/checking permissions 4 -user3 stage/sql/closing tables 10 +user3 stage/sql/closing tables 11 user3 stage/sql/init 3 -user3 stage/sql/Opening tables 6 +user3 stage/sql/Opening tables 7 user3 stage/sql/starting 7 user4 stage/sql/checking permissions 4 -user4 stage/sql/closing tables 10 +user4 stage/sql/closing tables 11 user4 stage/sql/init 3 -user4 stage/sql/Opening tables 6 +user4 stage/sql/Opening tables 7 user4 stage/sql/starting 7 execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 16 -localhost stage/sql/closing tables 41 +localhost stage/sql/closing tables 45 localhost stage/sql/init 12 -localhost stage/sql/Opening tables 25 +localhost stage/sql/Opening tables 29 localhost stage/sql/starting 28 execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -3566,25 +3566,25 @@ statement/sql/insert 4 statement/sql/select 12 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 -user4 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 +user4 localhost transaction 3 execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 -user4 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 +user4 transaction 3 execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -3671,45 +3671,45 @@ user4 localhost stage/sql/starting 0 execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 11 +user1 stage/sql/closing tables 12 user1 stage/sql/init 3 -user1 stage/sql/Opening tables 7 +user1 stage/sql/Opening tables 8 user1 stage/sql/starting 7 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 10 +user2 stage/sql/closing tables 11 user2 stage/sql/init 3 -user2 stage/sql/Opening tables 6 +user2 stage/sql/Opening tables 7 user2 stage/sql/starting 7 user3 stage/sql/checking permissions 4 -user3 stage/sql/closing tables 10 +user3 stage/sql/closing tables 11 user3 stage/sql/init 3 -user3 stage/sql/Opening tables 6 +user3 stage/sql/Opening tables 7 user3 stage/sql/starting 7 user4 stage/sql/checking permissions 4 -user4 stage/sql/closing tables 10 +user4 stage/sql/closing tables 11 user4 stage/sql/init 3 -user4 stage/sql/Opening tables 6 +user4 stage/sql/Opening tables 7 user4 stage/sql/starting 7 execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 16 -localhost stage/sql/closing tables 41 +localhost stage/sql/closing tables 45 localhost stage/sql/init 12 -localhost stage/sql/Opening tables 25 +localhost stage/sql/Opening tables 29 localhost stage/sql/starting 28 execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -3777,25 +3777,25 @@ statement/sql/insert 4 statement/sql/select 12 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 -user4 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 +user4 localhost transaction 3 execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 -user4 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 +user4 transaction 3 execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -3904,23 +3904,23 @@ user4 stage/sql/starting 0 execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 16 -localhost stage/sql/closing tables 41 +localhost stage/sql/closing tables 45 localhost stage/sql/init 12 -localhost stage/sql/Opening tables 25 +localhost stage/sql/Opening tables 29 localhost stage/sql/starting 28 execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -3988,25 +3988,25 @@ statement/sql/insert 4 statement/sql/select 12 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 -user4 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 +user4 localhost transaction 3 execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 -user4 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 +user4 transaction 3 execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -4122,16 +4122,16 @@ localhost stage/sql/starting 0 execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -4199,25 +4199,25 @@ statement/sql/insert 4 statement/sql/select 12 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 -user4 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 +user4 localhost transaction 3 execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 -user4 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 +user4 transaction 3 execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -4340,9 +4340,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -4410,25 +4410,25 @@ statement/sql/insert 4 statement/sql/select 12 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 -user4 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 +user4 localhost transaction 3 execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 -user4 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 +user4 transaction 3 execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -4551,9 +4551,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -4621,25 +4621,25 @@ statement/sql/insert 4 statement/sql/select 12 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 -user4 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 +user4 localhost transaction 3 execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 -user4 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 +user4 transaction 3 execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -4762,9 +4762,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -4832,25 +4832,25 @@ statement/sql/insert 4 statement/sql/select 12 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 -user4 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 +user4 localhost transaction 3 execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 -user4 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 +user4 transaction 3 execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -4973,9 +4973,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -5043,25 +5043,25 @@ statement/sql/insert 4 statement/sql/select 12 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 -user4 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 +user4 localhost transaction 3 execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 -user4 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 +user4 transaction 3 execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -5184,9 +5184,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -5254,25 +5254,25 @@ statement/sql/insert 4 statement/sql/select 12 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 -user4 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 +user4 localhost transaction 3 execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 -user4 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 +user4 transaction 3 execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -5395,9 +5395,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -5465,25 +5465,25 @@ statement/sql/insert 4 statement/sql/select 12 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 -user4 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 +user4 localhost transaction 3 execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 -user4 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 +user4 transaction 3 execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -5606,9 +5606,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -5676,25 +5676,25 @@ statement/sql/insert 4 statement/sql/select 12 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 -user4 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 +user4 localhost transaction 3 execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 -user4 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 +user4 transaction 3 execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -5817,9 +5817,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -5893,19 +5893,19 @@ user3 localhost transaction 0 user4 localhost transaction 0 execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 -user4 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 +user4 transaction 3 execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -6028,9 +6028,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -6110,13 +6110,13 @@ user3 transaction 0 user4 transaction 0 execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -6239,9 +6239,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -6324,10 +6324,10 @@ host event_name count_star localhost transaction 0 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -6450,9 +6450,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -6538,7 +6538,7 @@ event_name count_star transaction 0 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -6633,9 +6633,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -6697,7 +6697,7 @@ event_name count_star transaction 0 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -6760,9 +6760,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -6800,7 +6800,7 @@ event_name count_star transaction 0 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -6859,9 +6859,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -6899,7 +6899,7 @@ event_name count_star transaction 0 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 diff --git a/mysql-test/suite/perfschema/r/event_aggregate_no_a.result b/mysql-test/suite/perfschema/r/event_aggregate_no_a.result index 30948c2e611a3..076a5c9945e44 100644 --- a/mysql-test/suite/perfschema/r/event_aggregate_no_a.result +++ b/mysql-test/suite/perfschema/r/event_aggregate_no_a.result @@ -232,30 +232,30 @@ user host event_name count_star execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 11 +user1 stage/sql/closing tables 12 user1 stage/sql/init 3 -user1 stage/sql/Opening tables 7 +user1 stage/sql/Opening tables 8 user1 stage/sql/starting 6 execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 4 -localhost stage/sql/closing tables 11 +localhost stage/sql/closing tables 12 localhost stage/sql/init 3 -localhost stage/sql/Opening tables 7 +localhost stage/sql/Opening tables 8 localhost stage/sql/starting 6 execute dump_stages_global; event_name count_star stage/sql/checking permissions 4 -stage/sql/closing tables 11 +stage/sql/closing tables 12 stage/sql/init 3 -stage/sql/Opening tables 7 +stage/sql/Opening tables 8 stage/sql/starting 6 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 4 -stage/sql/closing tables 11 +stage/sql/closing tables 12 stage/sql/init 3 -stage/sql/Opening tables 7 +stage/sql/Opening tables 8 stage/sql/starting 6 execute dump_statements_account; user host event_name count_star @@ -289,16 +289,16 @@ execute dump_transactions_account; user host event_name count_star execute dump_transactions_user; user event_name count_star -user1 transaction 2 +user1 transaction 3 execute dump_transactions_host; host event_name count_star -localhost transaction 2 +localhost transaction 3 execute dump_transactions_global; event_name count_star -transaction 2 +transaction 3 execute dump_transactions_history; event_name count(event_name) -transaction 2 +transaction 3 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -347,9 +347,9 @@ user host event_name count_star execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 11 +user1 stage/sql/closing tables 12 user1 stage/sql/init 3 -user1 stage/sql/Opening tables 7 +user1 stage/sql/Opening tables 8 user1 stage/sql/starting 6 user2 stage/sql/checking permissions 0 user2 stage/sql/closing tables 0 @@ -359,23 +359,23 @@ user2 stage/sql/starting 0 execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 4 -localhost stage/sql/closing tables 11 +localhost stage/sql/closing tables 12 localhost stage/sql/init 3 -localhost stage/sql/Opening tables 7 +localhost stage/sql/Opening tables 8 localhost stage/sql/starting 6 execute dump_stages_global; event_name count_star stage/sql/checking permissions 4 -stage/sql/closing tables 11 +stage/sql/closing tables 12 stage/sql/init 3 -stage/sql/Opening tables 7 +stage/sql/Opening tables 8 stage/sql/starting 6 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 4 -stage/sql/closing tables 11 +stage/sql/closing tables 12 stage/sql/init 3 -stage/sql/Opening tables 7 +stage/sql/Opening tables 8 stage/sql/starting 6 execute dump_statements_account; user host event_name count_star @@ -414,17 +414,17 @@ execute dump_transactions_account; user host event_name count_star execute dump_transactions_user; user event_name count_star -user1 transaction 2 +user1 transaction 3 user2 transaction 0 execute dump_transactions_host; host event_name count_star -localhost transaction 2 +localhost transaction 3 execute dump_transactions_global; event_name count_star -transaction 2 +transaction 3 execute dump_transactions_history; event_name count(event_name) -transaction 2 +transaction 3 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -486,35 +486,35 @@ user host event_name count_star execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 11 +user1 stage/sql/closing tables 12 user1 stage/sql/init 3 -user1 stage/sql/Opening tables 7 +user1 stage/sql/Opening tables 8 user1 stage/sql/starting 6 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 10 +user2 stage/sql/closing tables 11 user2 stage/sql/init 3 -user2 stage/sql/Opening tables 6 +user2 stage/sql/Opening tables 7 user2 stage/sql/starting 6 execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 8 -localhost stage/sql/closing tables 21 +localhost stage/sql/closing tables 23 localhost stage/sql/init 6 -localhost stage/sql/Opening tables 13 +localhost stage/sql/Opening tables 15 localhost stage/sql/starting 12 execute dump_stages_global; event_name count_star stage/sql/checking permissions 8 -stage/sql/closing tables 21 +stage/sql/closing tables 23 stage/sql/init 6 -stage/sql/Opening tables 13 +stage/sql/Opening tables 15 stage/sql/starting 12 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 8 -stage/sql/closing tables 21 +stage/sql/closing tables 23 stage/sql/init 6 -stage/sql/Opening tables 13 +stage/sql/Opening tables 15 stage/sql/starting 12 execute dump_statements_account; user host event_name count_star @@ -553,17 +553,17 @@ execute dump_transactions_account; user host event_name count_star execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 +user1 transaction 3 +user2 transaction 3 execute dump_transactions_host; host event_name count_star -localhost transaction 4 +localhost transaction 6 execute dump_transactions_global; event_name count_star -transaction 4 +transaction 6 execute dump_transactions_history; event_name count(event_name) -transaction 4 +transaction 6 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -616,14 +616,14 @@ user host event_name count_star execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 11 +user1 stage/sql/closing tables 12 user1 stage/sql/init 3 -user1 stage/sql/Opening tables 7 +user1 stage/sql/Opening tables 8 user1 stage/sql/starting 6 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 10 +user2 stage/sql/closing tables 11 user2 stage/sql/init 3 -user2 stage/sql/Opening tables 6 +user2 stage/sql/Opening tables 7 user2 stage/sql/starting 6 user3 stage/sql/checking permissions 0 user3 stage/sql/closing tables 0 @@ -633,23 +633,23 @@ user3 stage/sql/starting 0 execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 8 -localhost stage/sql/closing tables 21 +localhost stage/sql/closing tables 23 localhost stage/sql/init 6 -localhost stage/sql/Opening tables 13 +localhost stage/sql/Opening tables 15 localhost stage/sql/starting 12 execute dump_stages_global; event_name count_star stage/sql/checking permissions 8 -stage/sql/closing tables 21 +stage/sql/closing tables 23 stage/sql/init 6 -stage/sql/Opening tables 13 +stage/sql/Opening tables 15 stage/sql/starting 12 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 8 -stage/sql/closing tables 21 +stage/sql/closing tables 23 stage/sql/init 6 -stage/sql/Opening tables 13 +stage/sql/Opening tables 15 stage/sql/starting 12 execute dump_statements_account; user host event_name count_star @@ -693,18 +693,18 @@ execute dump_transactions_account; user host event_name count_star execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 +user1 transaction 3 +user2 transaction 3 user3 transaction 0 execute dump_transactions_host; host event_name count_star -localhost transaction 4 +localhost transaction 6 execute dump_transactions_global; event_name count_star -transaction 4 +transaction 6 execute dump_transactions_history; event_name count(event_name) -transaction 4 +transaction 6 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -770,40 +770,40 @@ user host event_name count_star execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 11 +user1 stage/sql/closing tables 12 user1 stage/sql/init 3 -user1 stage/sql/Opening tables 7 +user1 stage/sql/Opening tables 8 user1 stage/sql/starting 6 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 10 +user2 stage/sql/closing tables 11 user2 stage/sql/init 3 -user2 stage/sql/Opening tables 6 +user2 stage/sql/Opening tables 7 user2 stage/sql/starting 6 user3 stage/sql/checking permissions 4 -user3 stage/sql/closing tables 10 +user3 stage/sql/closing tables 11 user3 stage/sql/init 3 -user3 stage/sql/Opening tables 6 +user3 stage/sql/Opening tables 7 user3 stage/sql/starting 6 execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 12 -localhost stage/sql/closing tables 31 +localhost stage/sql/closing tables 34 localhost stage/sql/init 9 -localhost stage/sql/Opening tables 19 +localhost stage/sql/Opening tables 22 localhost stage/sql/starting 18 execute dump_stages_global; event_name count_star stage/sql/checking permissions 12 -stage/sql/closing tables 31 +stage/sql/closing tables 34 stage/sql/init 9 -stage/sql/Opening tables 19 +stage/sql/Opening tables 22 stage/sql/starting 18 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 12 -stage/sql/closing tables 31 +stage/sql/closing tables 34 stage/sql/init 9 -stage/sql/Opening tables 19 +stage/sql/Opening tables 22 stage/sql/starting 18 execute dump_statements_account; user host event_name count_star @@ -847,18 +847,18 @@ execute dump_transactions_account; user host event_name count_star execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 execute dump_transactions_host; host event_name count_star -localhost transaction 6 +localhost transaction 9 execute dump_transactions_global; event_name count_star -transaction 6 +transaction 9 execute dump_transactions_history; event_name count(event_name) -transaction 6 +transaction 9 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -915,19 +915,19 @@ user host event_name count_star execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 11 +user1 stage/sql/closing tables 12 user1 stage/sql/init 3 -user1 stage/sql/Opening tables 7 +user1 stage/sql/Opening tables 8 user1 stage/sql/starting 6 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 10 +user2 stage/sql/closing tables 11 user2 stage/sql/init 3 -user2 stage/sql/Opening tables 6 +user2 stage/sql/Opening tables 7 user2 stage/sql/starting 6 user3 stage/sql/checking permissions 4 -user3 stage/sql/closing tables 10 +user3 stage/sql/closing tables 11 user3 stage/sql/init 3 -user3 stage/sql/Opening tables 6 +user3 stage/sql/Opening tables 7 user3 stage/sql/starting 6 user4 stage/sql/checking permissions 0 user4 stage/sql/closing tables 0 @@ -937,23 +937,23 @@ user4 stage/sql/starting 0 execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 12 -localhost stage/sql/closing tables 31 +localhost stage/sql/closing tables 34 localhost stage/sql/init 9 -localhost stage/sql/Opening tables 19 +localhost stage/sql/Opening tables 22 localhost stage/sql/starting 18 execute dump_stages_global; event_name count_star stage/sql/checking permissions 12 -stage/sql/closing tables 31 +stage/sql/closing tables 34 stage/sql/init 9 -stage/sql/Opening tables 19 +stage/sql/Opening tables 22 stage/sql/starting 18 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 12 -stage/sql/closing tables 31 +stage/sql/closing tables 34 stage/sql/init 9 -stage/sql/Opening tables 19 +stage/sql/Opening tables 22 stage/sql/starting 18 execute dump_statements_account; user host event_name count_star @@ -1002,19 +1002,19 @@ execute dump_transactions_account; user host event_name count_star execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 user4 transaction 0 execute dump_transactions_host; host event_name count_star -localhost transaction 6 +localhost transaction 9 execute dump_transactions_global; event_name count_star -transaction 6 +transaction 9 execute dump_transactions_history; event_name count(event_name) -transaction 6 +transaction 9 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -1084,45 +1084,45 @@ user host event_name count_star execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 11 +user1 stage/sql/closing tables 12 user1 stage/sql/init 3 -user1 stage/sql/Opening tables 7 +user1 stage/sql/Opening tables 8 user1 stage/sql/starting 6 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 10 +user2 stage/sql/closing tables 11 user2 stage/sql/init 3 -user2 stage/sql/Opening tables 6 +user2 stage/sql/Opening tables 7 user2 stage/sql/starting 6 user3 stage/sql/checking permissions 4 -user3 stage/sql/closing tables 10 +user3 stage/sql/closing tables 11 user3 stage/sql/init 3 -user3 stage/sql/Opening tables 6 +user3 stage/sql/Opening tables 7 user3 stage/sql/starting 6 user4 stage/sql/checking permissions 4 -user4 stage/sql/closing tables 10 +user4 stage/sql/closing tables 11 user4 stage/sql/init 3 -user4 stage/sql/Opening tables 6 +user4 stage/sql/Opening tables 7 user4 stage/sql/starting 6 execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 16 -localhost stage/sql/closing tables 41 +localhost stage/sql/closing tables 45 localhost stage/sql/init 12 -localhost stage/sql/Opening tables 25 +localhost stage/sql/Opening tables 29 localhost stage/sql/starting 24 execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 24 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 24 execute dump_statements_account; user host event_name count_star @@ -1171,19 +1171,19 @@ execute dump_transactions_account; user host event_name count_star execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 -user4 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 +user4 transaction 3 execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -1240,45 +1240,45 @@ user host event_name count_star execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 11 +user1 stage/sql/closing tables 12 user1 stage/sql/init 3 -user1 stage/sql/Opening tables 7 +user1 stage/sql/Opening tables 8 user1 stage/sql/starting 7 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 10 +user2 stage/sql/closing tables 11 user2 stage/sql/init 3 -user2 stage/sql/Opening tables 6 +user2 stage/sql/Opening tables 7 user2 stage/sql/starting 6 user3 stage/sql/checking permissions 4 -user3 stage/sql/closing tables 10 +user3 stage/sql/closing tables 11 user3 stage/sql/init 3 -user3 stage/sql/Opening tables 6 +user3 stage/sql/Opening tables 7 user3 stage/sql/starting 6 user4 stage/sql/checking permissions 4 -user4 stage/sql/closing tables 10 +user4 stage/sql/closing tables 11 user4 stage/sql/init 3 -user4 stage/sql/Opening tables 6 +user4 stage/sql/Opening tables 7 user4 stage/sql/starting 6 execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 16 -localhost stage/sql/closing tables 41 +localhost stage/sql/closing tables 45 localhost stage/sql/init 12 -localhost stage/sql/Opening tables 25 +localhost stage/sql/Opening tables 29 localhost stage/sql/starting 25 execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 25 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 25 execute dump_statements_account; user host event_name count_star @@ -1328,19 +1328,19 @@ execute dump_transactions_account; user host event_name count_star execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 -user4 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 +user4 transaction 3 execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -1396,45 +1396,45 @@ user host event_name count_star execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 11 +user1 stage/sql/closing tables 12 user1 stage/sql/init 3 -user1 stage/sql/Opening tables 7 +user1 stage/sql/Opening tables 8 user1 stage/sql/starting 7 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 10 +user2 stage/sql/closing tables 11 user2 stage/sql/init 3 -user2 stage/sql/Opening tables 6 +user2 stage/sql/Opening tables 7 user2 stage/sql/starting 7 user3 stage/sql/checking permissions 4 -user3 stage/sql/closing tables 10 +user3 stage/sql/closing tables 11 user3 stage/sql/init 3 -user3 stage/sql/Opening tables 6 +user3 stage/sql/Opening tables 7 user3 stage/sql/starting 6 user4 stage/sql/checking permissions 4 -user4 stage/sql/closing tables 10 +user4 stage/sql/closing tables 11 user4 stage/sql/init 3 -user4 stage/sql/Opening tables 6 +user4 stage/sql/Opening tables 7 user4 stage/sql/starting 6 execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 16 -localhost stage/sql/closing tables 41 +localhost stage/sql/closing tables 45 localhost stage/sql/init 12 -localhost stage/sql/Opening tables 25 +localhost stage/sql/Opening tables 29 localhost stage/sql/starting 26 execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 26 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 26 execute dump_statements_account; user host event_name count_star @@ -1484,19 +1484,19 @@ execute dump_transactions_account; user host event_name count_star execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 -user4 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 +user4 transaction 3 execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -1551,45 +1551,45 @@ user host event_name count_star execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 11 +user1 stage/sql/closing tables 12 user1 stage/sql/init 3 -user1 stage/sql/Opening tables 7 +user1 stage/sql/Opening tables 8 user1 stage/sql/starting 7 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 10 +user2 stage/sql/closing tables 11 user2 stage/sql/init 3 -user2 stage/sql/Opening tables 6 +user2 stage/sql/Opening tables 7 user2 stage/sql/starting 7 user3 stage/sql/checking permissions 4 -user3 stage/sql/closing tables 10 +user3 stage/sql/closing tables 11 user3 stage/sql/init 3 -user3 stage/sql/Opening tables 6 +user3 stage/sql/Opening tables 7 user3 stage/sql/starting 7 user4 stage/sql/checking permissions 4 -user4 stage/sql/closing tables 10 +user4 stage/sql/closing tables 11 user4 stage/sql/init 3 -user4 stage/sql/Opening tables 6 +user4 stage/sql/Opening tables 7 user4 stage/sql/starting 6 execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 16 -localhost stage/sql/closing tables 41 +localhost stage/sql/closing tables 45 localhost stage/sql/init 12 -localhost stage/sql/Opening tables 25 +localhost stage/sql/Opening tables 29 localhost stage/sql/starting 27 execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 27 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 27 execute dump_statements_account; user host event_name count_star @@ -1639,19 +1639,19 @@ execute dump_transactions_account; user host event_name count_star execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 -user4 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 +user4 transaction 3 execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -1705,45 +1705,45 @@ user host event_name count_star execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 11 +user1 stage/sql/closing tables 12 user1 stage/sql/init 3 -user1 stage/sql/Opening tables 7 +user1 stage/sql/Opening tables 8 user1 stage/sql/starting 7 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 10 +user2 stage/sql/closing tables 11 user2 stage/sql/init 3 -user2 stage/sql/Opening tables 6 +user2 stage/sql/Opening tables 7 user2 stage/sql/starting 7 user3 stage/sql/checking permissions 4 -user3 stage/sql/closing tables 10 +user3 stage/sql/closing tables 11 user3 stage/sql/init 3 -user3 stage/sql/Opening tables 6 +user3 stage/sql/Opening tables 7 user3 stage/sql/starting 7 user4 stage/sql/checking permissions 4 -user4 stage/sql/closing tables 10 +user4 stage/sql/closing tables 11 user4 stage/sql/init 3 -user4 stage/sql/Opening tables 6 +user4 stage/sql/Opening tables 7 user4 stage/sql/starting 7 execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 16 -localhost stage/sql/closing tables 41 +localhost stage/sql/closing tables 45 localhost stage/sql/init 12 -localhost stage/sql/Opening tables 25 +localhost stage/sql/Opening tables 29 localhost stage/sql/starting 28 execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -1793,19 +1793,19 @@ execute dump_transactions_account; user host event_name count_star execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 -user4 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 +user4 transaction 3 execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -1860,45 +1860,45 @@ user host event_name count_star execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 11 +user1 stage/sql/closing tables 12 user1 stage/sql/init 3 -user1 stage/sql/Opening tables 7 +user1 stage/sql/Opening tables 8 user1 stage/sql/starting 7 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 10 +user2 stage/sql/closing tables 11 user2 stage/sql/init 3 -user2 stage/sql/Opening tables 6 +user2 stage/sql/Opening tables 7 user2 stage/sql/starting 7 user3 stage/sql/checking permissions 4 -user3 stage/sql/closing tables 10 +user3 stage/sql/closing tables 11 user3 stage/sql/init 3 -user3 stage/sql/Opening tables 6 +user3 stage/sql/Opening tables 7 user3 stage/sql/starting 7 user4 stage/sql/checking permissions 4 -user4 stage/sql/closing tables 10 +user4 stage/sql/closing tables 11 user4 stage/sql/init 3 -user4 stage/sql/Opening tables 6 +user4 stage/sql/Opening tables 7 user4 stage/sql/starting 7 execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 16 -localhost stage/sql/closing tables 41 +localhost stage/sql/closing tables 45 localhost stage/sql/init 12 -localhost stage/sql/Opening tables 25 +localhost stage/sql/Opening tables 29 localhost stage/sql/starting 28 execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -1948,19 +1948,19 @@ execute dump_transactions_account; user host event_name count_star execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 -user4 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 +user4 transaction 3 execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -2014,45 +2014,45 @@ user host event_name count_star execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 11 +user1 stage/sql/closing tables 12 user1 stage/sql/init 3 -user1 stage/sql/Opening tables 7 +user1 stage/sql/Opening tables 8 user1 stage/sql/starting 7 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 10 +user2 stage/sql/closing tables 11 user2 stage/sql/init 3 -user2 stage/sql/Opening tables 6 +user2 stage/sql/Opening tables 7 user2 stage/sql/starting 7 user3 stage/sql/checking permissions 4 -user3 stage/sql/closing tables 10 +user3 stage/sql/closing tables 11 user3 stage/sql/init 3 -user3 stage/sql/Opening tables 6 +user3 stage/sql/Opening tables 7 user3 stage/sql/starting 7 user4 stage/sql/checking permissions 4 -user4 stage/sql/closing tables 10 +user4 stage/sql/closing tables 11 user4 stage/sql/init 3 -user4 stage/sql/Opening tables 6 +user4 stage/sql/Opening tables 7 user4 stage/sql/starting 7 execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 16 -localhost stage/sql/closing tables 41 +localhost stage/sql/closing tables 45 localhost stage/sql/init 12 -localhost stage/sql/Opening tables 25 +localhost stage/sql/Opening tables 29 localhost stage/sql/starting 28 execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -2102,19 +2102,19 @@ execute dump_transactions_account; user host event_name count_star execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 -user4 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 +user4 transaction 3 execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -2168,45 +2168,45 @@ user host event_name count_star execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 11 +user1 stage/sql/closing tables 12 user1 stage/sql/init 3 -user1 stage/sql/Opening tables 7 +user1 stage/sql/Opening tables 8 user1 stage/sql/starting 7 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 10 +user2 stage/sql/closing tables 11 user2 stage/sql/init 3 -user2 stage/sql/Opening tables 6 +user2 stage/sql/Opening tables 7 user2 stage/sql/starting 7 user3 stage/sql/checking permissions 4 -user3 stage/sql/closing tables 10 +user3 stage/sql/closing tables 11 user3 stage/sql/init 3 -user3 stage/sql/Opening tables 6 +user3 stage/sql/Opening tables 7 user3 stage/sql/starting 7 user4 stage/sql/checking permissions 4 -user4 stage/sql/closing tables 10 +user4 stage/sql/closing tables 11 user4 stage/sql/init 3 -user4 stage/sql/Opening tables 6 +user4 stage/sql/Opening tables 7 user4 stage/sql/starting 7 execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 16 -localhost stage/sql/closing tables 41 +localhost stage/sql/closing tables 45 localhost stage/sql/init 12 -localhost stage/sql/Opening tables 25 +localhost stage/sql/Opening tables 29 localhost stage/sql/starting 28 execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -2256,19 +2256,19 @@ execute dump_transactions_account; user host event_name count_star execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 -user4 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 +user4 transaction 3 execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -2322,45 +2322,45 @@ user host event_name count_star execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 11 +user1 stage/sql/closing tables 12 user1 stage/sql/init 3 -user1 stage/sql/Opening tables 7 +user1 stage/sql/Opening tables 8 user1 stage/sql/starting 7 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 10 +user2 stage/sql/closing tables 11 user2 stage/sql/init 3 -user2 stage/sql/Opening tables 6 +user2 stage/sql/Opening tables 7 user2 stage/sql/starting 7 user3 stage/sql/checking permissions 4 -user3 stage/sql/closing tables 10 +user3 stage/sql/closing tables 11 user3 stage/sql/init 3 -user3 stage/sql/Opening tables 6 +user3 stage/sql/Opening tables 7 user3 stage/sql/starting 7 user4 stage/sql/checking permissions 4 -user4 stage/sql/closing tables 10 +user4 stage/sql/closing tables 11 user4 stage/sql/init 3 -user4 stage/sql/Opening tables 6 +user4 stage/sql/Opening tables 7 user4 stage/sql/starting 7 execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 16 -localhost stage/sql/closing tables 41 +localhost stage/sql/closing tables 45 localhost stage/sql/init 12 -localhost stage/sql/Opening tables 25 +localhost stage/sql/Opening tables 29 localhost stage/sql/starting 28 execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -2410,19 +2410,19 @@ execute dump_transactions_account; user host event_name count_star execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 -user4 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 +user4 transaction 3 execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -2476,45 +2476,45 @@ user host event_name count_star execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 11 +user1 stage/sql/closing tables 12 user1 stage/sql/init 3 -user1 stage/sql/Opening tables 7 +user1 stage/sql/Opening tables 8 user1 stage/sql/starting 7 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 10 +user2 stage/sql/closing tables 11 user2 stage/sql/init 3 -user2 stage/sql/Opening tables 6 +user2 stage/sql/Opening tables 7 user2 stage/sql/starting 7 user3 stage/sql/checking permissions 4 -user3 stage/sql/closing tables 10 +user3 stage/sql/closing tables 11 user3 stage/sql/init 3 -user3 stage/sql/Opening tables 6 +user3 stage/sql/Opening tables 7 user3 stage/sql/starting 7 user4 stage/sql/checking permissions 4 -user4 stage/sql/closing tables 10 +user4 stage/sql/closing tables 11 user4 stage/sql/init 3 -user4 stage/sql/Opening tables 6 +user4 stage/sql/Opening tables 7 user4 stage/sql/starting 7 execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 16 -localhost stage/sql/closing tables 41 +localhost stage/sql/closing tables 45 localhost stage/sql/init 12 -localhost stage/sql/Opening tables 25 +localhost stage/sql/Opening tables 29 localhost stage/sql/starting 28 execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -2564,19 +2564,19 @@ execute dump_transactions_account; user host event_name count_star execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 -user4 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 +user4 transaction 3 execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -2630,45 +2630,45 @@ user host event_name count_star execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 11 +user1 stage/sql/closing tables 12 user1 stage/sql/init 3 -user1 stage/sql/Opening tables 7 +user1 stage/sql/Opening tables 8 user1 stage/sql/starting 7 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 10 +user2 stage/sql/closing tables 11 user2 stage/sql/init 3 -user2 stage/sql/Opening tables 6 +user2 stage/sql/Opening tables 7 user2 stage/sql/starting 7 user3 stage/sql/checking permissions 4 -user3 stage/sql/closing tables 10 +user3 stage/sql/closing tables 11 user3 stage/sql/init 3 -user3 stage/sql/Opening tables 6 +user3 stage/sql/Opening tables 7 user3 stage/sql/starting 7 user4 stage/sql/checking permissions 4 -user4 stage/sql/closing tables 10 +user4 stage/sql/closing tables 11 user4 stage/sql/init 3 -user4 stage/sql/Opening tables 6 +user4 stage/sql/Opening tables 7 user4 stage/sql/starting 7 execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 16 -localhost stage/sql/closing tables 41 +localhost stage/sql/closing tables 45 localhost stage/sql/init 12 -localhost stage/sql/Opening tables 25 +localhost stage/sql/Opening tables 29 localhost stage/sql/starting 28 execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -2718,19 +2718,19 @@ execute dump_transactions_account; user host event_name count_star execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 -user4 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 +user4 transaction 3 execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -2784,45 +2784,45 @@ user host event_name count_star execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 11 +user1 stage/sql/closing tables 12 user1 stage/sql/init 3 -user1 stage/sql/Opening tables 7 +user1 stage/sql/Opening tables 8 user1 stage/sql/starting 7 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 10 +user2 stage/sql/closing tables 11 user2 stage/sql/init 3 -user2 stage/sql/Opening tables 6 +user2 stage/sql/Opening tables 7 user2 stage/sql/starting 7 user3 stage/sql/checking permissions 4 -user3 stage/sql/closing tables 10 +user3 stage/sql/closing tables 11 user3 stage/sql/init 3 -user3 stage/sql/Opening tables 6 +user3 stage/sql/Opening tables 7 user3 stage/sql/starting 7 user4 stage/sql/checking permissions 4 -user4 stage/sql/closing tables 10 +user4 stage/sql/closing tables 11 user4 stage/sql/init 3 -user4 stage/sql/Opening tables 6 +user4 stage/sql/Opening tables 7 user4 stage/sql/starting 7 execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 16 -localhost stage/sql/closing tables 41 +localhost stage/sql/closing tables 45 localhost stage/sql/init 12 -localhost stage/sql/Opening tables 25 +localhost stage/sql/Opening tables 29 localhost stage/sql/starting 28 execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -2872,19 +2872,19 @@ execute dump_transactions_account; user host event_name count_star execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 -user4 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 +user4 transaction 3 execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -2960,23 +2960,23 @@ user4 stage/sql/starting 0 execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 16 -localhost stage/sql/closing tables 41 +localhost stage/sql/closing tables 45 localhost stage/sql/init 12 -localhost stage/sql/Opening tables 25 +localhost stage/sql/Opening tables 29 localhost stage/sql/starting 28 execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -3026,19 +3026,19 @@ execute dump_transactions_account; user host event_name count_star execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 -user4 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 +user4 transaction 3 execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -3121,16 +3121,16 @@ localhost stage/sql/starting 0 execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -3180,19 +3180,19 @@ execute dump_transactions_account; user host event_name count_star execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 -user4 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 +user4 transaction 3 execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -3282,9 +3282,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -3334,19 +3334,19 @@ execute dump_transactions_account; user host event_name count_star execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 -user4 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 +user4 transaction 3 execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -3436,9 +3436,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -3488,19 +3488,19 @@ execute dump_transactions_account; user host event_name count_star execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 -user4 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 +user4 transaction 3 execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -3590,9 +3590,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -3642,19 +3642,19 @@ execute dump_transactions_account; user host event_name count_star execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 -user4 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 +user4 transaction 3 execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -3744,9 +3744,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -3796,19 +3796,19 @@ execute dump_transactions_account; user host event_name count_star execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 -user4 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 +user4 transaction 3 execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -3898,9 +3898,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -3950,19 +3950,19 @@ execute dump_transactions_account; user host event_name count_star execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 -user4 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 +user4 transaction 3 execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -4052,9 +4052,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -4104,19 +4104,19 @@ execute dump_transactions_account; user host event_name count_star execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 -user4 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 +user4 transaction 3 execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -4206,9 +4206,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -4258,19 +4258,19 @@ execute dump_transactions_account; user host event_name count_star execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 -user4 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 +user4 transaction 3 execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -4360,9 +4360,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -4412,19 +4412,19 @@ execute dump_transactions_account; user host event_name count_star execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 -user4 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 +user4 transaction 3 execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -4514,9 +4514,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -4572,13 +4572,13 @@ user3 transaction 0 user4 transaction 0 execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -4668,9 +4668,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -4729,10 +4729,10 @@ host event_name count_star localhost transaction 0 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -4822,9 +4822,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -4886,7 +4886,7 @@ event_name count_star transaction 0 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -4976,9 +4976,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -5040,7 +5040,7 @@ event_name count_star transaction 0 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -5102,9 +5102,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -5142,7 +5142,7 @@ event_name count_star transaction 0 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -5200,9 +5200,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -5240,7 +5240,7 @@ event_name count_star transaction 0 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; diff --git a/mysql-test/suite/perfschema/r/event_aggregate_no_a_no_h.result b/mysql-test/suite/perfschema/r/event_aggregate_no_a_no_h.result index 956ea6c6488bd..4d590f15b687b 100644 --- a/mysql-test/suite/perfschema/r/event_aggregate_no_a_no_h.result +++ b/mysql-test/suite/perfschema/r/event_aggregate_no_a_no_h.result @@ -202,25 +202,25 @@ user host event_name count_star execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 11 +user1 stage/sql/closing tables 12 user1 stage/sql/init 3 -user1 stage/sql/Opening tables 7 +user1 stage/sql/Opening tables 8 user1 stage/sql/starting 6 execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star stage/sql/checking permissions 4 -stage/sql/closing tables 11 +stage/sql/closing tables 12 stage/sql/init 3 -stage/sql/Opening tables 7 +stage/sql/Opening tables 8 stage/sql/starting 6 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 4 -stage/sql/closing tables 11 +stage/sql/closing tables 12 stage/sql/init 3 -stage/sql/Opening tables 7 +stage/sql/Opening tables 8 stage/sql/starting 6 execute dump_statements_account; user host event_name count_star @@ -249,15 +249,15 @@ execute dump_transactions_account; user host event_name count_star execute dump_transactions_user; user event_name count_star -user1 transaction 2 +user1 transaction 3 execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 2 +transaction 3 execute dump_transactions_history; event_name count(event_name) -transaction 2 +transaction 3 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -303,9 +303,9 @@ user host event_name count_star execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 11 +user1 stage/sql/closing tables 12 user1 stage/sql/init 3 -user1 stage/sql/Opening tables 7 +user1 stage/sql/Opening tables 8 user1 stage/sql/starting 6 user2 stage/sql/checking permissions 0 user2 stage/sql/closing tables 0 @@ -317,16 +317,16 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/checking permissions 4 -stage/sql/closing tables 11 +stage/sql/closing tables 12 stage/sql/init 3 -stage/sql/Opening tables 7 +stage/sql/Opening tables 8 stage/sql/starting 6 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 4 -stage/sql/closing tables 11 +stage/sql/closing tables 12 stage/sql/init 3 -stage/sql/Opening tables 7 +stage/sql/Opening tables 8 stage/sql/starting 6 execute dump_statements_account; user host event_name count_star @@ -360,16 +360,16 @@ execute dump_transactions_account; user host event_name count_star execute dump_transactions_user; user event_name count_star -user1 transaction 2 +user1 transaction 3 user2 transaction 0 execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 2 +transaction 3 execute dump_transactions_history; event_name count(event_name) -transaction 2 +transaction 3 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -428,30 +428,30 @@ user host event_name count_star execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 11 +user1 stage/sql/closing tables 12 user1 stage/sql/init 3 -user1 stage/sql/Opening tables 7 +user1 stage/sql/Opening tables 8 user1 stage/sql/starting 6 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 10 +user2 stage/sql/closing tables 11 user2 stage/sql/init 3 -user2 stage/sql/Opening tables 6 +user2 stage/sql/Opening tables 7 user2 stage/sql/starting 6 execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star stage/sql/checking permissions 8 -stage/sql/closing tables 21 +stage/sql/closing tables 23 stage/sql/init 6 -stage/sql/Opening tables 13 +stage/sql/Opening tables 15 stage/sql/starting 12 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 8 -stage/sql/closing tables 21 +stage/sql/closing tables 23 stage/sql/init 6 -stage/sql/Opening tables 13 +stage/sql/Opening tables 15 stage/sql/starting 12 execute dump_statements_account; user host event_name count_star @@ -485,16 +485,16 @@ execute dump_transactions_account; user host event_name count_star execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 +user1 transaction 3 +user2 transaction 3 execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 4 +transaction 6 execute dump_transactions_history; event_name count(event_name) -transaction 4 +transaction 6 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -544,14 +544,14 @@ user host event_name count_star execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 11 +user1 stage/sql/closing tables 12 user1 stage/sql/init 3 -user1 stage/sql/Opening tables 7 +user1 stage/sql/Opening tables 8 user1 stage/sql/starting 6 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 10 +user2 stage/sql/closing tables 11 user2 stage/sql/init 3 -user2 stage/sql/Opening tables 6 +user2 stage/sql/Opening tables 7 user2 stage/sql/starting 6 user3 stage/sql/checking permissions 0 user3 stage/sql/closing tables 0 @@ -563,16 +563,16 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/checking permissions 8 -stage/sql/closing tables 21 +stage/sql/closing tables 23 stage/sql/init 6 -stage/sql/Opening tables 13 +stage/sql/Opening tables 15 stage/sql/starting 12 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 8 -stage/sql/closing tables 21 +stage/sql/closing tables 23 stage/sql/init 6 -stage/sql/Opening tables 13 +stage/sql/Opening tables 15 stage/sql/starting 12 execute dump_statements_account; user host event_name count_star @@ -611,17 +611,17 @@ execute dump_transactions_account; user host event_name count_star execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 +user1 transaction 3 +user2 transaction 3 user3 transaction 0 execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 4 +transaction 6 execute dump_transactions_history; event_name count(event_name) -transaction 4 +transaction 6 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -684,35 +684,35 @@ user host event_name count_star execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 11 +user1 stage/sql/closing tables 12 user1 stage/sql/init 3 -user1 stage/sql/Opening tables 7 +user1 stage/sql/Opening tables 8 user1 stage/sql/starting 6 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 10 +user2 stage/sql/closing tables 11 user2 stage/sql/init 3 -user2 stage/sql/Opening tables 6 +user2 stage/sql/Opening tables 7 user2 stage/sql/starting 6 user3 stage/sql/checking permissions 4 -user3 stage/sql/closing tables 10 +user3 stage/sql/closing tables 11 user3 stage/sql/init 3 -user3 stage/sql/Opening tables 6 +user3 stage/sql/Opening tables 7 user3 stage/sql/starting 6 execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star stage/sql/checking permissions 12 -stage/sql/closing tables 31 +stage/sql/closing tables 34 stage/sql/init 9 -stage/sql/Opening tables 19 +stage/sql/Opening tables 22 stage/sql/starting 18 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 12 -stage/sql/closing tables 31 +stage/sql/closing tables 34 stage/sql/init 9 -stage/sql/Opening tables 19 +stage/sql/Opening tables 22 stage/sql/starting 18 execute dump_statements_account; user host event_name count_star @@ -751,17 +751,17 @@ execute dump_transactions_account; user host event_name count_star execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 6 +transaction 9 execute dump_transactions_history; event_name count(event_name) -transaction 6 +transaction 9 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -815,19 +815,19 @@ user host event_name count_star execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 11 +user1 stage/sql/closing tables 12 user1 stage/sql/init 3 -user1 stage/sql/Opening tables 7 +user1 stage/sql/Opening tables 8 user1 stage/sql/starting 6 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 10 +user2 stage/sql/closing tables 11 user2 stage/sql/init 3 -user2 stage/sql/Opening tables 6 +user2 stage/sql/Opening tables 7 user2 stage/sql/starting 6 user3 stage/sql/checking permissions 4 -user3 stage/sql/closing tables 10 +user3 stage/sql/closing tables 11 user3 stage/sql/init 3 -user3 stage/sql/Opening tables 6 +user3 stage/sql/Opening tables 7 user3 stage/sql/starting 6 user4 stage/sql/checking permissions 0 user4 stage/sql/closing tables 0 @@ -839,16 +839,16 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/checking permissions 12 -stage/sql/closing tables 31 +stage/sql/closing tables 34 stage/sql/init 9 -stage/sql/Opening tables 19 +stage/sql/Opening tables 22 stage/sql/starting 18 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 12 -stage/sql/closing tables 31 +stage/sql/closing tables 34 stage/sql/init 9 -stage/sql/Opening tables 19 +stage/sql/Opening tables 22 stage/sql/starting 18 execute dump_statements_account; user host event_name count_star @@ -892,18 +892,18 @@ execute dump_transactions_account; user host event_name count_star execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 user4 transaction 0 execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 6 +transaction 9 execute dump_transactions_history; event_name count(event_name) -transaction 6 +transaction 9 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -970,40 +970,40 @@ user host event_name count_star execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 11 +user1 stage/sql/closing tables 12 user1 stage/sql/init 3 -user1 stage/sql/Opening tables 7 +user1 stage/sql/Opening tables 8 user1 stage/sql/starting 6 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 10 +user2 stage/sql/closing tables 11 user2 stage/sql/init 3 -user2 stage/sql/Opening tables 6 +user2 stage/sql/Opening tables 7 user2 stage/sql/starting 6 user3 stage/sql/checking permissions 4 -user3 stage/sql/closing tables 10 +user3 stage/sql/closing tables 11 user3 stage/sql/init 3 -user3 stage/sql/Opening tables 6 +user3 stage/sql/Opening tables 7 user3 stage/sql/starting 6 user4 stage/sql/checking permissions 4 -user4 stage/sql/closing tables 10 +user4 stage/sql/closing tables 11 user4 stage/sql/init 3 -user4 stage/sql/Opening tables 6 +user4 stage/sql/Opening tables 7 user4 stage/sql/starting 6 execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 24 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 24 execute dump_statements_account; user host event_name count_star @@ -1047,18 +1047,18 @@ execute dump_transactions_account; user host event_name count_star execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 -user4 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 +user4 transaction 3 execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -1112,40 +1112,40 @@ user host event_name count_star execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 11 +user1 stage/sql/closing tables 12 user1 stage/sql/init 3 -user1 stage/sql/Opening tables 7 +user1 stage/sql/Opening tables 8 user1 stage/sql/starting 7 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 10 +user2 stage/sql/closing tables 11 user2 stage/sql/init 3 -user2 stage/sql/Opening tables 6 +user2 stage/sql/Opening tables 7 user2 stage/sql/starting 6 user3 stage/sql/checking permissions 4 -user3 stage/sql/closing tables 10 +user3 stage/sql/closing tables 11 user3 stage/sql/init 3 -user3 stage/sql/Opening tables 6 +user3 stage/sql/Opening tables 7 user3 stage/sql/starting 6 user4 stage/sql/checking permissions 4 -user4 stage/sql/closing tables 10 +user4 stage/sql/closing tables 11 user4 stage/sql/init 3 -user4 stage/sql/Opening tables 6 +user4 stage/sql/Opening tables 7 user4 stage/sql/starting 6 execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 25 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 25 execute dump_statements_account; user host event_name count_star @@ -1190,18 +1190,18 @@ execute dump_transactions_account; user host event_name count_star execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 -user4 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 +user4 transaction 3 execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -1254,40 +1254,40 @@ user host event_name count_star execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 11 +user1 stage/sql/closing tables 12 user1 stage/sql/init 3 -user1 stage/sql/Opening tables 7 +user1 stage/sql/Opening tables 8 user1 stage/sql/starting 7 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 10 +user2 stage/sql/closing tables 11 user2 stage/sql/init 3 -user2 stage/sql/Opening tables 6 +user2 stage/sql/Opening tables 7 user2 stage/sql/starting 7 user3 stage/sql/checking permissions 4 -user3 stage/sql/closing tables 10 +user3 stage/sql/closing tables 11 user3 stage/sql/init 3 -user3 stage/sql/Opening tables 6 +user3 stage/sql/Opening tables 7 user3 stage/sql/starting 6 user4 stage/sql/checking permissions 4 -user4 stage/sql/closing tables 10 +user4 stage/sql/closing tables 11 user4 stage/sql/init 3 -user4 stage/sql/Opening tables 6 +user4 stage/sql/Opening tables 7 user4 stage/sql/starting 6 execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 26 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 26 execute dump_statements_account; user host event_name count_star @@ -1332,18 +1332,18 @@ execute dump_transactions_account; user host event_name count_star execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 -user4 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 +user4 transaction 3 execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -1395,40 +1395,40 @@ user host event_name count_star execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 11 +user1 stage/sql/closing tables 12 user1 stage/sql/init 3 -user1 stage/sql/Opening tables 7 +user1 stage/sql/Opening tables 8 user1 stage/sql/starting 7 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 10 +user2 stage/sql/closing tables 11 user2 stage/sql/init 3 -user2 stage/sql/Opening tables 6 +user2 stage/sql/Opening tables 7 user2 stage/sql/starting 7 user3 stage/sql/checking permissions 4 -user3 stage/sql/closing tables 10 +user3 stage/sql/closing tables 11 user3 stage/sql/init 3 -user3 stage/sql/Opening tables 6 +user3 stage/sql/Opening tables 7 user3 stage/sql/starting 7 user4 stage/sql/checking permissions 4 -user4 stage/sql/closing tables 10 +user4 stage/sql/closing tables 11 user4 stage/sql/init 3 -user4 stage/sql/Opening tables 6 +user4 stage/sql/Opening tables 7 user4 stage/sql/starting 6 execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 27 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 27 execute dump_statements_account; user host event_name count_star @@ -1473,18 +1473,18 @@ execute dump_transactions_account; user host event_name count_star execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 -user4 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 +user4 transaction 3 execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -1535,40 +1535,40 @@ user host event_name count_star execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 11 +user1 stage/sql/closing tables 12 user1 stage/sql/init 3 -user1 stage/sql/Opening tables 7 +user1 stage/sql/Opening tables 8 user1 stage/sql/starting 7 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 10 +user2 stage/sql/closing tables 11 user2 stage/sql/init 3 -user2 stage/sql/Opening tables 6 +user2 stage/sql/Opening tables 7 user2 stage/sql/starting 7 user3 stage/sql/checking permissions 4 -user3 stage/sql/closing tables 10 +user3 stage/sql/closing tables 11 user3 stage/sql/init 3 -user3 stage/sql/Opening tables 6 +user3 stage/sql/Opening tables 7 user3 stage/sql/starting 7 user4 stage/sql/checking permissions 4 -user4 stage/sql/closing tables 10 +user4 stage/sql/closing tables 11 user4 stage/sql/init 3 -user4 stage/sql/Opening tables 6 +user4 stage/sql/Opening tables 7 user4 stage/sql/starting 7 execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -1613,18 +1613,18 @@ execute dump_transactions_account; user host event_name count_star execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 -user4 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 +user4 transaction 3 execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -1676,40 +1676,40 @@ user host event_name count_star execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 11 +user1 stage/sql/closing tables 12 user1 stage/sql/init 3 -user1 stage/sql/Opening tables 7 +user1 stage/sql/Opening tables 8 user1 stage/sql/starting 7 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 10 +user2 stage/sql/closing tables 11 user2 stage/sql/init 3 -user2 stage/sql/Opening tables 6 +user2 stage/sql/Opening tables 7 user2 stage/sql/starting 7 user3 stage/sql/checking permissions 4 -user3 stage/sql/closing tables 10 +user3 stage/sql/closing tables 11 user3 stage/sql/init 3 -user3 stage/sql/Opening tables 6 +user3 stage/sql/Opening tables 7 user3 stage/sql/starting 7 user4 stage/sql/checking permissions 4 -user4 stage/sql/closing tables 10 +user4 stage/sql/closing tables 11 user4 stage/sql/init 3 -user4 stage/sql/Opening tables 6 +user4 stage/sql/Opening tables 7 user4 stage/sql/starting 7 execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -1754,18 +1754,18 @@ execute dump_transactions_account; user host event_name count_star execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 -user4 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 +user4 transaction 3 execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -1816,40 +1816,40 @@ user host event_name count_star execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 11 +user1 stage/sql/closing tables 12 user1 stage/sql/init 3 -user1 stage/sql/Opening tables 7 +user1 stage/sql/Opening tables 8 user1 stage/sql/starting 7 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 10 +user2 stage/sql/closing tables 11 user2 stage/sql/init 3 -user2 stage/sql/Opening tables 6 +user2 stage/sql/Opening tables 7 user2 stage/sql/starting 7 user3 stage/sql/checking permissions 4 -user3 stage/sql/closing tables 10 +user3 stage/sql/closing tables 11 user3 stage/sql/init 3 -user3 stage/sql/Opening tables 6 +user3 stage/sql/Opening tables 7 user3 stage/sql/starting 7 user4 stage/sql/checking permissions 4 -user4 stage/sql/closing tables 10 +user4 stage/sql/closing tables 11 user4 stage/sql/init 3 -user4 stage/sql/Opening tables 6 +user4 stage/sql/Opening tables 7 user4 stage/sql/starting 7 execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -1894,18 +1894,18 @@ execute dump_transactions_account; user host event_name count_star execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 -user4 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 +user4 transaction 3 execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -1956,40 +1956,40 @@ user host event_name count_star execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 11 +user1 stage/sql/closing tables 12 user1 stage/sql/init 3 -user1 stage/sql/Opening tables 7 +user1 stage/sql/Opening tables 8 user1 stage/sql/starting 7 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 10 +user2 stage/sql/closing tables 11 user2 stage/sql/init 3 -user2 stage/sql/Opening tables 6 +user2 stage/sql/Opening tables 7 user2 stage/sql/starting 7 user3 stage/sql/checking permissions 4 -user3 stage/sql/closing tables 10 +user3 stage/sql/closing tables 11 user3 stage/sql/init 3 -user3 stage/sql/Opening tables 6 +user3 stage/sql/Opening tables 7 user3 stage/sql/starting 7 user4 stage/sql/checking permissions 4 -user4 stage/sql/closing tables 10 +user4 stage/sql/closing tables 11 user4 stage/sql/init 3 -user4 stage/sql/Opening tables 6 +user4 stage/sql/Opening tables 7 user4 stage/sql/starting 7 execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -2034,18 +2034,18 @@ execute dump_transactions_account; user host event_name count_star execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 -user4 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 +user4 transaction 3 execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -2096,40 +2096,40 @@ user host event_name count_star execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 11 +user1 stage/sql/closing tables 12 user1 stage/sql/init 3 -user1 stage/sql/Opening tables 7 +user1 stage/sql/Opening tables 8 user1 stage/sql/starting 7 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 10 +user2 stage/sql/closing tables 11 user2 stage/sql/init 3 -user2 stage/sql/Opening tables 6 +user2 stage/sql/Opening tables 7 user2 stage/sql/starting 7 user3 stage/sql/checking permissions 4 -user3 stage/sql/closing tables 10 +user3 stage/sql/closing tables 11 user3 stage/sql/init 3 -user3 stage/sql/Opening tables 6 +user3 stage/sql/Opening tables 7 user3 stage/sql/starting 7 user4 stage/sql/checking permissions 4 -user4 stage/sql/closing tables 10 +user4 stage/sql/closing tables 11 user4 stage/sql/init 3 -user4 stage/sql/Opening tables 6 +user4 stage/sql/Opening tables 7 user4 stage/sql/starting 7 execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -2174,18 +2174,18 @@ execute dump_transactions_account; user host event_name count_star execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 -user4 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 +user4 transaction 3 execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -2236,40 +2236,40 @@ user host event_name count_star execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 11 +user1 stage/sql/closing tables 12 user1 stage/sql/init 3 -user1 stage/sql/Opening tables 7 +user1 stage/sql/Opening tables 8 user1 stage/sql/starting 7 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 10 +user2 stage/sql/closing tables 11 user2 stage/sql/init 3 -user2 stage/sql/Opening tables 6 +user2 stage/sql/Opening tables 7 user2 stage/sql/starting 7 user3 stage/sql/checking permissions 4 -user3 stage/sql/closing tables 10 +user3 stage/sql/closing tables 11 user3 stage/sql/init 3 -user3 stage/sql/Opening tables 6 +user3 stage/sql/Opening tables 7 user3 stage/sql/starting 7 user4 stage/sql/checking permissions 4 -user4 stage/sql/closing tables 10 +user4 stage/sql/closing tables 11 user4 stage/sql/init 3 -user4 stage/sql/Opening tables 6 +user4 stage/sql/Opening tables 7 user4 stage/sql/starting 7 execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -2314,18 +2314,18 @@ execute dump_transactions_account; user host event_name count_star execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 -user4 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 +user4 transaction 3 execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -2376,40 +2376,40 @@ user host event_name count_star execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 11 +user1 stage/sql/closing tables 12 user1 stage/sql/init 3 -user1 stage/sql/Opening tables 7 +user1 stage/sql/Opening tables 8 user1 stage/sql/starting 7 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 10 +user2 stage/sql/closing tables 11 user2 stage/sql/init 3 -user2 stage/sql/Opening tables 6 +user2 stage/sql/Opening tables 7 user2 stage/sql/starting 7 user3 stage/sql/checking permissions 4 -user3 stage/sql/closing tables 10 +user3 stage/sql/closing tables 11 user3 stage/sql/init 3 -user3 stage/sql/Opening tables 6 +user3 stage/sql/Opening tables 7 user3 stage/sql/starting 7 user4 stage/sql/checking permissions 4 -user4 stage/sql/closing tables 10 +user4 stage/sql/closing tables 11 user4 stage/sql/init 3 -user4 stage/sql/Opening tables 6 +user4 stage/sql/Opening tables 7 user4 stage/sql/starting 7 execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -2454,18 +2454,18 @@ execute dump_transactions_account; user host event_name count_star execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 -user4 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 +user4 transaction 3 execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -2516,40 +2516,40 @@ user host event_name count_star execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 11 +user1 stage/sql/closing tables 12 user1 stage/sql/init 3 -user1 stage/sql/Opening tables 7 +user1 stage/sql/Opening tables 8 user1 stage/sql/starting 7 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 10 +user2 stage/sql/closing tables 11 user2 stage/sql/init 3 -user2 stage/sql/Opening tables 6 +user2 stage/sql/Opening tables 7 user2 stage/sql/starting 7 user3 stage/sql/checking permissions 4 -user3 stage/sql/closing tables 10 +user3 stage/sql/closing tables 11 user3 stage/sql/init 3 -user3 stage/sql/Opening tables 6 +user3 stage/sql/Opening tables 7 user3 stage/sql/starting 7 user4 stage/sql/checking permissions 4 -user4 stage/sql/closing tables 10 +user4 stage/sql/closing tables 11 user4 stage/sql/init 3 -user4 stage/sql/Opening tables 6 +user4 stage/sql/Opening tables 7 user4 stage/sql/starting 7 execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -2594,18 +2594,18 @@ execute dump_transactions_account; user host event_name count_star execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 -user4 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 +user4 transaction 3 execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -2680,16 +2680,16 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -2734,18 +2734,18 @@ execute dump_transactions_account; user host event_name count_star execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 -user4 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 +user4 transaction 3 execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -2820,16 +2820,16 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -2874,18 +2874,18 @@ execute dump_transactions_account; user host event_name count_star execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 -user4 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 +user4 transaction 3 execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -2967,9 +2967,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -3014,18 +3014,18 @@ execute dump_transactions_account; user host event_name count_star execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 -user4 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 +user4 transaction 3 execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -3107,9 +3107,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -3154,18 +3154,18 @@ execute dump_transactions_account; user host event_name count_star execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 -user4 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 +user4 transaction 3 execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -3247,9 +3247,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -3294,18 +3294,18 @@ execute dump_transactions_account; user host event_name count_star execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 -user4 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 +user4 transaction 3 execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -3387,9 +3387,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -3434,18 +3434,18 @@ execute dump_transactions_account; user host event_name count_star execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 -user4 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 +user4 transaction 3 execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -3527,9 +3527,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -3574,18 +3574,18 @@ execute dump_transactions_account; user host event_name count_star execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 -user4 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 +user4 transaction 3 execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -3667,9 +3667,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -3714,18 +3714,18 @@ execute dump_transactions_account; user host event_name count_star execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 -user4 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 +user4 transaction 3 execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -3807,9 +3807,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -3854,18 +3854,18 @@ execute dump_transactions_account; user host event_name count_star execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 -user4 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 +user4 transaction 3 execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -3947,9 +3947,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -3994,18 +3994,18 @@ execute dump_transactions_account; user host event_name count_star execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 -user4 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 +user4 transaction 3 execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -4087,9 +4087,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -4142,10 +4142,10 @@ execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -4227,9 +4227,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -4282,10 +4282,10 @@ execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -4367,9 +4367,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -4425,7 +4425,7 @@ event_name count_star transaction 0 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -4507,9 +4507,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -4565,7 +4565,7 @@ event_name count_star transaction 0 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -4619,9 +4619,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -4653,7 +4653,7 @@ event_name count_star transaction 0 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -4703,9 +4703,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -4737,7 +4737,7 @@ event_name count_star transaction 0 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; diff --git a/mysql-test/suite/perfschema/r/event_aggregate_no_a_no_u.result b/mysql-test/suite/perfschema/r/event_aggregate_no_a_no_u.result index fbaa9a8d83f6b..c420f3a7d100f 100644 --- a/mysql-test/suite/perfschema/r/event_aggregate_no_a_no_u.result +++ b/mysql-test/suite/perfschema/r/event_aggregate_no_a_no_u.result @@ -216,23 +216,23 @@ user event_name count_star execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 4 -localhost stage/sql/closing tables 11 +localhost stage/sql/closing tables 12 localhost stage/sql/init 3 -localhost stage/sql/Opening tables 7 +localhost stage/sql/Opening tables 8 localhost stage/sql/starting 6 execute dump_stages_global; event_name count_star stage/sql/checking permissions 4 -stage/sql/closing tables 11 +stage/sql/closing tables 12 stage/sql/init 3 -stage/sql/Opening tables 7 +stage/sql/Opening tables 8 stage/sql/starting 6 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 4 -stage/sql/closing tables 11 +stage/sql/closing tables 12 stage/sql/init 3 -stage/sql/Opening tables 7 +stage/sql/Opening tables 8 stage/sql/starting 6 execute dump_statements_account; user host event_name count_star @@ -263,13 +263,13 @@ execute dump_transactions_user; user event_name count_star execute dump_transactions_host; host event_name count_star -localhost transaction 2 +localhost transaction 3 execute dump_transactions_global; event_name count_star -transaction 2 +transaction 3 execute dump_transactions_history; event_name count(event_name) -transaction 2 +transaction 3 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -314,23 +314,23 @@ user event_name count_star execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 4 -localhost stage/sql/closing tables 11 +localhost stage/sql/closing tables 12 localhost stage/sql/init 3 -localhost stage/sql/Opening tables 7 +localhost stage/sql/Opening tables 8 localhost stage/sql/starting 6 execute dump_stages_global; event_name count_star stage/sql/checking permissions 4 -stage/sql/closing tables 11 +stage/sql/closing tables 12 stage/sql/init 3 -stage/sql/Opening tables 7 +stage/sql/Opening tables 8 stage/sql/starting 6 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 4 -stage/sql/closing tables 11 +stage/sql/closing tables 12 stage/sql/init 3 -stage/sql/Opening tables 7 +stage/sql/Opening tables 8 stage/sql/starting 6 execute dump_statements_account; user host event_name count_star @@ -361,13 +361,13 @@ execute dump_transactions_user; user event_name count_star execute dump_transactions_host; host event_name count_star -localhost transaction 2 +localhost transaction 3 execute dump_transactions_global; event_name count_star -transaction 2 +transaction 3 execute dump_transactions_history; event_name count(event_name) -transaction 2 +transaction 3 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -424,23 +424,23 @@ user event_name count_star execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 8 -localhost stage/sql/closing tables 21 +localhost stage/sql/closing tables 23 localhost stage/sql/init 6 -localhost stage/sql/Opening tables 13 +localhost stage/sql/Opening tables 15 localhost stage/sql/starting 12 execute dump_stages_global; event_name count_star stage/sql/checking permissions 8 -stage/sql/closing tables 21 +stage/sql/closing tables 23 stage/sql/init 6 -stage/sql/Opening tables 13 +stage/sql/Opening tables 15 stage/sql/starting 12 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 8 -stage/sql/closing tables 21 +stage/sql/closing tables 23 stage/sql/init 6 -stage/sql/Opening tables 13 +stage/sql/Opening tables 15 stage/sql/starting 12 execute dump_statements_account; user host event_name count_star @@ -471,13 +471,13 @@ execute dump_transactions_user; user event_name count_star execute dump_transactions_host; host event_name count_star -localhost transaction 4 +localhost transaction 6 execute dump_transactions_global; event_name count_star -transaction 4 +transaction 6 execute dump_transactions_history; event_name count(event_name) -transaction 4 +transaction 6 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -523,23 +523,23 @@ user event_name count_star execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 8 -localhost stage/sql/closing tables 21 +localhost stage/sql/closing tables 23 localhost stage/sql/init 6 -localhost stage/sql/Opening tables 13 +localhost stage/sql/Opening tables 15 localhost stage/sql/starting 12 execute dump_stages_global; event_name count_star stage/sql/checking permissions 8 -stage/sql/closing tables 21 +stage/sql/closing tables 23 stage/sql/init 6 -stage/sql/Opening tables 13 +stage/sql/Opening tables 15 stage/sql/starting 12 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 8 -stage/sql/closing tables 21 +stage/sql/closing tables 23 stage/sql/init 6 -stage/sql/Opening tables 13 +stage/sql/Opening tables 15 stage/sql/starting 12 execute dump_statements_account; user host event_name count_star @@ -570,13 +570,13 @@ execute dump_transactions_user; user event_name count_star execute dump_transactions_host; host event_name count_star -localhost transaction 4 +localhost transaction 6 execute dump_transactions_global; event_name count_star -transaction 4 +transaction 6 execute dump_transactions_history; event_name count(event_name) -transaction 4 +transaction 6 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -634,23 +634,23 @@ user event_name count_star execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 12 -localhost stage/sql/closing tables 31 +localhost stage/sql/closing tables 34 localhost stage/sql/init 9 -localhost stage/sql/Opening tables 19 +localhost stage/sql/Opening tables 22 localhost stage/sql/starting 18 execute dump_stages_global; event_name count_star stage/sql/checking permissions 12 -stage/sql/closing tables 31 +stage/sql/closing tables 34 stage/sql/init 9 -stage/sql/Opening tables 19 +stage/sql/Opening tables 22 stage/sql/starting 18 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 12 -stage/sql/closing tables 31 +stage/sql/closing tables 34 stage/sql/init 9 -stage/sql/Opening tables 19 +stage/sql/Opening tables 22 stage/sql/starting 18 execute dump_statements_account; user host event_name count_star @@ -681,13 +681,13 @@ execute dump_transactions_user; user event_name count_star execute dump_transactions_host; host event_name count_star -localhost transaction 6 +localhost transaction 9 execute dump_transactions_global; event_name count_star -transaction 6 +transaction 9 execute dump_transactions_history; event_name count(event_name) -transaction 6 +transaction 9 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -734,23 +734,23 @@ user event_name count_star execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 12 -localhost stage/sql/closing tables 31 +localhost stage/sql/closing tables 34 localhost stage/sql/init 9 -localhost stage/sql/Opening tables 19 +localhost stage/sql/Opening tables 22 localhost stage/sql/starting 18 execute dump_stages_global; event_name count_star stage/sql/checking permissions 12 -stage/sql/closing tables 31 +stage/sql/closing tables 34 stage/sql/init 9 -stage/sql/Opening tables 19 +stage/sql/Opening tables 22 stage/sql/starting 18 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 12 -stage/sql/closing tables 31 +stage/sql/closing tables 34 stage/sql/init 9 -stage/sql/Opening tables 19 +stage/sql/Opening tables 22 stage/sql/starting 18 execute dump_statements_account; user host event_name count_star @@ -781,13 +781,13 @@ execute dump_transactions_user; user event_name count_star execute dump_transactions_host; host event_name count_star -localhost transaction 6 +localhost transaction 9 execute dump_transactions_global; event_name count_star -transaction 6 +transaction 9 execute dump_transactions_history; event_name count(event_name) -transaction 6 +transaction 9 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -846,23 +846,23 @@ user event_name count_star execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 16 -localhost stage/sql/closing tables 41 +localhost stage/sql/closing tables 45 localhost stage/sql/init 12 -localhost stage/sql/Opening tables 25 +localhost stage/sql/Opening tables 29 localhost stage/sql/starting 24 execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 24 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 24 execute dump_statements_account; user host event_name count_star @@ -893,13 +893,13 @@ execute dump_transactions_user; user event_name count_star execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -945,23 +945,23 @@ user event_name count_star execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 16 -localhost stage/sql/closing tables 41 +localhost stage/sql/closing tables 45 localhost stage/sql/init 12 -localhost stage/sql/Opening tables 25 +localhost stage/sql/Opening tables 29 localhost stage/sql/starting 25 execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 25 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 25 execute dump_statements_account; user host event_name count_star @@ -993,13 +993,13 @@ execute dump_transactions_user; user event_name count_star execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -1044,23 +1044,23 @@ user event_name count_star execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 16 -localhost stage/sql/closing tables 41 +localhost stage/sql/closing tables 45 localhost stage/sql/init 12 -localhost stage/sql/Opening tables 25 +localhost stage/sql/Opening tables 29 localhost stage/sql/starting 26 execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 26 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 26 execute dump_statements_account; user host event_name count_star @@ -1092,13 +1092,13 @@ execute dump_transactions_user; user event_name count_star execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -1142,23 +1142,23 @@ user event_name count_star execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 16 -localhost stage/sql/closing tables 41 +localhost stage/sql/closing tables 45 localhost stage/sql/init 12 -localhost stage/sql/Opening tables 25 +localhost stage/sql/Opening tables 29 localhost stage/sql/starting 27 execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 27 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 27 execute dump_statements_account; user host event_name count_star @@ -1190,13 +1190,13 @@ execute dump_transactions_user; user event_name count_star execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -1239,23 +1239,23 @@ user event_name count_star execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 16 -localhost stage/sql/closing tables 41 +localhost stage/sql/closing tables 45 localhost stage/sql/init 12 -localhost stage/sql/Opening tables 25 +localhost stage/sql/Opening tables 29 localhost stage/sql/starting 28 execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -1287,13 +1287,13 @@ execute dump_transactions_user; user event_name count_star execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -1337,23 +1337,23 @@ user event_name count_star execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 16 -localhost stage/sql/closing tables 41 +localhost stage/sql/closing tables 45 localhost stage/sql/init 12 -localhost stage/sql/Opening tables 25 +localhost stage/sql/Opening tables 29 localhost stage/sql/starting 28 execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -1385,13 +1385,13 @@ execute dump_transactions_user; user event_name count_star execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -1434,23 +1434,23 @@ user event_name count_star execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 16 -localhost stage/sql/closing tables 41 +localhost stage/sql/closing tables 45 localhost stage/sql/init 12 -localhost stage/sql/Opening tables 25 +localhost stage/sql/Opening tables 29 localhost stage/sql/starting 28 execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -1482,13 +1482,13 @@ execute dump_transactions_user; user event_name count_star execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -1531,23 +1531,23 @@ user event_name count_star execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 16 -localhost stage/sql/closing tables 41 +localhost stage/sql/closing tables 45 localhost stage/sql/init 12 -localhost stage/sql/Opening tables 25 +localhost stage/sql/Opening tables 29 localhost stage/sql/starting 28 execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -1579,13 +1579,13 @@ execute dump_transactions_user; user event_name count_star execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -1628,23 +1628,23 @@ user event_name count_star execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 16 -localhost stage/sql/closing tables 41 +localhost stage/sql/closing tables 45 localhost stage/sql/init 12 -localhost stage/sql/Opening tables 25 +localhost stage/sql/Opening tables 29 localhost stage/sql/starting 28 execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -1676,13 +1676,13 @@ execute dump_transactions_user; user event_name count_star execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -1725,23 +1725,23 @@ user event_name count_star execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 16 -localhost stage/sql/closing tables 41 +localhost stage/sql/closing tables 45 localhost stage/sql/init 12 -localhost stage/sql/Opening tables 25 +localhost stage/sql/Opening tables 29 localhost stage/sql/starting 28 execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -1773,13 +1773,13 @@ execute dump_transactions_user; user event_name count_star execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -1822,23 +1822,23 @@ user event_name count_star execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 16 -localhost stage/sql/closing tables 41 +localhost stage/sql/closing tables 45 localhost stage/sql/init 12 -localhost stage/sql/Opening tables 25 +localhost stage/sql/Opening tables 29 localhost stage/sql/starting 28 execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -1870,13 +1870,13 @@ execute dump_transactions_user; user event_name count_star execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -1919,23 +1919,23 @@ user event_name count_star execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 16 -localhost stage/sql/closing tables 41 +localhost stage/sql/closing tables 45 localhost stage/sql/init 12 -localhost stage/sql/Opening tables 25 +localhost stage/sql/Opening tables 29 localhost stage/sql/starting 28 execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -1967,13 +1967,13 @@ execute dump_transactions_user; user event_name count_star execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -2016,23 +2016,23 @@ user event_name count_star execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 16 -localhost stage/sql/closing tables 41 +localhost stage/sql/closing tables 45 localhost stage/sql/init 12 -localhost stage/sql/Opening tables 25 +localhost stage/sql/Opening tables 29 localhost stage/sql/starting 28 execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -2064,13 +2064,13 @@ execute dump_transactions_user; user event_name count_star execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -2120,16 +2120,16 @@ localhost stage/sql/starting 0 execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -2161,13 +2161,13 @@ execute dump_transactions_user; user event_name count_star execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -2224,9 +2224,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -2258,13 +2258,13 @@ execute dump_transactions_user; user event_name count_star execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -2321,9 +2321,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -2355,13 +2355,13 @@ execute dump_transactions_user; user event_name count_star execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -2418,9 +2418,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -2452,13 +2452,13 @@ execute dump_transactions_user; user event_name count_star execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -2515,9 +2515,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -2549,13 +2549,13 @@ execute dump_transactions_user; user event_name count_star execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -2612,9 +2612,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -2646,13 +2646,13 @@ execute dump_transactions_user; user event_name count_star execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -2709,9 +2709,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -2743,13 +2743,13 @@ execute dump_transactions_user; user event_name count_star execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -2806,9 +2806,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -2840,13 +2840,13 @@ execute dump_transactions_user; user event_name count_star execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -2903,9 +2903,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -2937,13 +2937,13 @@ execute dump_transactions_user; user event_name count_star execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -3000,9 +3000,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -3034,13 +3034,13 @@ execute dump_transactions_user; user event_name count_star execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -3097,9 +3097,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -3134,10 +3134,10 @@ host event_name count_star localhost transaction 0 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -3194,9 +3194,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -3234,7 +3234,7 @@ event_name count_star transaction 0 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -3291,9 +3291,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -3331,7 +3331,7 @@ event_name count_star transaction 0 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -3388,9 +3388,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -3428,7 +3428,7 @@ event_name count_star transaction 0 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -3485,9 +3485,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -3525,7 +3525,7 @@ event_name count_star transaction 0 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; diff --git a/mysql-test/suite/perfschema/r/event_aggregate_no_a_no_u_no_h.result b/mysql-test/suite/perfschema/r/event_aggregate_no_a_no_u_no_h.result index af535623e9a3d..f3708c72c1dc0 100644 --- a/mysql-test/suite/perfschema/r/event_aggregate_no_a_no_u_no_h.result +++ b/mysql-test/suite/perfschema/r/event_aggregate_no_a_no_u_no_h.result @@ -188,16 +188,16 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/checking permissions 4 -stage/sql/closing tables 11 +stage/sql/closing tables 12 stage/sql/init 3 -stage/sql/Opening tables 7 +stage/sql/Opening tables 8 stage/sql/starting 6 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 4 -stage/sql/closing tables 11 +stage/sql/closing tables 12 stage/sql/init 3 -stage/sql/Opening tables 7 +stage/sql/Opening tables 8 stage/sql/starting 6 execute dump_statements_account; user host event_name count_star @@ -225,10 +225,10 @@ execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 2 +transaction 3 execute dump_transactions_history; event_name count(event_name) -transaction 2 +transaction 3 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -272,16 +272,16 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/checking permissions 4 -stage/sql/closing tables 11 +stage/sql/closing tables 12 stage/sql/init 3 -stage/sql/Opening tables 7 +stage/sql/Opening tables 8 stage/sql/starting 6 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 4 -stage/sql/closing tables 11 +stage/sql/closing tables 12 stage/sql/init 3 -stage/sql/Opening tables 7 +stage/sql/Opening tables 8 stage/sql/starting 6 execute dump_statements_account; user host event_name count_star @@ -309,10 +309,10 @@ execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 2 +transaction 3 execute dump_transactions_history; event_name count(event_name) -transaction 2 +transaction 3 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -368,16 +368,16 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/checking permissions 8 -stage/sql/closing tables 21 +stage/sql/closing tables 23 stage/sql/init 6 -stage/sql/Opening tables 13 +stage/sql/Opening tables 15 stage/sql/starting 12 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 8 -stage/sql/closing tables 21 +stage/sql/closing tables 23 stage/sql/init 6 -stage/sql/Opening tables 13 +stage/sql/Opening tables 15 stage/sql/starting 12 execute dump_statements_account; user host event_name count_star @@ -405,10 +405,10 @@ execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 4 +transaction 6 execute dump_transactions_history; event_name count(event_name) -transaction 4 +transaction 6 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -453,16 +453,16 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/checking permissions 8 -stage/sql/closing tables 21 +stage/sql/closing tables 23 stage/sql/init 6 -stage/sql/Opening tables 13 +stage/sql/Opening tables 15 stage/sql/starting 12 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 8 -stage/sql/closing tables 21 +stage/sql/closing tables 23 stage/sql/init 6 -stage/sql/Opening tables 13 +stage/sql/Opening tables 15 stage/sql/starting 12 execute dump_statements_account; user host event_name count_star @@ -490,10 +490,10 @@ execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 4 +transaction 6 execute dump_transactions_history; event_name count(event_name) -transaction 4 +transaction 6 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -550,16 +550,16 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/checking permissions 12 -stage/sql/closing tables 31 +stage/sql/closing tables 34 stage/sql/init 9 -stage/sql/Opening tables 19 +stage/sql/Opening tables 22 stage/sql/starting 18 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 12 -stage/sql/closing tables 31 +stage/sql/closing tables 34 stage/sql/init 9 -stage/sql/Opening tables 19 +stage/sql/Opening tables 22 stage/sql/starting 18 execute dump_statements_account; user host event_name count_star @@ -587,10 +587,10 @@ execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 6 +transaction 9 execute dump_transactions_history; event_name count(event_name) -transaction 6 +transaction 9 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -636,16 +636,16 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/checking permissions 12 -stage/sql/closing tables 31 +stage/sql/closing tables 34 stage/sql/init 9 -stage/sql/Opening tables 19 +stage/sql/Opening tables 22 stage/sql/starting 18 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 12 -stage/sql/closing tables 31 +stage/sql/closing tables 34 stage/sql/init 9 -stage/sql/Opening tables 19 +stage/sql/Opening tables 22 stage/sql/starting 18 execute dump_statements_account; user host event_name count_star @@ -673,10 +673,10 @@ execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 6 +transaction 9 execute dump_transactions_history; event_name count(event_name) -transaction 6 +transaction 9 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -734,16 +734,16 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 24 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 24 execute dump_statements_account; user host event_name count_star @@ -771,10 +771,10 @@ execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -819,16 +819,16 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 25 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 25 execute dump_statements_account; user host event_name count_star @@ -857,10 +857,10 @@ execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -904,16 +904,16 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 26 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 26 execute dump_statements_account; user host event_name count_star @@ -942,10 +942,10 @@ execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -988,16 +988,16 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 27 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 27 execute dump_statements_account; user host event_name count_star @@ -1026,10 +1026,10 @@ execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -1071,16 +1071,16 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -1109,10 +1109,10 @@ execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -1155,16 +1155,16 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -1193,10 +1193,10 @@ execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -1238,16 +1238,16 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -1276,10 +1276,10 @@ execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -1321,16 +1321,16 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -1359,10 +1359,10 @@ execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -1404,16 +1404,16 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -1442,10 +1442,10 @@ execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -1487,16 +1487,16 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -1525,10 +1525,10 @@ execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -1570,16 +1570,16 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -1608,10 +1608,10 @@ execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -1653,16 +1653,16 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -1691,10 +1691,10 @@ execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -1736,16 +1736,16 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -1774,10 +1774,10 @@ execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -1819,16 +1819,16 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -1857,10 +1857,10 @@ execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -1909,9 +1909,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -1940,10 +1940,10 @@ execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -1992,9 +1992,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -2023,10 +2023,10 @@ execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -2075,9 +2075,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -2106,10 +2106,10 @@ execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -2158,9 +2158,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -2189,10 +2189,10 @@ execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -2241,9 +2241,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -2272,10 +2272,10 @@ execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -2324,9 +2324,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -2355,10 +2355,10 @@ execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -2407,9 +2407,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -2438,10 +2438,10 @@ execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -2490,9 +2490,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -2521,10 +2521,10 @@ execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -2573,9 +2573,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -2604,10 +2604,10 @@ execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -2656,9 +2656,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -2687,10 +2687,10 @@ execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -2739,9 +2739,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -2773,7 +2773,7 @@ event_name count_star transaction 0 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -2822,9 +2822,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -2856,7 +2856,7 @@ event_name count_star transaction 0 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -2905,9 +2905,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -2939,7 +2939,7 @@ event_name count_star transaction 0 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; @@ -2988,9 +2988,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -3022,7 +3022,7 @@ event_name count_star transaction 0 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_users; diff --git a/mysql-test/suite/perfschema/r/event_aggregate_no_h.result b/mysql-test/suite/perfschema/r/event_aggregate_no_h.result index 1209d37667e58..8ea30a0f8c1d8 100644 --- a/mysql-test/suite/perfschema/r/event_aggregate_no_h.result +++ b/mysql-test/suite/perfschema/r/event_aggregate_no_h.result @@ -218,32 +218,32 @@ wait/synch/rwlock/sql/LOCK_grant 1 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 11 +user1 localhost stage/sql/closing tables 12 user1 localhost stage/sql/init 3 -user1 localhost stage/sql/Opening tables 7 +user1 localhost stage/sql/Opening tables 8 user1 localhost stage/sql/starting 6 execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 11 +user1 stage/sql/closing tables 12 user1 stage/sql/init 3 -user1 stage/sql/Opening tables 7 +user1 stage/sql/Opening tables 8 user1 stage/sql/starting 6 execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star stage/sql/checking permissions 4 -stage/sql/closing tables 11 +stage/sql/closing tables 12 stage/sql/init 3 -stage/sql/Opening tables 7 +stage/sql/Opening tables 8 stage/sql/starting 6 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 4 -stage/sql/closing tables 11 +stage/sql/closing tables 12 stage/sql/init 3 -stage/sql/Opening tables 7 +stage/sql/Opening tables 8 stage/sql/starting 6 execute dump_statements_account; user host event_name count_star @@ -275,18 +275,18 @@ statement/sql/insert 1 statement/sql/select 3 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 +user1 localhost transaction 3 execute dump_transactions_user; user event_name count_star -user1 transaction 2 +user1 transaction 3 execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 2 +transaction 3 execute dump_transactions_history; event_name count(event_name) -transaction 2 +transaction 3 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -336,9 +336,9 @@ wait/synch/rwlock/sql/LOCK_grant 1 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 11 +user1 localhost stage/sql/closing tables 12 user1 localhost stage/sql/init 3 -user1 localhost stage/sql/Opening tables 7 +user1 localhost stage/sql/Opening tables 8 user1 localhost stage/sql/starting 6 user2 localhost stage/sql/checking permissions 0 user2 localhost stage/sql/closing tables 0 @@ -348,9 +348,9 @@ user2 localhost stage/sql/starting 0 execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 11 +user1 stage/sql/closing tables 12 user1 stage/sql/init 3 -user1 stage/sql/Opening tables 7 +user1 stage/sql/Opening tables 8 user1 stage/sql/starting 6 user2 stage/sql/checking permissions 0 user2 stage/sql/closing tables 0 @@ -362,16 +362,16 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/checking permissions 4 -stage/sql/closing tables 11 +stage/sql/closing tables 12 stage/sql/init 3 -stage/sql/Opening tables 7 +stage/sql/Opening tables 8 stage/sql/starting 6 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 4 -stage/sql/closing tables 11 +stage/sql/closing tables 12 stage/sql/init 3 -stage/sql/Opening tables 7 +stage/sql/Opening tables 8 stage/sql/starting 6 execute dump_statements_account; user host event_name count_star @@ -413,20 +413,20 @@ statement/sql/insert 1 statement/sql/select 3 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 +user1 localhost transaction 3 user2 localhost transaction 0 execute dump_transactions_user; user event_name count_star -user1 transaction 2 +user1 transaction 3 user2 transaction 0 execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 2 +transaction 3 execute dump_transactions_history; event_name count(event_name) -transaction 2 +transaction 3 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -490,42 +490,42 @@ wait/synch/rwlock/sql/LOCK_grant 2 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 11 +user1 localhost stage/sql/closing tables 12 user1 localhost stage/sql/init 3 -user1 localhost stage/sql/Opening tables 7 +user1 localhost stage/sql/Opening tables 8 user1 localhost stage/sql/starting 6 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 10 +user2 localhost stage/sql/closing tables 11 user2 localhost stage/sql/init 3 -user2 localhost stage/sql/Opening tables 6 +user2 localhost stage/sql/Opening tables 7 user2 localhost stage/sql/starting 6 execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 11 +user1 stage/sql/closing tables 12 user1 stage/sql/init 3 -user1 stage/sql/Opening tables 7 +user1 stage/sql/Opening tables 8 user1 stage/sql/starting 6 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 10 +user2 stage/sql/closing tables 11 user2 stage/sql/init 3 -user2 stage/sql/Opening tables 6 +user2 stage/sql/Opening tables 7 user2 stage/sql/starting 6 execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star stage/sql/checking permissions 8 -stage/sql/closing tables 21 +stage/sql/closing tables 23 stage/sql/init 6 -stage/sql/Opening tables 13 +stage/sql/Opening tables 15 stage/sql/starting 12 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 8 -stage/sql/closing tables 21 +stage/sql/closing tables 23 stage/sql/init 6 -stage/sql/Opening tables 13 +stage/sql/Opening tables 15 stage/sql/starting 12 execute dump_statements_account; user host event_name count_star @@ -567,20 +567,20 @@ statement/sql/insert 2 statement/sql/select 6 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 +user1 transaction 3 +user2 transaction 3 execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 4 +transaction 6 execute dump_transactions_history; event_name count(event_name) -transaction 4 +transaction 6 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -637,14 +637,14 @@ wait/synch/rwlock/sql/LOCK_grant 2 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 11 +user1 localhost stage/sql/closing tables 12 user1 localhost stage/sql/init 3 -user1 localhost stage/sql/Opening tables 7 +user1 localhost stage/sql/Opening tables 8 user1 localhost stage/sql/starting 6 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 10 +user2 localhost stage/sql/closing tables 11 user2 localhost stage/sql/init 3 -user2 localhost stage/sql/Opening tables 6 +user2 localhost stage/sql/Opening tables 7 user2 localhost stage/sql/starting 6 user3 localhost stage/sql/checking permissions 0 user3 localhost stage/sql/closing tables 0 @@ -654,14 +654,14 @@ user3 localhost stage/sql/starting 0 execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 11 +user1 stage/sql/closing tables 12 user1 stage/sql/init 3 -user1 stage/sql/Opening tables 7 +user1 stage/sql/Opening tables 8 user1 stage/sql/starting 6 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 10 +user2 stage/sql/closing tables 11 user2 stage/sql/init 3 -user2 stage/sql/Opening tables 6 +user2 stage/sql/Opening tables 7 user2 stage/sql/starting 6 user3 stage/sql/checking permissions 0 user3 stage/sql/closing tables 0 @@ -673,16 +673,16 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/checking permissions 8 -stage/sql/closing tables 21 +stage/sql/closing tables 23 stage/sql/init 6 -stage/sql/Opening tables 13 +stage/sql/Opening tables 15 stage/sql/starting 12 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 8 -stage/sql/closing tables 21 +stage/sql/closing tables 23 stage/sql/init 6 -stage/sql/Opening tables 13 +stage/sql/Opening tables 15 stage/sql/starting 12 execute dump_statements_account; user host event_name count_star @@ -734,22 +734,22 @@ statement/sql/insert 2 statement/sql/select 6 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 user3 localhost transaction 0 execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 +user1 transaction 3 +user2 transaction 3 user3 transaction 0 execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 4 +transaction 6 execute dump_transactions_history; event_name count(event_name) -transaction 4 +transaction 6 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -820,52 +820,52 @@ wait/synch/rwlock/sql/LOCK_grant 3 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 11 +user1 localhost stage/sql/closing tables 12 user1 localhost stage/sql/init 3 -user1 localhost stage/sql/Opening tables 7 +user1 localhost stage/sql/Opening tables 8 user1 localhost stage/sql/starting 6 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 10 +user2 localhost stage/sql/closing tables 11 user2 localhost stage/sql/init 3 -user2 localhost stage/sql/Opening tables 6 +user2 localhost stage/sql/Opening tables 7 user2 localhost stage/sql/starting 6 user3 localhost stage/sql/checking permissions 4 -user3 localhost stage/sql/closing tables 10 +user3 localhost stage/sql/closing tables 11 user3 localhost stage/sql/init 3 -user3 localhost stage/sql/Opening tables 6 +user3 localhost stage/sql/Opening tables 7 user3 localhost stage/sql/starting 6 execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 11 +user1 stage/sql/closing tables 12 user1 stage/sql/init 3 -user1 stage/sql/Opening tables 7 +user1 stage/sql/Opening tables 8 user1 stage/sql/starting 6 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 10 +user2 stage/sql/closing tables 11 user2 stage/sql/init 3 -user2 stage/sql/Opening tables 6 +user2 stage/sql/Opening tables 7 user2 stage/sql/starting 6 user3 stage/sql/checking permissions 4 -user3 stage/sql/closing tables 10 +user3 stage/sql/closing tables 11 user3 stage/sql/init 3 -user3 stage/sql/Opening tables 6 +user3 stage/sql/Opening tables 7 user3 stage/sql/starting 6 execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star stage/sql/checking permissions 12 -stage/sql/closing tables 31 +stage/sql/closing tables 34 stage/sql/init 9 -stage/sql/Opening tables 19 +stage/sql/Opening tables 22 stage/sql/starting 18 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 12 -stage/sql/closing tables 31 +stage/sql/closing tables 34 stage/sql/init 9 -stage/sql/Opening tables 19 +stage/sql/Opening tables 22 stage/sql/starting 18 execute dump_statements_account; user host event_name count_star @@ -917,22 +917,22 @@ statement/sql/insert 3 statement/sql/select 9 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 6 +transaction 9 execute dump_transactions_history; event_name count(event_name) -transaction 6 +transaction 9 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -996,19 +996,19 @@ wait/synch/rwlock/sql/LOCK_grant 3 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 11 +user1 localhost stage/sql/closing tables 12 user1 localhost stage/sql/init 3 -user1 localhost stage/sql/Opening tables 7 +user1 localhost stage/sql/Opening tables 8 user1 localhost stage/sql/starting 6 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 10 +user2 localhost stage/sql/closing tables 11 user2 localhost stage/sql/init 3 -user2 localhost stage/sql/Opening tables 6 +user2 localhost stage/sql/Opening tables 7 user2 localhost stage/sql/starting 6 user3 localhost stage/sql/checking permissions 4 -user3 localhost stage/sql/closing tables 10 +user3 localhost stage/sql/closing tables 11 user3 localhost stage/sql/init 3 -user3 localhost stage/sql/Opening tables 6 +user3 localhost stage/sql/Opening tables 7 user3 localhost stage/sql/starting 6 user4 localhost stage/sql/checking permissions 0 user4 localhost stage/sql/closing tables 0 @@ -1018,19 +1018,19 @@ user4 localhost stage/sql/starting 0 execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 11 +user1 stage/sql/closing tables 12 user1 stage/sql/init 3 -user1 stage/sql/Opening tables 7 +user1 stage/sql/Opening tables 8 user1 stage/sql/starting 6 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 10 +user2 stage/sql/closing tables 11 user2 stage/sql/init 3 -user2 stage/sql/Opening tables 6 +user2 stage/sql/Opening tables 7 user2 stage/sql/starting 6 user3 stage/sql/checking permissions 4 -user3 stage/sql/closing tables 10 +user3 stage/sql/closing tables 11 user3 stage/sql/init 3 -user3 stage/sql/Opening tables 6 +user3 stage/sql/Opening tables 7 user3 stage/sql/starting 6 user4 stage/sql/checking permissions 0 user4 stage/sql/closing tables 0 @@ -1042,16 +1042,16 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/checking permissions 12 -stage/sql/closing tables 31 +stage/sql/closing tables 34 stage/sql/init 9 -stage/sql/Opening tables 19 +stage/sql/Opening tables 22 stage/sql/starting 18 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 12 -stage/sql/closing tables 31 +stage/sql/closing tables 34 stage/sql/init 9 -stage/sql/Opening tables 19 +stage/sql/Opening tables 22 stage/sql/starting 18 execute dump_statements_account; user host event_name count_star @@ -1113,24 +1113,24 @@ statement/sql/insert 3 statement/sql/select 9 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 user4 localhost transaction 0 execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 user4 transaction 0 execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 6 +transaction 9 execute dump_transactions_history; event_name count(event_name) -transaction 6 +transaction 9 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -1208,62 +1208,62 @@ wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 11 +user1 localhost stage/sql/closing tables 12 user1 localhost stage/sql/init 3 -user1 localhost stage/sql/Opening tables 7 +user1 localhost stage/sql/Opening tables 8 user1 localhost stage/sql/starting 6 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 10 +user2 localhost stage/sql/closing tables 11 user2 localhost stage/sql/init 3 -user2 localhost stage/sql/Opening tables 6 +user2 localhost stage/sql/Opening tables 7 user2 localhost stage/sql/starting 6 user3 localhost stage/sql/checking permissions 4 -user3 localhost stage/sql/closing tables 10 +user3 localhost stage/sql/closing tables 11 user3 localhost stage/sql/init 3 -user3 localhost stage/sql/Opening tables 6 +user3 localhost stage/sql/Opening tables 7 user3 localhost stage/sql/starting 6 user4 localhost stage/sql/checking permissions 4 -user4 localhost stage/sql/closing tables 10 +user4 localhost stage/sql/closing tables 11 user4 localhost stage/sql/init 3 -user4 localhost stage/sql/Opening tables 6 +user4 localhost stage/sql/Opening tables 7 user4 localhost stage/sql/starting 6 execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 11 +user1 stage/sql/closing tables 12 user1 stage/sql/init 3 -user1 stage/sql/Opening tables 7 +user1 stage/sql/Opening tables 8 user1 stage/sql/starting 6 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 10 +user2 stage/sql/closing tables 11 user2 stage/sql/init 3 -user2 stage/sql/Opening tables 6 +user2 stage/sql/Opening tables 7 user2 stage/sql/starting 6 user3 stage/sql/checking permissions 4 -user3 stage/sql/closing tables 10 +user3 stage/sql/closing tables 11 user3 stage/sql/init 3 -user3 stage/sql/Opening tables 6 +user3 stage/sql/Opening tables 7 user3 stage/sql/starting 6 user4 stage/sql/checking permissions 4 -user4 stage/sql/closing tables 10 +user4 stage/sql/closing tables 11 user4 stage/sql/init 3 -user4 stage/sql/Opening tables 6 +user4 stage/sql/Opening tables 7 user4 stage/sql/starting 6 execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 24 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 24 execute dump_statements_account; user host event_name count_star @@ -1325,24 +1325,24 @@ statement/sql/insert 4 statement/sql/select 12 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 -user4 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 +user4 localhost transaction 3 execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 -user4 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 +user4 transaction 3 execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -1407,62 +1407,62 @@ wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 11 +user1 localhost stage/sql/closing tables 12 user1 localhost stage/sql/init 3 -user1 localhost stage/sql/Opening tables 7 +user1 localhost stage/sql/Opening tables 8 user1 localhost stage/sql/starting 7 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 10 +user2 localhost stage/sql/closing tables 11 user2 localhost stage/sql/init 3 -user2 localhost stage/sql/Opening tables 6 +user2 localhost stage/sql/Opening tables 7 user2 localhost stage/sql/starting 6 user3 localhost stage/sql/checking permissions 4 -user3 localhost stage/sql/closing tables 10 +user3 localhost stage/sql/closing tables 11 user3 localhost stage/sql/init 3 -user3 localhost stage/sql/Opening tables 6 +user3 localhost stage/sql/Opening tables 7 user3 localhost stage/sql/starting 6 user4 localhost stage/sql/checking permissions 4 -user4 localhost stage/sql/closing tables 10 +user4 localhost stage/sql/closing tables 11 user4 localhost stage/sql/init 3 -user4 localhost stage/sql/Opening tables 6 +user4 localhost stage/sql/Opening tables 7 user4 localhost stage/sql/starting 6 execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 11 +user1 stage/sql/closing tables 12 user1 stage/sql/init 3 -user1 stage/sql/Opening tables 7 +user1 stage/sql/Opening tables 8 user1 stage/sql/starting 7 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 10 +user2 stage/sql/closing tables 11 user2 stage/sql/init 3 -user2 stage/sql/Opening tables 6 +user2 stage/sql/Opening tables 7 user2 stage/sql/starting 6 user3 stage/sql/checking permissions 4 -user3 stage/sql/closing tables 10 +user3 stage/sql/closing tables 11 user3 stage/sql/init 3 -user3 stage/sql/Opening tables 6 +user3 stage/sql/Opening tables 7 user3 stage/sql/starting 6 user4 stage/sql/checking permissions 4 -user4 stage/sql/closing tables 10 +user4 stage/sql/closing tables 11 user4 stage/sql/init 3 -user4 stage/sql/Opening tables 6 +user4 stage/sql/Opening tables 7 user4 stage/sql/starting 6 execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 25 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 25 execute dump_statements_account; user host event_name count_star @@ -1525,24 +1525,24 @@ statement/sql/insert 4 statement/sql/select 12 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 -user4 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 +user4 localhost transaction 3 execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 -user4 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 +user4 transaction 3 execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -1606,62 +1606,62 @@ wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 11 +user1 localhost stage/sql/closing tables 12 user1 localhost stage/sql/init 3 -user1 localhost stage/sql/Opening tables 7 +user1 localhost stage/sql/Opening tables 8 user1 localhost stage/sql/starting 7 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 10 +user2 localhost stage/sql/closing tables 11 user2 localhost stage/sql/init 3 -user2 localhost stage/sql/Opening tables 6 +user2 localhost stage/sql/Opening tables 7 user2 localhost stage/sql/starting 7 user3 localhost stage/sql/checking permissions 4 -user3 localhost stage/sql/closing tables 10 +user3 localhost stage/sql/closing tables 11 user3 localhost stage/sql/init 3 -user3 localhost stage/sql/Opening tables 6 +user3 localhost stage/sql/Opening tables 7 user3 localhost stage/sql/starting 6 user4 localhost stage/sql/checking permissions 4 -user4 localhost stage/sql/closing tables 10 +user4 localhost stage/sql/closing tables 11 user4 localhost stage/sql/init 3 -user4 localhost stage/sql/Opening tables 6 +user4 localhost stage/sql/Opening tables 7 user4 localhost stage/sql/starting 6 execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 11 +user1 stage/sql/closing tables 12 user1 stage/sql/init 3 -user1 stage/sql/Opening tables 7 +user1 stage/sql/Opening tables 8 user1 stage/sql/starting 7 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 10 +user2 stage/sql/closing tables 11 user2 stage/sql/init 3 -user2 stage/sql/Opening tables 6 +user2 stage/sql/Opening tables 7 user2 stage/sql/starting 7 user3 stage/sql/checking permissions 4 -user3 stage/sql/closing tables 10 +user3 stage/sql/closing tables 11 user3 stage/sql/init 3 -user3 stage/sql/Opening tables 6 +user3 stage/sql/Opening tables 7 user3 stage/sql/starting 6 user4 stage/sql/checking permissions 4 -user4 stage/sql/closing tables 10 +user4 stage/sql/closing tables 11 user4 stage/sql/init 3 -user4 stage/sql/Opening tables 6 +user4 stage/sql/Opening tables 7 user4 stage/sql/starting 6 execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 26 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 26 execute dump_statements_account; user host event_name count_star @@ -1724,24 +1724,24 @@ statement/sql/insert 4 statement/sql/select 12 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 -user4 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 +user4 localhost transaction 3 execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 -user4 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 +user4 transaction 3 execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -1804,62 +1804,62 @@ wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 11 +user1 localhost stage/sql/closing tables 12 user1 localhost stage/sql/init 3 -user1 localhost stage/sql/Opening tables 7 +user1 localhost stage/sql/Opening tables 8 user1 localhost stage/sql/starting 7 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 10 +user2 localhost stage/sql/closing tables 11 user2 localhost stage/sql/init 3 -user2 localhost stage/sql/Opening tables 6 +user2 localhost stage/sql/Opening tables 7 user2 localhost stage/sql/starting 7 user3 localhost stage/sql/checking permissions 4 -user3 localhost stage/sql/closing tables 10 +user3 localhost stage/sql/closing tables 11 user3 localhost stage/sql/init 3 -user3 localhost stage/sql/Opening tables 6 +user3 localhost stage/sql/Opening tables 7 user3 localhost stage/sql/starting 7 user4 localhost stage/sql/checking permissions 4 -user4 localhost stage/sql/closing tables 10 +user4 localhost stage/sql/closing tables 11 user4 localhost stage/sql/init 3 -user4 localhost stage/sql/Opening tables 6 +user4 localhost stage/sql/Opening tables 7 user4 localhost stage/sql/starting 6 execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 11 +user1 stage/sql/closing tables 12 user1 stage/sql/init 3 -user1 stage/sql/Opening tables 7 +user1 stage/sql/Opening tables 8 user1 stage/sql/starting 7 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 10 +user2 stage/sql/closing tables 11 user2 stage/sql/init 3 -user2 stage/sql/Opening tables 6 +user2 stage/sql/Opening tables 7 user2 stage/sql/starting 7 user3 stage/sql/checking permissions 4 -user3 stage/sql/closing tables 10 +user3 stage/sql/closing tables 11 user3 stage/sql/init 3 -user3 stage/sql/Opening tables 6 +user3 stage/sql/Opening tables 7 user3 stage/sql/starting 7 user4 stage/sql/checking permissions 4 -user4 stage/sql/closing tables 10 +user4 stage/sql/closing tables 11 user4 stage/sql/init 3 -user4 stage/sql/Opening tables 6 +user4 stage/sql/Opening tables 7 user4 stage/sql/starting 6 execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 27 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 27 execute dump_statements_account; user host event_name count_star @@ -1922,24 +1922,24 @@ statement/sql/insert 4 statement/sql/select 12 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 -user4 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 +user4 localhost transaction 3 execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 -user4 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 +user4 transaction 3 execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -2001,62 +2001,62 @@ wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 11 +user1 localhost stage/sql/closing tables 12 user1 localhost stage/sql/init 3 -user1 localhost stage/sql/Opening tables 7 +user1 localhost stage/sql/Opening tables 8 user1 localhost stage/sql/starting 7 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 10 +user2 localhost stage/sql/closing tables 11 user2 localhost stage/sql/init 3 -user2 localhost stage/sql/Opening tables 6 +user2 localhost stage/sql/Opening tables 7 user2 localhost stage/sql/starting 7 user3 localhost stage/sql/checking permissions 4 -user3 localhost stage/sql/closing tables 10 +user3 localhost stage/sql/closing tables 11 user3 localhost stage/sql/init 3 -user3 localhost stage/sql/Opening tables 6 +user3 localhost stage/sql/Opening tables 7 user3 localhost stage/sql/starting 7 user4 localhost stage/sql/checking permissions 4 -user4 localhost stage/sql/closing tables 10 +user4 localhost stage/sql/closing tables 11 user4 localhost stage/sql/init 3 -user4 localhost stage/sql/Opening tables 6 +user4 localhost stage/sql/Opening tables 7 user4 localhost stage/sql/starting 7 execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 11 +user1 stage/sql/closing tables 12 user1 stage/sql/init 3 -user1 stage/sql/Opening tables 7 +user1 stage/sql/Opening tables 8 user1 stage/sql/starting 7 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 10 +user2 stage/sql/closing tables 11 user2 stage/sql/init 3 -user2 stage/sql/Opening tables 6 +user2 stage/sql/Opening tables 7 user2 stage/sql/starting 7 user3 stage/sql/checking permissions 4 -user3 stage/sql/closing tables 10 +user3 stage/sql/closing tables 11 user3 stage/sql/init 3 -user3 stage/sql/Opening tables 6 +user3 stage/sql/Opening tables 7 user3 stage/sql/starting 7 user4 stage/sql/checking permissions 4 -user4 stage/sql/closing tables 10 +user4 stage/sql/closing tables 11 user4 stage/sql/init 3 -user4 stage/sql/Opening tables 6 +user4 stage/sql/Opening tables 7 user4 stage/sql/starting 7 execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -2119,24 +2119,24 @@ statement/sql/insert 4 statement/sql/select 12 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 -user4 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 +user4 localhost transaction 3 execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 -user4 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 +user4 transaction 3 execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -2199,62 +2199,62 @@ wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 11 +user1 localhost stage/sql/closing tables 12 user1 localhost stage/sql/init 3 -user1 localhost stage/sql/Opening tables 7 +user1 localhost stage/sql/Opening tables 8 user1 localhost stage/sql/starting 7 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 10 +user2 localhost stage/sql/closing tables 11 user2 localhost stage/sql/init 3 -user2 localhost stage/sql/Opening tables 6 +user2 localhost stage/sql/Opening tables 7 user2 localhost stage/sql/starting 7 user3 localhost stage/sql/checking permissions 4 -user3 localhost stage/sql/closing tables 10 +user3 localhost stage/sql/closing tables 11 user3 localhost stage/sql/init 3 -user3 localhost stage/sql/Opening tables 6 +user3 localhost stage/sql/Opening tables 7 user3 localhost stage/sql/starting 7 user4 localhost stage/sql/checking permissions 4 -user4 localhost stage/sql/closing tables 10 +user4 localhost stage/sql/closing tables 11 user4 localhost stage/sql/init 3 -user4 localhost stage/sql/Opening tables 6 +user4 localhost stage/sql/Opening tables 7 user4 localhost stage/sql/starting 7 execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 11 +user1 stage/sql/closing tables 12 user1 stage/sql/init 3 -user1 stage/sql/Opening tables 7 +user1 stage/sql/Opening tables 8 user1 stage/sql/starting 7 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 10 +user2 stage/sql/closing tables 11 user2 stage/sql/init 3 -user2 stage/sql/Opening tables 6 +user2 stage/sql/Opening tables 7 user2 stage/sql/starting 7 user3 stage/sql/checking permissions 4 -user3 stage/sql/closing tables 10 +user3 stage/sql/closing tables 11 user3 stage/sql/init 3 -user3 stage/sql/Opening tables 6 +user3 stage/sql/Opening tables 7 user3 stage/sql/starting 7 user4 stage/sql/checking permissions 4 -user4 stage/sql/closing tables 10 +user4 stage/sql/closing tables 11 user4 stage/sql/init 3 -user4 stage/sql/Opening tables 6 +user4 stage/sql/Opening tables 7 user4 stage/sql/starting 7 execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -2317,24 +2317,24 @@ statement/sql/insert 4 statement/sql/select 12 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 -user4 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 +user4 localhost transaction 3 execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 -user4 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 +user4 transaction 3 execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -2396,62 +2396,62 @@ wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 11 +user1 localhost stage/sql/closing tables 12 user1 localhost stage/sql/init 3 -user1 localhost stage/sql/Opening tables 7 +user1 localhost stage/sql/Opening tables 8 user1 localhost stage/sql/starting 7 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 10 +user2 localhost stage/sql/closing tables 11 user2 localhost stage/sql/init 3 -user2 localhost stage/sql/Opening tables 6 +user2 localhost stage/sql/Opening tables 7 user2 localhost stage/sql/starting 7 user3 localhost stage/sql/checking permissions 4 -user3 localhost stage/sql/closing tables 10 +user3 localhost stage/sql/closing tables 11 user3 localhost stage/sql/init 3 -user3 localhost stage/sql/Opening tables 6 +user3 localhost stage/sql/Opening tables 7 user3 localhost stage/sql/starting 7 user4 localhost stage/sql/checking permissions 4 -user4 localhost stage/sql/closing tables 10 +user4 localhost stage/sql/closing tables 11 user4 localhost stage/sql/init 3 -user4 localhost stage/sql/Opening tables 6 +user4 localhost stage/sql/Opening tables 7 user4 localhost stage/sql/starting 7 execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 11 +user1 stage/sql/closing tables 12 user1 stage/sql/init 3 -user1 stage/sql/Opening tables 7 +user1 stage/sql/Opening tables 8 user1 stage/sql/starting 7 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 10 +user2 stage/sql/closing tables 11 user2 stage/sql/init 3 -user2 stage/sql/Opening tables 6 +user2 stage/sql/Opening tables 7 user2 stage/sql/starting 7 user3 stage/sql/checking permissions 4 -user3 stage/sql/closing tables 10 +user3 stage/sql/closing tables 11 user3 stage/sql/init 3 -user3 stage/sql/Opening tables 6 +user3 stage/sql/Opening tables 7 user3 stage/sql/starting 7 user4 stage/sql/checking permissions 4 -user4 stage/sql/closing tables 10 +user4 stage/sql/closing tables 11 user4 stage/sql/init 3 -user4 stage/sql/Opening tables 6 +user4 stage/sql/Opening tables 7 user4 stage/sql/starting 7 execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -2514,24 +2514,24 @@ statement/sql/insert 4 statement/sql/select 12 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 -user4 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 +user4 localhost transaction 3 execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 -user4 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 +user4 transaction 3 execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -2593,62 +2593,62 @@ wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 11 +user1 localhost stage/sql/closing tables 12 user1 localhost stage/sql/init 3 -user1 localhost stage/sql/Opening tables 7 +user1 localhost stage/sql/Opening tables 8 user1 localhost stage/sql/starting 7 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 10 +user2 localhost stage/sql/closing tables 11 user2 localhost stage/sql/init 3 -user2 localhost stage/sql/Opening tables 6 +user2 localhost stage/sql/Opening tables 7 user2 localhost stage/sql/starting 7 user3 localhost stage/sql/checking permissions 4 -user3 localhost stage/sql/closing tables 10 +user3 localhost stage/sql/closing tables 11 user3 localhost stage/sql/init 3 -user3 localhost stage/sql/Opening tables 6 +user3 localhost stage/sql/Opening tables 7 user3 localhost stage/sql/starting 7 user4 localhost stage/sql/checking permissions 4 -user4 localhost stage/sql/closing tables 10 +user4 localhost stage/sql/closing tables 11 user4 localhost stage/sql/init 3 -user4 localhost stage/sql/Opening tables 6 +user4 localhost stage/sql/Opening tables 7 user4 localhost stage/sql/starting 7 execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 11 +user1 stage/sql/closing tables 12 user1 stage/sql/init 3 -user1 stage/sql/Opening tables 7 +user1 stage/sql/Opening tables 8 user1 stage/sql/starting 7 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 10 +user2 stage/sql/closing tables 11 user2 stage/sql/init 3 -user2 stage/sql/Opening tables 6 +user2 stage/sql/Opening tables 7 user2 stage/sql/starting 7 user3 stage/sql/checking permissions 4 -user3 stage/sql/closing tables 10 +user3 stage/sql/closing tables 11 user3 stage/sql/init 3 -user3 stage/sql/Opening tables 6 +user3 stage/sql/Opening tables 7 user3 stage/sql/starting 7 user4 stage/sql/checking permissions 4 -user4 stage/sql/closing tables 10 +user4 stage/sql/closing tables 11 user4 stage/sql/init 3 -user4 stage/sql/Opening tables 6 +user4 stage/sql/Opening tables 7 user4 stage/sql/starting 7 execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -2711,24 +2711,24 @@ statement/sql/insert 4 statement/sql/select 12 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 -user4 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 +user4 localhost transaction 3 execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 -user4 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 +user4 transaction 3 execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -2790,62 +2790,62 @@ wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 11 +user1 localhost stage/sql/closing tables 12 user1 localhost stage/sql/init 3 -user1 localhost stage/sql/Opening tables 7 +user1 localhost stage/sql/Opening tables 8 user1 localhost stage/sql/starting 7 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 10 +user2 localhost stage/sql/closing tables 11 user2 localhost stage/sql/init 3 -user2 localhost stage/sql/Opening tables 6 +user2 localhost stage/sql/Opening tables 7 user2 localhost stage/sql/starting 7 user3 localhost stage/sql/checking permissions 4 -user3 localhost stage/sql/closing tables 10 +user3 localhost stage/sql/closing tables 11 user3 localhost stage/sql/init 3 -user3 localhost stage/sql/Opening tables 6 +user3 localhost stage/sql/Opening tables 7 user3 localhost stage/sql/starting 7 user4 localhost stage/sql/checking permissions 4 -user4 localhost stage/sql/closing tables 10 +user4 localhost stage/sql/closing tables 11 user4 localhost stage/sql/init 3 -user4 localhost stage/sql/Opening tables 6 +user4 localhost stage/sql/Opening tables 7 user4 localhost stage/sql/starting 7 execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 11 +user1 stage/sql/closing tables 12 user1 stage/sql/init 3 -user1 stage/sql/Opening tables 7 +user1 stage/sql/Opening tables 8 user1 stage/sql/starting 7 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 10 +user2 stage/sql/closing tables 11 user2 stage/sql/init 3 -user2 stage/sql/Opening tables 6 +user2 stage/sql/Opening tables 7 user2 stage/sql/starting 7 user3 stage/sql/checking permissions 4 -user3 stage/sql/closing tables 10 +user3 stage/sql/closing tables 11 user3 stage/sql/init 3 -user3 stage/sql/Opening tables 6 +user3 stage/sql/Opening tables 7 user3 stage/sql/starting 7 user4 stage/sql/checking permissions 4 -user4 stage/sql/closing tables 10 +user4 stage/sql/closing tables 11 user4 stage/sql/init 3 -user4 stage/sql/Opening tables 6 +user4 stage/sql/Opening tables 7 user4 stage/sql/starting 7 execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -2908,24 +2908,24 @@ statement/sql/insert 4 statement/sql/select 12 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 -user4 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 +user4 localhost transaction 3 execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 -user4 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 +user4 transaction 3 execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -2987,62 +2987,62 @@ wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 11 +user1 localhost stage/sql/closing tables 12 user1 localhost stage/sql/init 3 -user1 localhost stage/sql/Opening tables 7 +user1 localhost stage/sql/Opening tables 8 user1 localhost stage/sql/starting 7 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 10 +user2 localhost stage/sql/closing tables 11 user2 localhost stage/sql/init 3 -user2 localhost stage/sql/Opening tables 6 +user2 localhost stage/sql/Opening tables 7 user2 localhost stage/sql/starting 7 user3 localhost stage/sql/checking permissions 4 -user3 localhost stage/sql/closing tables 10 +user3 localhost stage/sql/closing tables 11 user3 localhost stage/sql/init 3 -user3 localhost stage/sql/Opening tables 6 +user3 localhost stage/sql/Opening tables 7 user3 localhost stage/sql/starting 7 user4 localhost stage/sql/checking permissions 4 -user4 localhost stage/sql/closing tables 10 +user4 localhost stage/sql/closing tables 11 user4 localhost stage/sql/init 3 -user4 localhost stage/sql/Opening tables 6 +user4 localhost stage/sql/Opening tables 7 user4 localhost stage/sql/starting 7 execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 11 +user1 stage/sql/closing tables 12 user1 stage/sql/init 3 -user1 stage/sql/Opening tables 7 +user1 stage/sql/Opening tables 8 user1 stage/sql/starting 7 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 10 +user2 stage/sql/closing tables 11 user2 stage/sql/init 3 -user2 stage/sql/Opening tables 6 +user2 stage/sql/Opening tables 7 user2 stage/sql/starting 7 user3 stage/sql/checking permissions 4 -user3 stage/sql/closing tables 10 +user3 stage/sql/closing tables 11 user3 stage/sql/init 3 -user3 stage/sql/Opening tables 6 +user3 stage/sql/Opening tables 7 user3 stage/sql/starting 7 user4 stage/sql/checking permissions 4 -user4 stage/sql/closing tables 10 +user4 stage/sql/closing tables 11 user4 stage/sql/init 3 -user4 stage/sql/Opening tables 6 +user4 stage/sql/Opening tables 7 user4 stage/sql/starting 7 execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -3105,24 +3105,24 @@ statement/sql/insert 4 statement/sql/select 12 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 -user4 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 +user4 localhost transaction 3 execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 -user4 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 +user4 transaction 3 execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -3184,62 +3184,62 @@ wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 11 +user1 localhost stage/sql/closing tables 12 user1 localhost stage/sql/init 3 -user1 localhost stage/sql/Opening tables 7 +user1 localhost stage/sql/Opening tables 8 user1 localhost stage/sql/starting 7 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 10 +user2 localhost stage/sql/closing tables 11 user2 localhost stage/sql/init 3 -user2 localhost stage/sql/Opening tables 6 +user2 localhost stage/sql/Opening tables 7 user2 localhost stage/sql/starting 7 user3 localhost stage/sql/checking permissions 4 -user3 localhost stage/sql/closing tables 10 +user3 localhost stage/sql/closing tables 11 user3 localhost stage/sql/init 3 -user3 localhost stage/sql/Opening tables 6 +user3 localhost stage/sql/Opening tables 7 user3 localhost stage/sql/starting 7 user4 localhost stage/sql/checking permissions 4 -user4 localhost stage/sql/closing tables 10 +user4 localhost stage/sql/closing tables 11 user4 localhost stage/sql/init 3 -user4 localhost stage/sql/Opening tables 6 +user4 localhost stage/sql/Opening tables 7 user4 localhost stage/sql/starting 7 execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 11 +user1 stage/sql/closing tables 12 user1 stage/sql/init 3 -user1 stage/sql/Opening tables 7 +user1 stage/sql/Opening tables 8 user1 stage/sql/starting 7 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 10 +user2 stage/sql/closing tables 11 user2 stage/sql/init 3 -user2 stage/sql/Opening tables 6 +user2 stage/sql/Opening tables 7 user2 stage/sql/starting 7 user3 stage/sql/checking permissions 4 -user3 stage/sql/closing tables 10 +user3 stage/sql/closing tables 11 user3 stage/sql/init 3 -user3 stage/sql/Opening tables 6 +user3 stage/sql/Opening tables 7 user3 stage/sql/starting 7 user4 stage/sql/checking permissions 4 -user4 stage/sql/closing tables 10 +user4 stage/sql/closing tables 11 user4 stage/sql/init 3 -user4 stage/sql/Opening tables 6 +user4 stage/sql/Opening tables 7 user4 stage/sql/starting 7 execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -3302,24 +3302,24 @@ statement/sql/insert 4 statement/sql/select 12 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 -user4 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 +user4 localhost transaction 3 execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 -user4 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 +user4 transaction 3 execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -3403,40 +3403,40 @@ user4 localhost stage/sql/starting 0 execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 11 +user1 stage/sql/closing tables 12 user1 stage/sql/init 3 -user1 stage/sql/Opening tables 7 +user1 stage/sql/Opening tables 8 user1 stage/sql/starting 7 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 10 +user2 stage/sql/closing tables 11 user2 stage/sql/init 3 -user2 stage/sql/Opening tables 6 +user2 stage/sql/Opening tables 7 user2 stage/sql/starting 7 user3 stage/sql/checking permissions 4 -user3 stage/sql/closing tables 10 +user3 stage/sql/closing tables 11 user3 stage/sql/init 3 -user3 stage/sql/Opening tables 6 +user3 stage/sql/Opening tables 7 user3 stage/sql/starting 7 user4 stage/sql/checking permissions 4 -user4 stage/sql/closing tables 10 +user4 stage/sql/closing tables 11 user4 stage/sql/init 3 -user4 stage/sql/Opening tables 6 +user4 stage/sql/Opening tables 7 user4 stage/sql/starting 7 execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -3499,24 +3499,24 @@ statement/sql/insert 4 statement/sql/select 12 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 -user4 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 +user4 localhost transaction 3 execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 -user4 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 +user4 transaction 3 execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -3624,16 +3624,16 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -3696,24 +3696,24 @@ statement/sql/insert 4 statement/sql/select 12 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 -user4 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 +user4 localhost transaction 3 execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 -user4 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 +user4 transaction 3 execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -3821,16 +3821,16 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -3893,24 +3893,24 @@ statement/sql/insert 4 statement/sql/select 12 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 -user4 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 +user4 localhost transaction 3 execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 -user4 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 +user4 transaction 3 execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -4025,9 +4025,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -4090,24 +4090,24 @@ statement/sql/insert 4 statement/sql/select 12 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 -user4 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 +user4 localhost transaction 3 execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 -user4 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 +user4 transaction 3 execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -4222,9 +4222,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -4287,24 +4287,24 @@ statement/sql/insert 4 statement/sql/select 12 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 -user4 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 +user4 localhost transaction 3 execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 -user4 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 +user4 transaction 3 execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -4419,9 +4419,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -4484,24 +4484,24 @@ statement/sql/insert 4 statement/sql/select 12 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 -user4 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 +user4 localhost transaction 3 execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 -user4 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 +user4 transaction 3 execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -4616,9 +4616,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -4681,24 +4681,24 @@ statement/sql/insert 4 statement/sql/select 12 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 -user4 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 +user4 localhost transaction 3 execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 -user4 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 +user4 transaction 3 execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -4813,9 +4813,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -4878,24 +4878,24 @@ statement/sql/insert 4 statement/sql/select 12 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 -user4 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 +user4 localhost transaction 3 execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 -user4 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 +user4 transaction 3 execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -5010,9 +5010,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -5075,24 +5075,24 @@ statement/sql/insert 4 statement/sql/select 12 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 -user4 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 +user4 localhost transaction 3 execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 -user4 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 +user4 transaction 3 execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -5207,9 +5207,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -5272,24 +5272,24 @@ statement/sql/insert 4 statement/sql/select 12 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 -user4 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 +user4 localhost transaction 3 execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 -user4 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 +user4 transaction 3 execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -5404,9 +5404,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -5475,18 +5475,18 @@ user3 localhost transaction 0 user4 localhost transaction 0 execute dump_transactions_user; user event_name count_star -user1 transaction 2 -user2 transaction 2 -user3 transaction 2 -user4 transaction 2 +user1 transaction 3 +user2 transaction 3 +user3 transaction 3 +user4 transaction 3 execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -5601,9 +5601,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -5680,10 +5680,10 @@ execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -5798,9 +5798,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -5877,10 +5877,10 @@ execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -5995,9 +5995,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -6077,7 +6077,7 @@ event_name count_star transaction 0 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -6164,9 +6164,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -6222,7 +6222,7 @@ event_name count_star transaction 0 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -6277,9 +6277,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -6311,7 +6311,7 @@ event_name count_star transaction 0 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -6362,9 +6362,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -6396,7 +6396,7 @@ event_name count_star transaction 0 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 diff --git a/mysql-test/suite/perfschema/r/event_aggregate_no_u.result b/mysql-test/suite/perfschema/r/event_aggregate_no_u.result index 39da9783c9697..0b41bb81cb31b 100644 --- a/mysql-test/suite/perfschema/r/event_aggregate_no_u.result +++ b/mysql-test/suite/perfschema/r/event_aggregate_no_u.result @@ -230,32 +230,32 @@ wait/synch/rwlock/sql/LOCK_grant 1 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 11 +user1 localhost stage/sql/closing tables 12 user1 localhost stage/sql/init 3 -user1 localhost stage/sql/Opening tables 7 +user1 localhost stage/sql/Opening tables 8 user1 localhost stage/sql/starting 6 execute dump_stages_user; user event_name count_star execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 4 -localhost stage/sql/closing tables 11 +localhost stage/sql/closing tables 12 localhost stage/sql/init 3 -localhost stage/sql/Opening tables 7 +localhost stage/sql/Opening tables 8 localhost stage/sql/starting 6 execute dump_stages_global; event_name count_star stage/sql/checking permissions 4 -stage/sql/closing tables 11 +stage/sql/closing tables 12 stage/sql/init 3 -stage/sql/Opening tables 7 +stage/sql/Opening tables 8 stage/sql/starting 6 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 4 -stage/sql/closing tables 11 +stage/sql/closing tables 12 stage/sql/init 3 -stage/sql/Opening tables 7 +stage/sql/Opening tables 8 stage/sql/starting 6 execute dump_statements_account; user host event_name count_star @@ -287,18 +287,18 @@ statement/sql/insert 1 statement/sql/select 3 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 +user1 localhost transaction 3 execute dump_transactions_user; user event_name count_star execute dump_transactions_host; host event_name count_star -localhost transaction 2 +localhost transaction 3 execute dump_transactions_global; event_name count_star -transaction 2 +transaction 3 execute dump_transactions_history; event_name count(event_name) -transaction 2 +transaction 3 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -345,9 +345,9 @@ wait/synch/rwlock/sql/LOCK_grant 1 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 11 +user1 localhost stage/sql/closing tables 12 user1 localhost stage/sql/init 3 -user1 localhost stage/sql/Opening tables 7 +user1 localhost stage/sql/Opening tables 8 user1 localhost stage/sql/starting 6 user2 localhost stage/sql/checking permissions 0 user2 localhost stage/sql/closing tables 0 @@ -359,23 +359,23 @@ user event_name count_star execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 4 -localhost stage/sql/closing tables 11 +localhost stage/sql/closing tables 12 localhost stage/sql/init 3 -localhost stage/sql/Opening tables 7 +localhost stage/sql/Opening tables 8 localhost stage/sql/starting 6 execute dump_stages_global; event_name count_star stage/sql/checking permissions 4 -stage/sql/closing tables 11 +stage/sql/closing tables 12 stage/sql/init 3 -stage/sql/Opening tables 7 +stage/sql/Opening tables 8 stage/sql/starting 6 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 4 -stage/sql/closing tables 11 +stage/sql/closing tables 12 stage/sql/init 3 -stage/sql/Opening tables 7 +stage/sql/Opening tables 8 stage/sql/starting 6 execute dump_statements_account; user host event_name count_star @@ -412,19 +412,19 @@ statement/sql/insert 1 statement/sql/select 3 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 +user1 localhost transaction 3 user2 localhost transaction 0 execute dump_transactions_user; user event_name count_star execute dump_transactions_host; host event_name count_star -localhost transaction 2 +localhost transaction 3 execute dump_transactions_global; event_name count_star -transaction 2 +transaction 3 execute dump_transactions_history; event_name count(event_name) -transaction 2 +transaction 3 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -484,37 +484,37 @@ wait/synch/rwlock/sql/LOCK_grant 2 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 11 +user1 localhost stage/sql/closing tables 12 user1 localhost stage/sql/init 3 -user1 localhost stage/sql/Opening tables 7 +user1 localhost stage/sql/Opening tables 8 user1 localhost stage/sql/starting 6 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 10 +user2 localhost stage/sql/closing tables 11 user2 localhost stage/sql/init 3 -user2 localhost stage/sql/Opening tables 6 +user2 localhost stage/sql/Opening tables 7 user2 localhost stage/sql/starting 6 execute dump_stages_user; user event_name count_star execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 8 -localhost stage/sql/closing tables 21 +localhost stage/sql/closing tables 23 localhost stage/sql/init 6 -localhost stage/sql/Opening tables 13 +localhost stage/sql/Opening tables 15 localhost stage/sql/starting 12 execute dump_stages_global; event_name count_star stage/sql/checking permissions 8 -stage/sql/closing tables 21 +stage/sql/closing tables 23 stage/sql/init 6 -stage/sql/Opening tables 13 +stage/sql/Opening tables 15 stage/sql/starting 12 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 8 -stage/sql/closing tables 21 +stage/sql/closing tables 23 stage/sql/init 6 -stage/sql/Opening tables 13 +stage/sql/Opening tables 15 stage/sql/starting 12 execute dump_statements_account; user host event_name count_star @@ -551,19 +551,19 @@ statement/sql/insert 2 statement/sql/select 6 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 execute dump_transactions_user; user event_name count_star execute dump_transactions_host; host event_name count_star -localhost transaction 4 +localhost transaction 6 execute dump_transactions_global; event_name count_star -transaction 4 +transaction 6 execute dump_transactions_history; event_name count(event_name) -transaction 4 +transaction 6 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -614,14 +614,14 @@ wait/synch/rwlock/sql/LOCK_grant 2 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 11 +user1 localhost stage/sql/closing tables 12 user1 localhost stage/sql/init 3 -user1 localhost stage/sql/Opening tables 7 +user1 localhost stage/sql/Opening tables 8 user1 localhost stage/sql/starting 6 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 10 +user2 localhost stage/sql/closing tables 11 user2 localhost stage/sql/init 3 -user2 localhost stage/sql/Opening tables 6 +user2 localhost stage/sql/Opening tables 7 user2 localhost stage/sql/starting 6 user3 localhost stage/sql/checking permissions 0 user3 localhost stage/sql/closing tables 0 @@ -633,23 +633,23 @@ user event_name count_star execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 8 -localhost stage/sql/closing tables 21 +localhost stage/sql/closing tables 23 localhost stage/sql/init 6 -localhost stage/sql/Opening tables 13 +localhost stage/sql/Opening tables 15 localhost stage/sql/starting 12 execute dump_stages_global; event_name count_star stage/sql/checking permissions 8 -stage/sql/closing tables 21 +stage/sql/closing tables 23 stage/sql/init 6 -stage/sql/Opening tables 13 +stage/sql/Opening tables 15 stage/sql/starting 12 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 8 -stage/sql/closing tables 21 +stage/sql/closing tables 23 stage/sql/init 6 -stage/sql/Opening tables 13 +stage/sql/Opening tables 15 stage/sql/starting 12 execute dump_statements_account; user host event_name count_star @@ -691,20 +691,20 @@ statement/sql/insert 2 statement/sql/select 6 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 user3 localhost transaction 0 execute dump_transactions_user; user event_name count_star execute dump_transactions_host; host event_name count_star -localhost transaction 4 +localhost transaction 6 execute dump_transactions_global; event_name count_star -transaction 4 +transaction 6 execute dump_transactions_history; event_name count(event_name) -transaction 4 +transaction 6 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -768,42 +768,42 @@ wait/synch/rwlock/sql/LOCK_grant 3 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 11 +user1 localhost stage/sql/closing tables 12 user1 localhost stage/sql/init 3 -user1 localhost stage/sql/Opening tables 7 +user1 localhost stage/sql/Opening tables 8 user1 localhost stage/sql/starting 6 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 10 +user2 localhost stage/sql/closing tables 11 user2 localhost stage/sql/init 3 -user2 localhost stage/sql/Opening tables 6 +user2 localhost stage/sql/Opening tables 7 user2 localhost stage/sql/starting 6 user3 localhost stage/sql/checking permissions 4 -user3 localhost stage/sql/closing tables 10 +user3 localhost stage/sql/closing tables 11 user3 localhost stage/sql/init 3 -user3 localhost stage/sql/Opening tables 6 +user3 localhost stage/sql/Opening tables 7 user3 localhost stage/sql/starting 6 execute dump_stages_user; user event_name count_star execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 12 -localhost stage/sql/closing tables 31 +localhost stage/sql/closing tables 34 localhost stage/sql/init 9 -localhost stage/sql/Opening tables 19 +localhost stage/sql/Opening tables 22 localhost stage/sql/starting 18 execute dump_stages_global; event_name count_star stage/sql/checking permissions 12 -stage/sql/closing tables 31 +stage/sql/closing tables 34 stage/sql/init 9 -stage/sql/Opening tables 19 +stage/sql/Opening tables 22 stage/sql/starting 18 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 12 -stage/sql/closing tables 31 +stage/sql/closing tables 34 stage/sql/init 9 -stage/sql/Opening tables 19 +stage/sql/Opening tables 22 stage/sql/starting 18 execute dump_statements_account; user host event_name count_star @@ -845,20 +845,20 @@ statement/sql/insert 3 statement/sql/select 9 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 execute dump_transactions_user; user event_name count_star execute dump_transactions_host; host event_name count_star -localhost transaction 6 +localhost transaction 9 execute dump_transactions_global; event_name count_star -transaction 6 +transaction 9 execute dump_transactions_history; event_name count(event_name) -transaction 6 +transaction 9 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -913,19 +913,19 @@ wait/synch/rwlock/sql/LOCK_grant 3 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 11 +user1 localhost stage/sql/closing tables 12 user1 localhost stage/sql/init 3 -user1 localhost stage/sql/Opening tables 7 +user1 localhost stage/sql/Opening tables 8 user1 localhost stage/sql/starting 6 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 10 +user2 localhost stage/sql/closing tables 11 user2 localhost stage/sql/init 3 -user2 localhost stage/sql/Opening tables 6 +user2 localhost stage/sql/Opening tables 7 user2 localhost stage/sql/starting 6 user3 localhost stage/sql/checking permissions 4 -user3 localhost stage/sql/closing tables 10 +user3 localhost stage/sql/closing tables 11 user3 localhost stage/sql/init 3 -user3 localhost stage/sql/Opening tables 6 +user3 localhost stage/sql/Opening tables 7 user3 localhost stage/sql/starting 6 user4 localhost stage/sql/checking permissions 0 user4 localhost stage/sql/closing tables 0 @@ -937,23 +937,23 @@ user event_name count_star execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 12 -localhost stage/sql/closing tables 31 +localhost stage/sql/closing tables 34 localhost stage/sql/init 9 -localhost stage/sql/Opening tables 19 +localhost stage/sql/Opening tables 22 localhost stage/sql/starting 18 execute dump_stages_global; event_name count_star stage/sql/checking permissions 12 -stage/sql/closing tables 31 +stage/sql/closing tables 34 stage/sql/init 9 -stage/sql/Opening tables 19 +stage/sql/Opening tables 22 stage/sql/starting 18 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 12 -stage/sql/closing tables 31 +stage/sql/closing tables 34 stage/sql/init 9 -stage/sql/Opening tables 19 +stage/sql/Opening tables 22 stage/sql/starting 18 execute dump_statements_account; user host event_name count_star @@ -1000,21 +1000,21 @@ statement/sql/insert 3 statement/sql/select 9 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 user4 localhost transaction 0 execute dump_transactions_user; user event_name count_star execute dump_transactions_host; host event_name count_star -localhost transaction 6 +localhost transaction 9 execute dump_transactions_global; event_name count_star -transaction 6 +transaction 9 execute dump_transactions_history; event_name count(event_name) -transaction 6 +transaction 9 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -1082,47 +1082,47 @@ wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 11 +user1 localhost stage/sql/closing tables 12 user1 localhost stage/sql/init 3 -user1 localhost stage/sql/Opening tables 7 +user1 localhost stage/sql/Opening tables 8 user1 localhost stage/sql/starting 6 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 10 +user2 localhost stage/sql/closing tables 11 user2 localhost stage/sql/init 3 -user2 localhost stage/sql/Opening tables 6 +user2 localhost stage/sql/Opening tables 7 user2 localhost stage/sql/starting 6 user3 localhost stage/sql/checking permissions 4 -user3 localhost stage/sql/closing tables 10 +user3 localhost stage/sql/closing tables 11 user3 localhost stage/sql/init 3 -user3 localhost stage/sql/Opening tables 6 +user3 localhost stage/sql/Opening tables 7 user3 localhost stage/sql/starting 6 user4 localhost stage/sql/checking permissions 4 -user4 localhost stage/sql/closing tables 10 +user4 localhost stage/sql/closing tables 11 user4 localhost stage/sql/init 3 -user4 localhost stage/sql/Opening tables 6 +user4 localhost stage/sql/Opening tables 7 user4 localhost stage/sql/starting 6 execute dump_stages_user; user event_name count_star execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 16 -localhost stage/sql/closing tables 41 +localhost stage/sql/closing tables 45 localhost stage/sql/init 12 -localhost stage/sql/Opening tables 25 +localhost stage/sql/Opening tables 29 localhost stage/sql/starting 24 execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 24 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 24 execute dump_statements_account; user host event_name count_star @@ -1169,21 +1169,21 @@ statement/sql/insert 4 statement/sql/select 12 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 -user4 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 +user4 localhost transaction 3 execute dump_transactions_user; user event_name count_star execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -1238,47 +1238,47 @@ wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 11 +user1 localhost stage/sql/closing tables 12 user1 localhost stage/sql/init 3 -user1 localhost stage/sql/Opening tables 7 +user1 localhost stage/sql/Opening tables 8 user1 localhost stage/sql/starting 7 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 10 +user2 localhost stage/sql/closing tables 11 user2 localhost stage/sql/init 3 -user2 localhost stage/sql/Opening tables 6 +user2 localhost stage/sql/Opening tables 7 user2 localhost stage/sql/starting 6 user3 localhost stage/sql/checking permissions 4 -user3 localhost stage/sql/closing tables 10 +user3 localhost stage/sql/closing tables 11 user3 localhost stage/sql/init 3 -user3 localhost stage/sql/Opening tables 6 +user3 localhost stage/sql/Opening tables 7 user3 localhost stage/sql/starting 6 user4 localhost stage/sql/checking permissions 4 -user4 localhost stage/sql/closing tables 10 +user4 localhost stage/sql/closing tables 11 user4 localhost stage/sql/init 3 -user4 localhost stage/sql/Opening tables 6 +user4 localhost stage/sql/Opening tables 7 user4 localhost stage/sql/starting 6 execute dump_stages_user; user event_name count_star execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 16 -localhost stage/sql/closing tables 41 +localhost stage/sql/closing tables 45 localhost stage/sql/init 12 -localhost stage/sql/Opening tables 25 +localhost stage/sql/Opening tables 29 localhost stage/sql/starting 25 execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 25 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 25 execute dump_statements_account; user host event_name count_star @@ -1326,21 +1326,21 @@ statement/sql/insert 4 statement/sql/select 12 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 -user4 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 +user4 localhost transaction 3 execute dump_transactions_user; user event_name count_star execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -1394,47 +1394,47 @@ wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 11 +user1 localhost stage/sql/closing tables 12 user1 localhost stage/sql/init 3 -user1 localhost stage/sql/Opening tables 7 +user1 localhost stage/sql/Opening tables 8 user1 localhost stage/sql/starting 7 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 10 +user2 localhost stage/sql/closing tables 11 user2 localhost stage/sql/init 3 -user2 localhost stage/sql/Opening tables 6 +user2 localhost stage/sql/Opening tables 7 user2 localhost stage/sql/starting 7 user3 localhost stage/sql/checking permissions 4 -user3 localhost stage/sql/closing tables 10 +user3 localhost stage/sql/closing tables 11 user3 localhost stage/sql/init 3 -user3 localhost stage/sql/Opening tables 6 +user3 localhost stage/sql/Opening tables 7 user3 localhost stage/sql/starting 6 user4 localhost stage/sql/checking permissions 4 -user4 localhost stage/sql/closing tables 10 +user4 localhost stage/sql/closing tables 11 user4 localhost stage/sql/init 3 -user4 localhost stage/sql/Opening tables 6 +user4 localhost stage/sql/Opening tables 7 user4 localhost stage/sql/starting 6 execute dump_stages_user; user event_name count_star execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 16 -localhost stage/sql/closing tables 41 +localhost stage/sql/closing tables 45 localhost stage/sql/init 12 -localhost stage/sql/Opening tables 25 +localhost stage/sql/Opening tables 29 localhost stage/sql/starting 26 execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 26 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 26 execute dump_statements_account; user host event_name count_star @@ -1482,21 +1482,21 @@ statement/sql/insert 4 statement/sql/select 12 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 -user4 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 +user4 localhost transaction 3 execute dump_transactions_user; user event_name count_star execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -1549,47 +1549,47 @@ wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 11 +user1 localhost stage/sql/closing tables 12 user1 localhost stage/sql/init 3 -user1 localhost stage/sql/Opening tables 7 +user1 localhost stage/sql/Opening tables 8 user1 localhost stage/sql/starting 7 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 10 +user2 localhost stage/sql/closing tables 11 user2 localhost stage/sql/init 3 -user2 localhost stage/sql/Opening tables 6 +user2 localhost stage/sql/Opening tables 7 user2 localhost stage/sql/starting 7 user3 localhost stage/sql/checking permissions 4 -user3 localhost stage/sql/closing tables 10 +user3 localhost stage/sql/closing tables 11 user3 localhost stage/sql/init 3 -user3 localhost stage/sql/Opening tables 6 +user3 localhost stage/sql/Opening tables 7 user3 localhost stage/sql/starting 7 user4 localhost stage/sql/checking permissions 4 -user4 localhost stage/sql/closing tables 10 +user4 localhost stage/sql/closing tables 11 user4 localhost stage/sql/init 3 -user4 localhost stage/sql/Opening tables 6 +user4 localhost stage/sql/Opening tables 7 user4 localhost stage/sql/starting 6 execute dump_stages_user; user event_name count_star execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 16 -localhost stage/sql/closing tables 41 +localhost stage/sql/closing tables 45 localhost stage/sql/init 12 -localhost stage/sql/Opening tables 25 +localhost stage/sql/Opening tables 29 localhost stage/sql/starting 27 execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 27 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 27 execute dump_statements_account; user host event_name count_star @@ -1637,21 +1637,21 @@ statement/sql/insert 4 statement/sql/select 12 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 -user4 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 +user4 localhost transaction 3 execute dump_transactions_user; user event_name count_star execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -1703,47 +1703,47 @@ wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 11 +user1 localhost stage/sql/closing tables 12 user1 localhost stage/sql/init 3 -user1 localhost stage/sql/Opening tables 7 +user1 localhost stage/sql/Opening tables 8 user1 localhost stage/sql/starting 7 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 10 +user2 localhost stage/sql/closing tables 11 user2 localhost stage/sql/init 3 -user2 localhost stage/sql/Opening tables 6 +user2 localhost stage/sql/Opening tables 7 user2 localhost stage/sql/starting 7 user3 localhost stage/sql/checking permissions 4 -user3 localhost stage/sql/closing tables 10 +user3 localhost stage/sql/closing tables 11 user3 localhost stage/sql/init 3 -user3 localhost stage/sql/Opening tables 6 +user3 localhost stage/sql/Opening tables 7 user3 localhost stage/sql/starting 7 user4 localhost stage/sql/checking permissions 4 -user4 localhost stage/sql/closing tables 10 +user4 localhost stage/sql/closing tables 11 user4 localhost stage/sql/init 3 -user4 localhost stage/sql/Opening tables 6 +user4 localhost stage/sql/Opening tables 7 user4 localhost stage/sql/starting 7 execute dump_stages_user; user event_name count_star execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 16 -localhost stage/sql/closing tables 41 +localhost stage/sql/closing tables 45 localhost stage/sql/init 12 -localhost stage/sql/Opening tables 25 +localhost stage/sql/Opening tables 29 localhost stage/sql/starting 28 execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -1791,21 +1791,21 @@ statement/sql/insert 4 statement/sql/select 12 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 -user4 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 +user4 localhost transaction 3 execute dump_transactions_user; user event_name count_star execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -1858,47 +1858,47 @@ wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 11 +user1 localhost stage/sql/closing tables 12 user1 localhost stage/sql/init 3 -user1 localhost stage/sql/Opening tables 7 +user1 localhost stage/sql/Opening tables 8 user1 localhost stage/sql/starting 7 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 10 +user2 localhost stage/sql/closing tables 11 user2 localhost stage/sql/init 3 -user2 localhost stage/sql/Opening tables 6 +user2 localhost stage/sql/Opening tables 7 user2 localhost stage/sql/starting 7 user3 localhost stage/sql/checking permissions 4 -user3 localhost stage/sql/closing tables 10 +user3 localhost stage/sql/closing tables 11 user3 localhost stage/sql/init 3 -user3 localhost stage/sql/Opening tables 6 +user3 localhost stage/sql/Opening tables 7 user3 localhost stage/sql/starting 7 user4 localhost stage/sql/checking permissions 4 -user4 localhost stage/sql/closing tables 10 +user4 localhost stage/sql/closing tables 11 user4 localhost stage/sql/init 3 -user4 localhost stage/sql/Opening tables 6 +user4 localhost stage/sql/Opening tables 7 user4 localhost stage/sql/starting 7 execute dump_stages_user; user event_name count_star execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 16 -localhost stage/sql/closing tables 41 +localhost stage/sql/closing tables 45 localhost stage/sql/init 12 -localhost stage/sql/Opening tables 25 +localhost stage/sql/Opening tables 29 localhost stage/sql/starting 28 execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -1946,21 +1946,21 @@ statement/sql/insert 4 statement/sql/select 12 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 -user4 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 +user4 localhost transaction 3 execute dump_transactions_user; user event_name count_star execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -2012,47 +2012,47 @@ wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 11 +user1 localhost stage/sql/closing tables 12 user1 localhost stage/sql/init 3 -user1 localhost stage/sql/Opening tables 7 +user1 localhost stage/sql/Opening tables 8 user1 localhost stage/sql/starting 7 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 10 +user2 localhost stage/sql/closing tables 11 user2 localhost stage/sql/init 3 -user2 localhost stage/sql/Opening tables 6 +user2 localhost stage/sql/Opening tables 7 user2 localhost stage/sql/starting 7 user3 localhost stage/sql/checking permissions 4 -user3 localhost stage/sql/closing tables 10 +user3 localhost stage/sql/closing tables 11 user3 localhost stage/sql/init 3 -user3 localhost stage/sql/Opening tables 6 +user3 localhost stage/sql/Opening tables 7 user3 localhost stage/sql/starting 7 user4 localhost stage/sql/checking permissions 4 -user4 localhost stage/sql/closing tables 10 +user4 localhost stage/sql/closing tables 11 user4 localhost stage/sql/init 3 -user4 localhost stage/sql/Opening tables 6 +user4 localhost stage/sql/Opening tables 7 user4 localhost stage/sql/starting 7 execute dump_stages_user; user event_name count_star execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 16 -localhost stage/sql/closing tables 41 +localhost stage/sql/closing tables 45 localhost stage/sql/init 12 -localhost stage/sql/Opening tables 25 +localhost stage/sql/Opening tables 29 localhost stage/sql/starting 28 execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -2100,21 +2100,21 @@ statement/sql/insert 4 statement/sql/select 12 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 -user4 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 +user4 localhost transaction 3 execute dump_transactions_user; user event_name count_star execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -2166,47 +2166,47 @@ wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 11 +user1 localhost stage/sql/closing tables 12 user1 localhost stage/sql/init 3 -user1 localhost stage/sql/Opening tables 7 +user1 localhost stage/sql/Opening tables 8 user1 localhost stage/sql/starting 7 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 10 +user2 localhost stage/sql/closing tables 11 user2 localhost stage/sql/init 3 -user2 localhost stage/sql/Opening tables 6 +user2 localhost stage/sql/Opening tables 7 user2 localhost stage/sql/starting 7 user3 localhost stage/sql/checking permissions 4 -user3 localhost stage/sql/closing tables 10 +user3 localhost stage/sql/closing tables 11 user3 localhost stage/sql/init 3 -user3 localhost stage/sql/Opening tables 6 +user3 localhost stage/sql/Opening tables 7 user3 localhost stage/sql/starting 7 user4 localhost stage/sql/checking permissions 4 -user4 localhost stage/sql/closing tables 10 +user4 localhost stage/sql/closing tables 11 user4 localhost stage/sql/init 3 -user4 localhost stage/sql/Opening tables 6 +user4 localhost stage/sql/Opening tables 7 user4 localhost stage/sql/starting 7 execute dump_stages_user; user event_name count_star execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 16 -localhost stage/sql/closing tables 41 +localhost stage/sql/closing tables 45 localhost stage/sql/init 12 -localhost stage/sql/Opening tables 25 +localhost stage/sql/Opening tables 29 localhost stage/sql/starting 28 execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -2254,21 +2254,21 @@ statement/sql/insert 4 statement/sql/select 12 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 -user4 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 +user4 localhost transaction 3 execute dump_transactions_user; user event_name count_star execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -2320,47 +2320,47 @@ wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 11 +user1 localhost stage/sql/closing tables 12 user1 localhost stage/sql/init 3 -user1 localhost stage/sql/Opening tables 7 +user1 localhost stage/sql/Opening tables 8 user1 localhost stage/sql/starting 7 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 10 +user2 localhost stage/sql/closing tables 11 user2 localhost stage/sql/init 3 -user2 localhost stage/sql/Opening tables 6 +user2 localhost stage/sql/Opening tables 7 user2 localhost stage/sql/starting 7 user3 localhost stage/sql/checking permissions 4 -user3 localhost stage/sql/closing tables 10 +user3 localhost stage/sql/closing tables 11 user3 localhost stage/sql/init 3 -user3 localhost stage/sql/Opening tables 6 +user3 localhost stage/sql/Opening tables 7 user3 localhost stage/sql/starting 7 user4 localhost stage/sql/checking permissions 4 -user4 localhost stage/sql/closing tables 10 +user4 localhost stage/sql/closing tables 11 user4 localhost stage/sql/init 3 -user4 localhost stage/sql/Opening tables 6 +user4 localhost stage/sql/Opening tables 7 user4 localhost stage/sql/starting 7 execute dump_stages_user; user event_name count_star execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 16 -localhost stage/sql/closing tables 41 +localhost stage/sql/closing tables 45 localhost stage/sql/init 12 -localhost stage/sql/Opening tables 25 +localhost stage/sql/Opening tables 29 localhost stage/sql/starting 28 execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -2408,21 +2408,21 @@ statement/sql/insert 4 statement/sql/select 12 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 -user4 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 +user4 localhost transaction 3 execute dump_transactions_user; user event_name count_star execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -2474,47 +2474,47 @@ wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 11 +user1 localhost stage/sql/closing tables 12 user1 localhost stage/sql/init 3 -user1 localhost stage/sql/Opening tables 7 +user1 localhost stage/sql/Opening tables 8 user1 localhost stage/sql/starting 7 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 10 +user2 localhost stage/sql/closing tables 11 user2 localhost stage/sql/init 3 -user2 localhost stage/sql/Opening tables 6 +user2 localhost stage/sql/Opening tables 7 user2 localhost stage/sql/starting 7 user3 localhost stage/sql/checking permissions 4 -user3 localhost stage/sql/closing tables 10 +user3 localhost stage/sql/closing tables 11 user3 localhost stage/sql/init 3 -user3 localhost stage/sql/Opening tables 6 +user3 localhost stage/sql/Opening tables 7 user3 localhost stage/sql/starting 7 user4 localhost stage/sql/checking permissions 4 -user4 localhost stage/sql/closing tables 10 +user4 localhost stage/sql/closing tables 11 user4 localhost stage/sql/init 3 -user4 localhost stage/sql/Opening tables 6 +user4 localhost stage/sql/Opening tables 7 user4 localhost stage/sql/starting 7 execute dump_stages_user; user event_name count_star execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 16 -localhost stage/sql/closing tables 41 +localhost stage/sql/closing tables 45 localhost stage/sql/init 12 -localhost stage/sql/Opening tables 25 +localhost stage/sql/Opening tables 29 localhost stage/sql/starting 28 execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -2562,21 +2562,21 @@ statement/sql/insert 4 statement/sql/select 12 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 -user4 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 +user4 localhost transaction 3 execute dump_transactions_user; user event_name count_star execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -2628,47 +2628,47 @@ wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 11 +user1 localhost stage/sql/closing tables 12 user1 localhost stage/sql/init 3 -user1 localhost stage/sql/Opening tables 7 +user1 localhost stage/sql/Opening tables 8 user1 localhost stage/sql/starting 7 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 10 +user2 localhost stage/sql/closing tables 11 user2 localhost stage/sql/init 3 -user2 localhost stage/sql/Opening tables 6 +user2 localhost stage/sql/Opening tables 7 user2 localhost stage/sql/starting 7 user3 localhost stage/sql/checking permissions 4 -user3 localhost stage/sql/closing tables 10 +user3 localhost stage/sql/closing tables 11 user3 localhost stage/sql/init 3 -user3 localhost stage/sql/Opening tables 6 +user3 localhost stage/sql/Opening tables 7 user3 localhost stage/sql/starting 7 user4 localhost stage/sql/checking permissions 4 -user4 localhost stage/sql/closing tables 10 +user4 localhost stage/sql/closing tables 11 user4 localhost stage/sql/init 3 -user4 localhost stage/sql/Opening tables 6 +user4 localhost stage/sql/Opening tables 7 user4 localhost stage/sql/starting 7 execute dump_stages_user; user event_name count_star execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 16 -localhost stage/sql/closing tables 41 +localhost stage/sql/closing tables 45 localhost stage/sql/init 12 -localhost stage/sql/Opening tables 25 +localhost stage/sql/Opening tables 29 localhost stage/sql/starting 28 execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -2716,21 +2716,21 @@ statement/sql/insert 4 statement/sql/select 12 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 -user4 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 +user4 localhost transaction 3 execute dump_transactions_user; user event_name count_star execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -2806,23 +2806,23 @@ user event_name count_star execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 16 -localhost stage/sql/closing tables 41 +localhost stage/sql/closing tables 45 localhost stage/sql/init 12 -localhost stage/sql/Opening tables 25 +localhost stage/sql/Opening tables 29 localhost stage/sql/starting 28 execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -2870,21 +2870,21 @@ statement/sql/insert 4 statement/sql/select 12 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 -user4 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 +user4 localhost transaction 3 execute dump_transactions_user; user event_name count_star execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -2960,23 +2960,23 @@ user event_name count_star execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 16 -localhost stage/sql/closing tables 41 +localhost stage/sql/closing tables 45 localhost stage/sql/init 12 -localhost stage/sql/Opening tables 25 +localhost stage/sql/Opening tables 29 localhost stage/sql/starting 28 execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -3024,21 +3024,21 @@ statement/sql/insert 4 statement/sql/select 12 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 -user4 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 +user4 localhost transaction 3 execute dump_transactions_user; user event_name count_star execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -3121,16 +3121,16 @@ localhost stage/sql/starting 0 execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -3178,21 +3178,21 @@ statement/sql/insert 4 statement/sql/select 12 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 -user4 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 +user4 localhost transaction 3 execute dump_transactions_user; user event_name count_star execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -3282,9 +3282,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -3332,21 +3332,21 @@ statement/sql/insert 4 statement/sql/select 12 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 -user4 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 +user4 localhost transaction 3 execute dump_transactions_user; user event_name count_star execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -3436,9 +3436,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -3486,21 +3486,21 @@ statement/sql/insert 4 statement/sql/select 12 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 -user4 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 +user4 localhost transaction 3 execute dump_transactions_user; user event_name count_star execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -3590,9 +3590,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -3640,21 +3640,21 @@ statement/sql/insert 4 statement/sql/select 12 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 -user4 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 +user4 localhost transaction 3 execute dump_transactions_user; user event_name count_star execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -3744,9 +3744,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -3794,21 +3794,21 @@ statement/sql/insert 4 statement/sql/select 12 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 -user4 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 +user4 localhost transaction 3 execute dump_transactions_user; user event_name count_star execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -3898,9 +3898,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -3948,21 +3948,21 @@ statement/sql/insert 4 statement/sql/select 12 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 -user4 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 +user4 localhost transaction 3 execute dump_transactions_user; user event_name count_star execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -4052,9 +4052,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -4102,21 +4102,21 @@ statement/sql/insert 4 statement/sql/select 12 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 -user4 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 +user4 localhost transaction 3 execute dump_transactions_user; user event_name count_star execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -4206,9 +4206,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -4256,21 +4256,21 @@ statement/sql/insert 4 statement/sql/select 12 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 -user4 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 +user4 localhost transaction 3 execute dump_transactions_user; user event_name count_star execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -4360,9 +4360,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -4418,13 +4418,13 @@ execute dump_transactions_user; user event_name count_star execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -4514,9 +4514,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -4572,13 +4572,13 @@ execute dump_transactions_user; user event_name count_star execute dump_transactions_host; host event_name count_star -localhost transaction 8 +localhost transaction 12 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -4668,9 +4668,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -4729,10 +4729,10 @@ host event_name count_star localhost transaction 0 execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -4822,9 +4822,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -4886,7 +4886,7 @@ event_name count_star transaction 0 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -4948,9 +4948,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -4988,7 +4988,7 @@ event_name count_star transaction 0 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -5046,9 +5046,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -5086,7 +5086,7 @@ event_name count_star transaction 0 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -5144,9 +5144,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -5184,7 +5184,7 @@ event_name count_star transaction 0 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 diff --git a/mysql-test/suite/perfschema/r/event_aggregate_no_u_no_h.result b/mysql-test/suite/perfschema/r/event_aggregate_no_u_no_h.result index 818c61e0630e7..19e7c6ef9a363 100644 --- a/mysql-test/suite/perfschema/r/event_aggregate_no_u_no_h.result +++ b/mysql-test/suite/perfschema/r/event_aggregate_no_u_no_h.result @@ -200,9 +200,9 @@ wait/synch/rwlock/sql/LOCK_grant 1 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 11 +user1 localhost stage/sql/closing tables 12 user1 localhost stage/sql/init 3 -user1 localhost stage/sql/Opening tables 7 +user1 localhost stage/sql/Opening tables 8 user1 localhost stage/sql/starting 6 execute dump_stages_user; user event_name count_star @@ -211,16 +211,16 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/checking permissions 4 -stage/sql/closing tables 11 +stage/sql/closing tables 12 stage/sql/init 3 -stage/sql/Opening tables 7 +stage/sql/Opening tables 8 stage/sql/starting 6 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 4 -stage/sql/closing tables 11 +stage/sql/closing tables 12 stage/sql/init 3 -stage/sql/Opening tables 7 +stage/sql/Opening tables 8 stage/sql/starting 6 execute dump_statements_account; user host event_name count_star @@ -247,17 +247,17 @@ statement/sql/insert 1 statement/sql/select 3 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 +user1 localhost transaction 3 execute dump_transactions_user; user event_name count_star execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 2 +transaction 3 execute dump_transactions_history; event_name count(event_name) -transaction 2 +transaction 3 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -301,9 +301,9 @@ wait/synch/rwlock/sql/LOCK_grant 1 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 11 +user1 localhost stage/sql/closing tables 12 user1 localhost stage/sql/init 3 -user1 localhost stage/sql/Opening tables 7 +user1 localhost stage/sql/Opening tables 8 user1 localhost stage/sql/starting 6 user2 localhost stage/sql/checking permissions 0 user2 localhost stage/sql/closing tables 0 @@ -317,16 +317,16 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/checking permissions 4 -stage/sql/closing tables 11 +stage/sql/closing tables 12 stage/sql/init 3 -stage/sql/Opening tables 7 +stage/sql/Opening tables 8 stage/sql/starting 6 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 4 -stage/sql/closing tables 11 +stage/sql/closing tables 12 stage/sql/init 3 -stage/sql/Opening tables 7 +stage/sql/Opening tables 8 stage/sql/starting 6 execute dump_statements_account; user host event_name count_star @@ -358,7 +358,7 @@ statement/sql/insert 1 statement/sql/select 3 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 +user1 localhost transaction 3 user2 localhost transaction 0 execute dump_transactions_user; user event_name count_star @@ -366,10 +366,10 @@ execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 2 +transaction 3 execute dump_transactions_history; event_name count(event_name) -transaction 2 +transaction 3 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -426,14 +426,14 @@ wait/synch/rwlock/sql/LOCK_grant 2 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 11 +user1 localhost stage/sql/closing tables 12 user1 localhost stage/sql/init 3 -user1 localhost stage/sql/Opening tables 7 +user1 localhost stage/sql/Opening tables 8 user1 localhost stage/sql/starting 6 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 10 +user2 localhost stage/sql/closing tables 11 user2 localhost stage/sql/init 3 -user2 localhost stage/sql/Opening tables 6 +user2 localhost stage/sql/Opening tables 7 user2 localhost stage/sql/starting 6 execute dump_stages_user; user event_name count_star @@ -442,16 +442,16 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/checking permissions 8 -stage/sql/closing tables 21 +stage/sql/closing tables 23 stage/sql/init 6 -stage/sql/Opening tables 13 +stage/sql/Opening tables 15 stage/sql/starting 12 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 8 -stage/sql/closing tables 21 +stage/sql/closing tables 23 stage/sql/init 6 -stage/sql/Opening tables 13 +stage/sql/Opening tables 15 stage/sql/starting 12 execute dump_statements_account; user host event_name count_star @@ -483,18 +483,18 @@ statement/sql/insert 2 statement/sql/select 6 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 execute dump_transactions_user; user event_name count_star execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 4 +transaction 6 execute dump_transactions_history; event_name count(event_name) -transaction 4 +transaction 6 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -542,14 +542,14 @@ wait/synch/rwlock/sql/LOCK_grant 2 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 11 +user1 localhost stage/sql/closing tables 12 user1 localhost stage/sql/init 3 -user1 localhost stage/sql/Opening tables 7 +user1 localhost stage/sql/Opening tables 8 user1 localhost stage/sql/starting 6 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 10 +user2 localhost stage/sql/closing tables 11 user2 localhost stage/sql/init 3 -user2 localhost stage/sql/Opening tables 6 +user2 localhost stage/sql/Opening tables 7 user2 localhost stage/sql/starting 6 user3 localhost stage/sql/checking permissions 0 user3 localhost stage/sql/closing tables 0 @@ -563,16 +563,16 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/checking permissions 8 -stage/sql/closing tables 21 +stage/sql/closing tables 23 stage/sql/init 6 -stage/sql/Opening tables 13 +stage/sql/Opening tables 15 stage/sql/starting 12 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 8 -stage/sql/closing tables 21 +stage/sql/closing tables 23 stage/sql/init 6 -stage/sql/Opening tables 13 +stage/sql/Opening tables 15 stage/sql/starting 12 execute dump_statements_account; user host event_name count_star @@ -609,8 +609,8 @@ statement/sql/insert 2 statement/sql/select 6 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 user3 localhost transaction 0 execute dump_transactions_user; user event_name count_star @@ -618,10 +618,10 @@ execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 4 +transaction 6 execute dump_transactions_history; event_name count(event_name) -transaction 4 +transaction 6 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -682,19 +682,19 @@ wait/synch/rwlock/sql/LOCK_grant 3 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 11 +user1 localhost stage/sql/closing tables 12 user1 localhost stage/sql/init 3 -user1 localhost stage/sql/Opening tables 7 +user1 localhost stage/sql/Opening tables 8 user1 localhost stage/sql/starting 6 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 10 +user2 localhost stage/sql/closing tables 11 user2 localhost stage/sql/init 3 -user2 localhost stage/sql/Opening tables 6 +user2 localhost stage/sql/Opening tables 7 user2 localhost stage/sql/starting 6 user3 localhost stage/sql/checking permissions 4 -user3 localhost stage/sql/closing tables 10 +user3 localhost stage/sql/closing tables 11 user3 localhost stage/sql/init 3 -user3 localhost stage/sql/Opening tables 6 +user3 localhost stage/sql/Opening tables 7 user3 localhost stage/sql/starting 6 execute dump_stages_user; user event_name count_star @@ -703,16 +703,16 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/checking permissions 12 -stage/sql/closing tables 31 +stage/sql/closing tables 34 stage/sql/init 9 -stage/sql/Opening tables 19 +stage/sql/Opening tables 22 stage/sql/starting 18 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 12 -stage/sql/closing tables 31 +stage/sql/closing tables 34 stage/sql/init 9 -stage/sql/Opening tables 19 +stage/sql/Opening tables 22 stage/sql/starting 18 execute dump_statements_account; user host event_name count_star @@ -749,19 +749,19 @@ statement/sql/insert 3 statement/sql/select 9 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 execute dump_transactions_user; user event_name count_star execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 6 +transaction 9 execute dump_transactions_history; event_name count(event_name) -transaction 6 +transaction 9 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -813,19 +813,19 @@ wait/synch/rwlock/sql/LOCK_grant 3 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 11 +user1 localhost stage/sql/closing tables 12 user1 localhost stage/sql/init 3 -user1 localhost stage/sql/Opening tables 7 +user1 localhost stage/sql/Opening tables 8 user1 localhost stage/sql/starting 6 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 10 +user2 localhost stage/sql/closing tables 11 user2 localhost stage/sql/init 3 -user2 localhost stage/sql/Opening tables 6 +user2 localhost stage/sql/Opening tables 7 user2 localhost stage/sql/starting 6 user3 localhost stage/sql/checking permissions 4 -user3 localhost stage/sql/closing tables 10 +user3 localhost stage/sql/closing tables 11 user3 localhost stage/sql/init 3 -user3 localhost stage/sql/Opening tables 6 +user3 localhost stage/sql/Opening tables 7 user3 localhost stage/sql/starting 6 user4 localhost stage/sql/checking permissions 0 user4 localhost stage/sql/closing tables 0 @@ -839,16 +839,16 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/checking permissions 12 -stage/sql/closing tables 31 +stage/sql/closing tables 34 stage/sql/init 9 -stage/sql/Opening tables 19 +stage/sql/Opening tables 22 stage/sql/starting 18 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 12 -stage/sql/closing tables 31 +stage/sql/closing tables 34 stage/sql/init 9 -stage/sql/Opening tables 19 +stage/sql/Opening tables 22 stage/sql/starting 18 execute dump_statements_account; user host event_name count_star @@ -890,9 +890,9 @@ statement/sql/insert 3 statement/sql/select 9 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 user4 localhost transaction 0 execute dump_transactions_user; user event_name count_star @@ -900,10 +900,10 @@ execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 6 +transaction 9 execute dump_transactions_history; event_name count(event_name) -transaction 6 +transaction 9 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -968,24 +968,24 @@ wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 11 +user1 localhost stage/sql/closing tables 12 user1 localhost stage/sql/init 3 -user1 localhost stage/sql/Opening tables 7 +user1 localhost stage/sql/Opening tables 8 user1 localhost stage/sql/starting 6 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 10 +user2 localhost stage/sql/closing tables 11 user2 localhost stage/sql/init 3 -user2 localhost stage/sql/Opening tables 6 +user2 localhost stage/sql/Opening tables 7 user2 localhost stage/sql/starting 6 user3 localhost stage/sql/checking permissions 4 -user3 localhost stage/sql/closing tables 10 +user3 localhost stage/sql/closing tables 11 user3 localhost stage/sql/init 3 -user3 localhost stage/sql/Opening tables 6 +user3 localhost stage/sql/Opening tables 7 user3 localhost stage/sql/starting 6 user4 localhost stage/sql/checking permissions 4 -user4 localhost stage/sql/closing tables 10 +user4 localhost stage/sql/closing tables 11 user4 localhost stage/sql/init 3 -user4 localhost stage/sql/Opening tables 6 +user4 localhost stage/sql/Opening tables 7 user4 localhost stage/sql/starting 6 execute dump_stages_user; user event_name count_star @@ -994,16 +994,16 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 24 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 24 execute dump_statements_account; user host event_name count_star @@ -1045,20 +1045,20 @@ statement/sql/insert 4 statement/sql/select 12 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 -user4 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 +user4 localhost transaction 3 execute dump_transactions_user; user event_name count_star execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -1110,24 +1110,24 @@ wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 11 +user1 localhost stage/sql/closing tables 12 user1 localhost stage/sql/init 3 -user1 localhost stage/sql/Opening tables 7 +user1 localhost stage/sql/Opening tables 8 user1 localhost stage/sql/starting 7 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 10 +user2 localhost stage/sql/closing tables 11 user2 localhost stage/sql/init 3 -user2 localhost stage/sql/Opening tables 6 +user2 localhost stage/sql/Opening tables 7 user2 localhost stage/sql/starting 6 user3 localhost stage/sql/checking permissions 4 -user3 localhost stage/sql/closing tables 10 +user3 localhost stage/sql/closing tables 11 user3 localhost stage/sql/init 3 -user3 localhost stage/sql/Opening tables 6 +user3 localhost stage/sql/Opening tables 7 user3 localhost stage/sql/starting 6 user4 localhost stage/sql/checking permissions 4 -user4 localhost stage/sql/closing tables 10 +user4 localhost stage/sql/closing tables 11 user4 localhost stage/sql/init 3 -user4 localhost stage/sql/Opening tables 6 +user4 localhost stage/sql/Opening tables 7 user4 localhost stage/sql/starting 6 execute dump_stages_user; user event_name count_star @@ -1136,16 +1136,16 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 25 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 25 execute dump_statements_account; user host event_name count_star @@ -1188,20 +1188,20 @@ statement/sql/insert 4 statement/sql/select 12 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 -user4 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 +user4 localhost transaction 3 execute dump_transactions_user; user event_name count_star execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -1252,24 +1252,24 @@ wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 11 +user1 localhost stage/sql/closing tables 12 user1 localhost stage/sql/init 3 -user1 localhost stage/sql/Opening tables 7 +user1 localhost stage/sql/Opening tables 8 user1 localhost stage/sql/starting 7 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 10 +user2 localhost stage/sql/closing tables 11 user2 localhost stage/sql/init 3 -user2 localhost stage/sql/Opening tables 6 +user2 localhost stage/sql/Opening tables 7 user2 localhost stage/sql/starting 7 user3 localhost stage/sql/checking permissions 4 -user3 localhost stage/sql/closing tables 10 +user3 localhost stage/sql/closing tables 11 user3 localhost stage/sql/init 3 -user3 localhost stage/sql/Opening tables 6 +user3 localhost stage/sql/Opening tables 7 user3 localhost stage/sql/starting 6 user4 localhost stage/sql/checking permissions 4 -user4 localhost stage/sql/closing tables 10 +user4 localhost stage/sql/closing tables 11 user4 localhost stage/sql/init 3 -user4 localhost stage/sql/Opening tables 6 +user4 localhost stage/sql/Opening tables 7 user4 localhost stage/sql/starting 6 execute dump_stages_user; user event_name count_star @@ -1278,16 +1278,16 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 26 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 26 execute dump_statements_account; user host event_name count_star @@ -1330,20 +1330,20 @@ statement/sql/insert 4 statement/sql/select 12 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 -user4 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 +user4 localhost transaction 3 execute dump_transactions_user; user event_name count_star execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -1393,24 +1393,24 @@ wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 11 +user1 localhost stage/sql/closing tables 12 user1 localhost stage/sql/init 3 -user1 localhost stage/sql/Opening tables 7 +user1 localhost stage/sql/Opening tables 8 user1 localhost stage/sql/starting 7 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 10 +user2 localhost stage/sql/closing tables 11 user2 localhost stage/sql/init 3 -user2 localhost stage/sql/Opening tables 6 +user2 localhost stage/sql/Opening tables 7 user2 localhost stage/sql/starting 7 user3 localhost stage/sql/checking permissions 4 -user3 localhost stage/sql/closing tables 10 +user3 localhost stage/sql/closing tables 11 user3 localhost stage/sql/init 3 -user3 localhost stage/sql/Opening tables 6 +user3 localhost stage/sql/Opening tables 7 user3 localhost stage/sql/starting 7 user4 localhost stage/sql/checking permissions 4 -user4 localhost stage/sql/closing tables 10 +user4 localhost stage/sql/closing tables 11 user4 localhost stage/sql/init 3 -user4 localhost stage/sql/Opening tables 6 +user4 localhost stage/sql/Opening tables 7 user4 localhost stage/sql/starting 6 execute dump_stages_user; user event_name count_star @@ -1419,16 +1419,16 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 27 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 27 execute dump_statements_account; user host event_name count_star @@ -1471,20 +1471,20 @@ statement/sql/insert 4 statement/sql/select 12 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 -user4 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 +user4 localhost transaction 3 execute dump_transactions_user; user event_name count_star execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -1533,24 +1533,24 @@ wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 11 +user1 localhost stage/sql/closing tables 12 user1 localhost stage/sql/init 3 -user1 localhost stage/sql/Opening tables 7 +user1 localhost stage/sql/Opening tables 8 user1 localhost stage/sql/starting 7 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 10 +user2 localhost stage/sql/closing tables 11 user2 localhost stage/sql/init 3 -user2 localhost stage/sql/Opening tables 6 +user2 localhost stage/sql/Opening tables 7 user2 localhost stage/sql/starting 7 user3 localhost stage/sql/checking permissions 4 -user3 localhost stage/sql/closing tables 10 +user3 localhost stage/sql/closing tables 11 user3 localhost stage/sql/init 3 -user3 localhost stage/sql/Opening tables 6 +user3 localhost stage/sql/Opening tables 7 user3 localhost stage/sql/starting 7 user4 localhost stage/sql/checking permissions 4 -user4 localhost stage/sql/closing tables 10 +user4 localhost stage/sql/closing tables 11 user4 localhost stage/sql/init 3 -user4 localhost stage/sql/Opening tables 6 +user4 localhost stage/sql/Opening tables 7 user4 localhost stage/sql/starting 7 execute dump_stages_user; user event_name count_star @@ -1559,16 +1559,16 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -1611,20 +1611,20 @@ statement/sql/insert 4 statement/sql/select 12 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 -user4 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 +user4 localhost transaction 3 execute dump_transactions_user; user event_name count_star execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -1674,24 +1674,24 @@ wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 11 +user1 localhost stage/sql/closing tables 12 user1 localhost stage/sql/init 3 -user1 localhost stage/sql/Opening tables 7 +user1 localhost stage/sql/Opening tables 8 user1 localhost stage/sql/starting 7 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 10 +user2 localhost stage/sql/closing tables 11 user2 localhost stage/sql/init 3 -user2 localhost stage/sql/Opening tables 6 +user2 localhost stage/sql/Opening tables 7 user2 localhost stage/sql/starting 7 user3 localhost stage/sql/checking permissions 4 -user3 localhost stage/sql/closing tables 10 +user3 localhost stage/sql/closing tables 11 user3 localhost stage/sql/init 3 -user3 localhost stage/sql/Opening tables 6 +user3 localhost stage/sql/Opening tables 7 user3 localhost stage/sql/starting 7 user4 localhost stage/sql/checking permissions 4 -user4 localhost stage/sql/closing tables 10 +user4 localhost stage/sql/closing tables 11 user4 localhost stage/sql/init 3 -user4 localhost stage/sql/Opening tables 6 +user4 localhost stage/sql/Opening tables 7 user4 localhost stage/sql/starting 7 execute dump_stages_user; user event_name count_star @@ -1700,16 +1700,16 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -1752,20 +1752,20 @@ statement/sql/insert 4 statement/sql/select 12 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 -user4 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 +user4 localhost transaction 3 execute dump_transactions_user; user event_name count_star execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -1814,24 +1814,24 @@ wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 11 +user1 localhost stage/sql/closing tables 12 user1 localhost stage/sql/init 3 -user1 localhost stage/sql/Opening tables 7 +user1 localhost stage/sql/Opening tables 8 user1 localhost stage/sql/starting 7 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 10 +user2 localhost stage/sql/closing tables 11 user2 localhost stage/sql/init 3 -user2 localhost stage/sql/Opening tables 6 +user2 localhost stage/sql/Opening tables 7 user2 localhost stage/sql/starting 7 user3 localhost stage/sql/checking permissions 4 -user3 localhost stage/sql/closing tables 10 +user3 localhost stage/sql/closing tables 11 user3 localhost stage/sql/init 3 -user3 localhost stage/sql/Opening tables 6 +user3 localhost stage/sql/Opening tables 7 user3 localhost stage/sql/starting 7 user4 localhost stage/sql/checking permissions 4 -user4 localhost stage/sql/closing tables 10 +user4 localhost stage/sql/closing tables 11 user4 localhost stage/sql/init 3 -user4 localhost stage/sql/Opening tables 6 +user4 localhost stage/sql/Opening tables 7 user4 localhost stage/sql/starting 7 execute dump_stages_user; user event_name count_star @@ -1840,16 +1840,16 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -1892,20 +1892,20 @@ statement/sql/insert 4 statement/sql/select 12 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 -user4 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 +user4 localhost transaction 3 execute dump_transactions_user; user event_name count_star execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -1954,24 +1954,24 @@ wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 11 +user1 localhost stage/sql/closing tables 12 user1 localhost stage/sql/init 3 -user1 localhost stage/sql/Opening tables 7 +user1 localhost stage/sql/Opening tables 8 user1 localhost stage/sql/starting 7 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 10 +user2 localhost stage/sql/closing tables 11 user2 localhost stage/sql/init 3 -user2 localhost stage/sql/Opening tables 6 +user2 localhost stage/sql/Opening tables 7 user2 localhost stage/sql/starting 7 user3 localhost stage/sql/checking permissions 4 -user3 localhost stage/sql/closing tables 10 +user3 localhost stage/sql/closing tables 11 user3 localhost stage/sql/init 3 -user3 localhost stage/sql/Opening tables 6 +user3 localhost stage/sql/Opening tables 7 user3 localhost stage/sql/starting 7 user4 localhost stage/sql/checking permissions 4 -user4 localhost stage/sql/closing tables 10 +user4 localhost stage/sql/closing tables 11 user4 localhost stage/sql/init 3 -user4 localhost stage/sql/Opening tables 6 +user4 localhost stage/sql/Opening tables 7 user4 localhost stage/sql/starting 7 execute dump_stages_user; user event_name count_star @@ -1980,16 +1980,16 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -2032,20 +2032,20 @@ statement/sql/insert 4 statement/sql/select 12 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 -user4 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 +user4 localhost transaction 3 execute dump_transactions_user; user event_name count_star execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -2094,24 +2094,24 @@ wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 11 +user1 localhost stage/sql/closing tables 12 user1 localhost stage/sql/init 3 -user1 localhost stage/sql/Opening tables 7 +user1 localhost stage/sql/Opening tables 8 user1 localhost stage/sql/starting 7 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 10 +user2 localhost stage/sql/closing tables 11 user2 localhost stage/sql/init 3 -user2 localhost stage/sql/Opening tables 6 +user2 localhost stage/sql/Opening tables 7 user2 localhost stage/sql/starting 7 user3 localhost stage/sql/checking permissions 4 -user3 localhost stage/sql/closing tables 10 +user3 localhost stage/sql/closing tables 11 user3 localhost stage/sql/init 3 -user3 localhost stage/sql/Opening tables 6 +user3 localhost stage/sql/Opening tables 7 user3 localhost stage/sql/starting 7 user4 localhost stage/sql/checking permissions 4 -user4 localhost stage/sql/closing tables 10 +user4 localhost stage/sql/closing tables 11 user4 localhost stage/sql/init 3 -user4 localhost stage/sql/Opening tables 6 +user4 localhost stage/sql/Opening tables 7 user4 localhost stage/sql/starting 7 execute dump_stages_user; user event_name count_star @@ -2120,16 +2120,16 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -2172,20 +2172,20 @@ statement/sql/insert 4 statement/sql/select 12 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 -user4 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 +user4 localhost transaction 3 execute dump_transactions_user; user event_name count_star execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -2234,24 +2234,24 @@ wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 11 +user1 localhost stage/sql/closing tables 12 user1 localhost stage/sql/init 3 -user1 localhost stage/sql/Opening tables 7 +user1 localhost stage/sql/Opening tables 8 user1 localhost stage/sql/starting 7 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 10 +user2 localhost stage/sql/closing tables 11 user2 localhost stage/sql/init 3 -user2 localhost stage/sql/Opening tables 6 +user2 localhost stage/sql/Opening tables 7 user2 localhost stage/sql/starting 7 user3 localhost stage/sql/checking permissions 4 -user3 localhost stage/sql/closing tables 10 +user3 localhost stage/sql/closing tables 11 user3 localhost stage/sql/init 3 -user3 localhost stage/sql/Opening tables 6 +user3 localhost stage/sql/Opening tables 7 user3 localhost stage/sql/starting 7 user4 localhost stage/sql/checking permissions 4 -user4 localhost stage/sql/closing tables 10 +user4 localhost stage/sql/closing tables 11 user4 localhost stage/sql/init 3 -user4 localhost stage/sql/Opening tables 6 +user4 localhost stage/sql/Opening tables 7 user4 localhost stage/sql/starting 7 execute dump_stages_user; user event_name count_star @@ -2260,16 +2260,16 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -2312,20 +2312,20 @@ statement/sql/insert 4 statement/sql/select 12 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 -user4 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 +user4 localhost transaction 3 execute dump_transactions_user; user event_name count_star execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -2374,24 +2374,24 @@ wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 11 +user1 localhost stage/sql/closing tables 12 user1 localhost stage/sql/init 3 -user1 localhost stage/sql/Opening tables 7 +user1 localhost stage/sql/Opening tables 8 user1 localhost stage/sql/starting 7 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 10 +user2 localhost stage/sql/closing tables 11 user2 localhost stage/sql/init 3 -user2 localhost stage/sql/Opening tables 6 +user2 localhost stage/sql/Opening tables 7 user2 localhost stage/sql/starting 7 user3 localhost stage/sql/checking permissions 4 -user3 localhost stage/sql/closing tables 10 +user3 localhost stage/sql/closing tables 11 user3 localhost stage/sql/init 3 -user3 localhost stage/sql/Opening tables 6 +user3 localhost stage/sql/Opening tables 7 user3 localhost stage/sql/starting 7 user4 localhost stage/sql/checking permissions 4 -user4 localhost stage/sql/closing tables 10 +user4 localhost stage/sql/closing tables 11 user4 localhost stage/sql/init 3 -user4 localhost stage/sql/Opening tables 6 +user4 localhost stage/sql/Opening tables 7 user4 localhost stage/sql/starting 7 execute dump_stages_user; user event_name count_star @@ -2400,16 +2400,16 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -2452,20 +2452,20 @@ statement/sql/insert 4 statement/sql/select 12 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 -user4 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 +user4 localhost transaction 3 execute dump_transactions_user; user event_name count_star execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -2540,16 +2540,16 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -2592,20 +2592,20 @@ statement/sql/insert 4 statement/sql/select 12 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 -user4 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 +user4 localhost transaction 3 execute dump_transactions_user; user event_name count_star execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -2680,16 +2680,16 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -2732,20 +2732,20 @@ statement/sql/insert 4 statement/sql/select 12 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 -user4 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 +user4 localhost transaction 3 execute dump_transactions_user; user event_name count_star execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -2820,16 +2820,16 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -2872,20 +2872,20 @@ statement/sql/insert 4 statement/sql/select 12 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 -user4 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 +user4 localhost transaction 3 execute dump_transactions_user; user event_name count_star execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -2967,9 +2967,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -3012,20 +3012,20 @@ statement/sql/insert 4 statement/sql/select 12 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 -user4 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 +user4 localhost transaction 3 execute dump_transactions_user; user event_name count_star execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -3107,9 +3107,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -3152,20 +3152,20 @@ statement/sql/insert 4 statement/sql/select 12 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 -user4 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 +user4 localhost transaction 3 execute dump_transactions_user; user event_name count_star execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -3247,9 +3247,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -3292,20 +3292,20 @@ statement/sql/insert 4 statement/sql/select 12 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 -user4 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 +user4 localhost transaction 3 execute dump_transactions_user; user event_name count_star execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -3387,9 +3387,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -3432,20 +3432,20 @@ statement/sql/insert 4 statement/sql/select 12 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 -user4 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 +user4 localhost transaction 3 execute dump_transactions_user; user event_name count_star execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -3527,9 +3527,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -3572,20 +3572,20 @@ statement/sql/insert 4 statement/sql/select 12 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 -user4 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 +user4 localhost transaction 3 execute dump_transactions_user; user event_name count_star execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -3667,9 +3667,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -3712,20 +3712,20 @@ statement/sql/insert 4 statement/sql/select 12 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 -user4 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 +user4 localhost transaction 3 execute dump_transactions_user; user event_name count_star execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -3807,9 +3807,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -3852,20 +3852,20 @@ statement/sql/insert 4 statement/sql/select 12 execute dump_transactions_account; user host event_name count_star -user1 localhost transaction 2 -user2 localhost transaction 2 -user3 localhost transaction 2 -user4 localhost transaction 2 +user1 localhost transaction 3 +user2 localhost transaction 3 +user3 localhost transaction 3 +user4 localhost transaction 3 execute dump_transactions_user; user event_name count_star execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -3947,9 +3947,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -4002,10 +4002,10 @@ execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -4087,9 +4087,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -4142,10 +4142,10 @@ execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -4227,9 +4227,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -4282,10 +4282,10 @@ execute dump_transactions_host; host event_name count_star execute dump_transactions_global; event_name count_star -transaction 8 +transaction 12 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -4367,9 +4367,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -4425,7 +4425,7 @@ event_name count_star transaction 0 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -4479,9 +4479,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -4513,7 +4513,7 @@ event_name count_star transaction 0 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -4563,9 +4563,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -4597,7 +4597,7 @@ event_name count_star transaction 0 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 @@ -4647,9 +4647,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 41 +stage/sql/closing tables 45 stage/sql/init 12 -stage/sql/Opening tables 25 +stage/sql/Opening tables 29 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -4681,7 +4681,7 @@ event_name count_star transaction 0 execute dump_transactions_history; event_name count(event_name) -transaction 8 +transaction 12 execute dump_accounts; USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS root localhost 1 1 diff --git a/sql/sp.cc b/sql/sp.cc index 0a8aa24789ba2..9e4e29c48ca78 100644 --- a/sql/sp.cc +++ b/sql/sp.cc @@ -2628,7 +2628,7 @@ Sp_handler::sp_resolve_package_routine(THD *thd, const Sp_handler **pkg_routine_handler, Database_qualified_name *pkgname) const { - if (!thd->db.length || !(thd->variables.sql_mode & MODE_ORACLE)) + if (!thd->db.length) return false; return name->m_explicit_name ? diff --git a/sql/sp.h b/sql/sp.h index e2030fdde6d53..792321c930d22 100644 --- a/sql/sp.h +++ b/sql/sp.h @@ -157,6 +157,7 @@ class Sp_handler } virtual enum_sp_type type() const= 0; virtual LEX_CSTRING type_lex_cstring() const= 0; + virtual enum_sql_command sqlcom_create() const= 0; virtual enum_sql_command sqlcom_drop() const= 0; virtual LEX_CSTRING empty_body_lex_cstring(sql_mode_t mode) const { @@ -257,6 +258,7 @@ class Sp_handler_procedure: public Sp_handler static LEX_CSTRING m_type_str= { STRING_WITH_LEN("PROCEDURE")}; return m_type_str; } + enum_sql_command sqlcom_create() const { return SQLCOM_CREATE_PROCEDURE; } enum_sql_command sqlcom_drop() const { return SQLCOM_DROP_PROCEDURE; } LEX_CSTRING empty_body_lex_cstring(sql_mode_t mode) const; const char *show_create_routine_col1_caption() const @@ -308,6 +310,7 @@ class Sp_handler_function: public Sp_handler static LEX_CSTRING m_type_str= { STRING_WITH_LEN("FUNCTION")}; return m_type_str; } + enum_sql_command sqlcom_create() const { return SQLCOM_CREATE_FUNCTION; } enum_sql_command sqlcom_drop() const { return SQLCOM_DROP_FUNCTION; } LEX_CSTRING empty_body_lex_cstring(sql_mode_t mode) const; const char *show_create_routine_col1_caption() const @@ -378,6 +381,7 @@ class Sp_handler_package_spec: public Sp_handler_package static LEX_CSTRING m_type_str= {STRING_WITH_LEN("PACKAGE")}; return m_type_str; } + enum_sql_command sqlcom_create() const { return SQLCOM_CREATE_PACKAGE; } enum_sql_command sqlcom_drop() const { return SQLCOM_DROP_PACKAGE; } LEX_CSTRING empty_body_lex_cstring(sql_mode_t mode) const { @@ -412,6 +416,7 @@ class Sp_handler_package_body: public Sp_handler_package static LEX_CSTRING m_type_str= {STRING_WITH_LEN("PACKAGE BODY")}; return m_type_str; } + enum_sql_command sqlcom_create() const { return SQLCOM_CREATE_PACKAGE_BODY; } enum_sql_command sqlcom_drop() const { return SQLCOM_DROP_PACKAGE_BODY; } LEX_CSTRING empty_body_lex_cstring(sql_mode_t mode) const { @@ -446,6 +451,7 @@ class Sp_handler_trigger: public Sp_handler static LEX_CSTRING m_type_str= { STRING_WITH_LEN("TRIGGER")}; return m_type_str; } + enum_sql_command sqlcom_create() const { return SQLCOM_CREATE_TRIGGER; } enum_sql_command sqlcom_drop() const { return SQLCOM_DROP_TRIGGER; } MDL_key::enum_mdl_namespace get_mdl_type() const { diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index 76210b5e56a4a..5276e5c7d3e1d 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -7370,6 +7370,35 @@ sp_name *LEX::make_sp_name(THD *thd, const Lex_ident_sys_st &name1, } +sp_lex_local *LEX::package_routine_start(THD *thd, + const Sp_handler *sph, + const Lex_ident_sys_st &name) +{ + DBUG_ASSERT(sphead); + DBUG_ASSERT(sphead->get_package()); + thd->m_parser_state->m_yacc.reset_before_substatement(); + + sp_lex_local *sublex= new (thd->mem_root) sp_lex_local(thd, this); + if (!unlikely(sublex)) + return NULL; + + sublex->sql_command= sph->sqlcom_create(); + sp_name *spname= make_sp_name_package_routine(thd, name); + if (unlikely(!spname)) + return NULL; + + if (sublex->sql_command == SQLCOM_CREATE_FUNCTION) + (void) is_native_function_with_warn(thd, &name); + + enum_sp_aggregate_type atype= sublex->sql_command == SQLCOM_CREATE_FUNCTION ? + NOT_AGGREGATE : DEFAULT_AGGREGATE; + if (unlikely(!sublex->make_sp_head_no_recursive(thd, spname, sph, atype))) + return NULL; + sphead->get_package()->m_current_routine= sublex; + return sublex; +} + + sp_head *LEX::make_sp_head(THD *thd, const sp_name *name, const Sp_handler *sph, enum_sp_aggregate_type agg_type) @@ -9311,10 +9340,10 @@ sp_package *LEX::get_sp_package() const sp_package *LEX::create_package_start(THD *thd, - enum_sql_command command, const Sp_handler *sph, const sp_name *name_arg, - DDL_options_st options) + DDL_options_st options, + const st_sp_chistics &chistics) { sp_package *pkg; @@ -9323,7 +9352,7 @@ sp_package *LEX::create_package_start(THD *thd, my_error(ER_SP_NO_RECURSIVE_CREATE, MYF(0), sph->type_str()); return NULL; } - if (unlikely(set_command_with_check(command, options))) + if (unlikely(set_command_with_check(sph->sqlcom_create(), options))) return NULL; if (sph->type() == SP_TYPE_PACKAGE_BODY) { @@ -9359,6 +9388,7 @@ sp_package *LEX::create_package_start(THD *thd, pkg->reset_thd_mem_root(thd); pkg->init(this); pkg->make_qname(pkg->get_main_mem_root(), &pkg->m_qname); + pkg->set_c_chistics(chistics); sphead= pkg; return pkg; } diff --git a/sql/sql_lex.h b/sql/sql_lex.h index f0c2004099614..c55a64bdd71b9 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -3201,6 +3201,7 @@ class Lex_grant_privilege: public Grant_privilege, public Sql_alloc }; +class sp_lex_local; class sp_lex_cursor; struct LEX: public Query_tables_list @@ -3904,6 +3905,9 @@ struct LEX: public Query_tables_list const Lex_ident_sys_st &name2); sp_name *make_sp_name_package_routine(THD *thd, const Lex_ident_sys_st &name); + sp_lex_local *package_routine_start(THD *thd, + const Sp_handler *sph, + const Lex_ident_sys_st &name); sp_head *make_sp_head(THD *thd, const sp_name *name, const Sp_handler *sph, enum_sp_aggregate_type agg_type); sp_head *make_sp_head_no_recursive(THD *thd, const sp_name *name, @@ -3916,10 +3920,10 @@ struct LEX: public Query_tables_list bool sp_body_finalize_procedure(THD *); bool sp_body_finalize_procedure_standalone(THD *, const sp_name *end_name); sp_package *create_package_start(THD *thd, - enum_sql_command command, const Sp_handler *sph, const sp_name *name, - DDL_options_st options); + DDL_options_st options, + const st_sp_chistics &chistics); bool create_package_finalize(THD *thd, const sp_name *name, const sp_name *name2, diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 380fbed7c6c1b..1696d82ead23f 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -1288,7 +1288,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, size_t *yystacksize); %left TRANSACTION_SYM TIMESTAMP PERIOD_SYM SYSTEM USER COMMENT_SYM %left PREC_BELOW_SP_OBJECT_TYPE -%left FUNCTION_SYM +%left PACKAGE_MARIADB_SYM FUNCTION_SYM /* @@ -1314,7 +1314,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, size_t *yystacksize); ALTER TABLE t1 ADD SYSTEM VERSIONING; */ %left PREC_BELOW_CONTRACTION_TOKEN2 -%left TEXT_STRING '(' ')' VALUE_SYM VERSIONING_SYM +%left TEXT_STRING '(' ')' VALUE_SYM VERSIONING_SYM BODY_MARIADB_SYM %left EMPTY_FROM_CLAUSE %right INTO @@ -1395,6 +1395,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, size_t *yystacksize); remember_cpp_ptr wild_and_where remember_start_opt + remember_end_opt %type field_length_str @@ -1406,6 +1407,8 @@ bool my_yyoverflow(short **a, YYSTYPE **b, size_t *yystacksize); %type int_type real_type %type sp_handler + sp_handler_package_spec + sp_handler_package_body %type json_on_response @@ -1908,6 +1911,28 @@ rule: %type with_or_without_system %type engine_defined_option; +%type + remember_lex + package_specification_function + package_specification_procedure +%type opt_trailing_sp_name +%type opt_package_routine_end_name + +%type + package_implementation_declare_section + package_implementation_declare_section_list + package_implementation_routine_definition + package_implementation_item_declaration + package_implementation_declare_section_list1 + package_implementation_declare_section_list2 + +%type package_implementation_executable_section + +%type + sp_package_function_body + sp_package_procedure_body + + %ifdef MARIADB %type sp_tail_standalone %type sp_unlabeled_block_not_atomic @@ -1925,14 +1950,11 @@ rule: %type sp_opt_inout %type sp_tail_standalone %type sp_labelable_stmt -%type remember_end_opt -%type opt_package_routine_end_name %type label_declaration_oracle %type labels_declaration_oracle %type keyword_directly_assignable %type ident_directly_assignable %type ident_cli_directly_assignable -%type opt_sp_name %type sp_decl_body_list %type opt_sp_decl_body_list %type sp_decl_variable_list @@ -1942,19 +1964,9 @@ rule: %type sp_decl_handler %type sp_decl_handler_list %type opt_sp_decl_handler_list -%type package_implementation_routine_definition -%type package_implementation_item_declaration -%type package_implementation_declare_section -%type package_implementation_declare_section_list1 -%type package_implementation_declare_section_list2 %type sp_block_statements_and_exceptions -%type package_implementation_executable_section %type sp_instr_addr %type opt_exception_clause exception_handlers -%type remember_lex -%type package_routine_lex -%type package_specification_function -%type package_specification_procedure %endif ORACLE %% @@ -3052,10 +3064,19 @@ opt_aggregate: sp_handler: FUNCTION_SYM { $$= &sp_handler_function; } | PROCEDURE_SYM { $$= &sp_handler_procedure; } - | PACKAGE_ORACLE_SYM { $$= &sp_handler_package_spec; } - | PACKAGE_ORACLE_SYM BODY_ORACLE_SYM { $$= &sp_handler_package_body; } + | sp_handler_package_spec + | sp_handler_package_body ; +sp_handler_package_spec: + PACKAGE_ORACLE_SYM { $$= &sp_handler_package_spec; } + | PACKAGE_MARIADB_SYM { $$= &sp_handler_package_spec; } + ; + +sp_handler_package_body: + PACKAGE_ORACLE_SYM BODY_ORACLE_SYM { $$= &sp_handler_package_body; } + | PACKAGE_MARIADB_SYM BODY_MARIADB_SYM { $$= &sp_handler_package_body; } + ; drop_routine: DROP sp_handler opt_if_exists ident '.' ident @@ -5382,7 +5403,7 @@ opt_if_not_exists_table_element: ; opt_if_not_exists: - /* empty */ + /* empty */ %prec PREC_BELOW_CONTRACTION_TOKEN2 { $$.init(); } @@ -9244,6 +9265,21 @@ remember_start_opt: } ; +remember_end_opt: + { + if (yychar == YYEMPTY) + $$= (char*) YYLIP->get_cpp_ptr_rtrim(); + else + $$= (char*) YYLIP->get_cpp_tok_end_rtrim(); + } + ; + +remember_lex: + { + $$= thd->lex; + } + ; + select_alias: /* empty */ { $$=null_clex_str;} | AS ident { $$=$2; } @@ -13176,7 +13212,7 @@ opt_if_exists_table_element: ; opt_if_exists: - /* empty */ + /* empty */ %prec PREC_BELOW_CONTRACTION_TOKEN2 { $$.set(DDL_options_st::OPT_NONE); } @@ -16194,7 +16230,7 @@ keyword_sp_var_and_label: | ONLY_SYM | ORDINALITY_SYM | OVERLAPS_SYM - | PACKAGE_MARIADB_SYM + | PACKAGE_MARIADB_SYM %prec PREC_BELOW_CONTRACTION_TOKEN2 | PACK_KEYS_SYM | PAGE_SYM | PARTIAL @@ -18165,6 +18201,28 @@ sf_return_type: } ; +create_package_chistic: + COMMENT_SYM TEXT_STRING_sys + { Lex->sp_chistics.comment= $2; } + | sp_suid + { Lex->sp_chistics.suid= $1; } + ; + +create_package_chistics: + create_package_chistic {} + | create_package_chistics create_package_chistic { } + ; + +opt_create_package_chistics: + /*empty*/ { } + | create_package_chistics { } + ; + +opt_create_package_chistics_init: + { Lex->sp_chistics.init(); } + opt_create_package_chistics + ; + /*************************************************************************/ xa: @@ -18325,6 +18383,66 @@ sp_case_then_statements: sp_proc_stmts1 ; +sp_tail_is: + /*empty*/ { } + ; + +sp_package_function_body: + sp_proc_stmt_in_returns_clause + ; + +sp_package_procedure_body: + sp_proc_stmt + ; + +opt_trailing_sp_name: + /*empty*/ { $$= NULL; } + ; + +opt_package_routine_end_name: + /*empty*/ { $$= null_clex_str; } + | FORCE_LOOKAHEAD { $$= null_clex_str; } + ; + +sf_parameters: + sp_parenthesized_fdparam_list + ; + +sp_parameters: + sp_parenthesized_pdparam_list + ; + +sf_returned_type_clause: + RETURNS_SYM sf_return_type + ; + +package_implementation_item_declaration: + DECLARE_MARIADB_SYM sp_decl_variable_list ';' { $$= $2; } + ; + +// Inside CREATE PACKAGE BODY, package-wide items (e.g. variables) +// must be declared before routine definitions. + +package_implementation_declare_section_list: + package_implementation_declare_section_list1 %prec PREC_BELOW_SP_OBJECT_TYPE + | package_implementation_declare_section_list2 %prec PREC_BELOW_SP_OBJECT_TYPE + | package_implementation_declare_section_list1 + package_implementation_declare_section_list2 %prec PREC_BELOW_SP_OBJECT_TYPE + { $$.join($1, $2); } + ; + +package_implementation_declare_section: + package_implementation_declare_section_list + ; + +package_implementation_executable_section: + sp_proc_stmts END + { + $$.init(0); + } + ; + + reserved_keyword_udt_param_type: INOUT_SYM | IN_SYM @@ -18544,49 +18662,6 @@ sp_tail_standalone: } ; -create_routine: - create_or_replace definer_opt PROCEDURE_SYM opt_if_not_exists - { - if (Lex->stmt_create_procedure_start($1 | $4)) - MYSQL_YYABORT; - } - sp_tail_standalone - { - Lex->stmt_create_routine_finalize(); - } - | create_or_replace definer opt_aggregate FUNCTION_SYM opt_if_not_exists - sp_name - { - if (Lex->stmt_create_stored_function_start($1 | $5, $3, $6)) - MYSQL_YYABORT; - } - sp_parenthesized_fdparam_list - RETURNS_SYM sf_return_type - sf_c_chistics_and_body_standalone - { - Lex->stmt_create_routine_finalize(); - } - | create_or_replace no_definer opt_aggregate FUNCTION_SYM opt_if_not_exists - sp_name - { - if (Lex->stmt_create_stored_function_start($1 | $5, $3, $6)) - MYSQL_YYABORT; - } - sp_parenthesized_fdparam_list - RETURNS_SYM sf_return_type - sf_c_chistics_and_body_standalone - { - Lex->stmt_create_routine_finalize(); - } - | create_or_replace no_definer opt_aggregate FUNCTION_SYM opt_if_not_exists - ident RETURNS_SYM udf_type SONAME_SYM TEXT_STRING_sys - { - if (Lex->stmt_create_udf_function($1 | $5, $3, $6, - (Item_result) $8, $10)) - MYSQL_YYABORT; - } - ; - sp_decls: _empty @@ -18778,6 +18853,30 @@ sp_case_then_statements: sp_proc_stmts1_implicit_block { } ; +sp_parameters: + opt_sp_parenthesized_pdparam_list + ; + +sf_parameters: + opt_sp_parenthesized_fdparam_list + ; + +sf_returned_type_clause: + RETURN_ORACLE_SYM sf_return_type + ; + +package_implementation_item_declaration: + sp_decl_variable_list ';' + ; + +sp_package_function_body: + sp_body { } + ; + +sp_package_procedure_body: + sp_body { } + ; + reserved_keyword_udt: reserved_keyword_udt_not_param_type ; @@ -18864,15 +18963,6 @@ sp_block_label: ; -remember_end_opt: - { - if (yychar == YYEMPTY) - $$= (char*) YYLIP->get_cpp_ptr_rtrim(); - else - $$= (char*) YYLIP->get_cpp_tok_end_rtrim(); - } - ; - sp_opt_default: _empty { $$= { nullptr, empty_clex_str}; } | DEFAULT remember_cpp_ptr expr remember_end @@ -18921,12 +19011,6 @@ sp_proc_stmts1_implicit_block: ; -remember_lex: - { - $$= thd->lex; - } - ; - keyword_directly_assignable: keyword_data_type | keyword_cast_type @@ -19072,7 +19156,7 @@ opt_sp_parenthesized_pdparam_list: ; -opt_sp_name: +opt_trailing_sp_name: _empty { $$= NULL; } | sp_name { $$= $1; } ; @@ -19111,32 +19195,38 @@ sp_body: END ; -create_package_chistic: - COMMENT_SYM TEXT_STRING_sys - { Lex->sp_chistics.comment= $2; } - | sp_suid - { Lex->sp_chistics.suid= $1; } - ; - -create_package_chistics: - create_package_chistic {} - | create_package_chistics create_package_chistic { } - ; +// Inside CREATE PACKAGE BODY, package-wide items (e.g. variables) +// must be declared before routine definitions. -opt_create_package_chistics: - _empty - | create_package_chistics { } +package_implementation_declare_section_list: + package_implementation_declare_section_list1 + | package_implementation_declare_section_list2 + | package_implementation_declare_section_list1 + package_implementation_declare_section_list2 + { $$.join($1, $2); } ; -opt_create_package_chistics_init: - { Lex->sp_chistics.init(); } - opt_create_package_chistics +package_implementation_declare_section: + package_implementation_declare_section_list + { + /* + Add a jump "end of declarations -> start of exceptions" + (over the executable sectition). + */ + if (Lex->sp_block_with_exceptions_finalize_declarations(thd)) + MYSQL_YYABORT; + } ; - package_implementation_executable_section: END { + /* + Backpatch the jump generated in + package_implementation_declare_section + and generate a backward jump: + "end of exceptions -> start of the executable section". + */ if (unlikely(Lex->sp_block_with_exceptions_add_empty(thd))) MYSQL_YYABORT; $$.init(0); @@ -19144,17 +19234,8 @@ package_implementation_executable_section: | BEGIN_ORACLE_SYM sp_block_statements_and_exceptions END { $$= $2; } ; +%endif ORACLE -// Inside CREATE PACKAGE BODY, package-wide items (e.g. variables) -// must be declared before routine definitions. - -package_implementation_declare_section: - package_implementation_declare_section_list1 - | package_implementation_declare_section_list2 - | package_implementation_declare_section_list1 - package_implementation_declare_section_list2 - { $$.join($1, $2); } - ; package_implementation_declare_section_list1: package_implementation_item_declaration @@ -19170,65 +19251,43 @@ package_implementation_declare_section_list2: { $$.join($1, $2); } ; -package_routine_lex: - { - if (unlikely(!($$= new (thd->mem_root) - sp_lex_local(thd, thd->lex)))) - MYSQL_YYABORT; - thd->m_parser_state->m_yacc.reset_before_substatement(); - } - ; - package_specification_function: - remember_lex package_routine_lex ident + remember_lex ident { - DBUG_ASSERT($1->sphead->get_package()); - $2->sql_command= SQLCOM_CREATE_FUNCTION; - sp_name *spname= $1->make_sp_name_package_routine(thd, $3); - if (unlikely(!spname)) - MYSQL_YYABORT; - thd->lex= $2; - if (unlikely(!$2->make_sp_head_no_recursive(thd, spname, - &sp_handler_package_function, - NOT_AGGREGATE))) + LEX *lex= thd->lex->package_routine_start(thd, + &sp_handler_package_function, $2); + if (!lex) MYSQL_YYABORT; - $1->sphead->get_package()->m_current_routine= $2; - (void) is_native_function_with_warn(thd, &$3); + thd->lex= lex; } - opt_sp_parenthesized_fdparam_list - RETURN_ORACLE_SYM sf_return_type + sf_parameters + sf_returned_type_clause sp_c_chistics { + $$= thd->lex; sp_head *sp= thd->lex->sphead; sp->restore_thd_mem_root(thd); thd->lex= $1; - $$= $2; } ; package_specification_procedure: - remember_lex package_routine_lex ident + remember_lex ident { - DBUG_ASSERT($1->sphead->get_package()); - $2->sql_command= SQLCOM_CREATE_PROCEDURE; - sp_name *spname= $1->make_sp_name_package_routine(thd, $3); - if (unlikely(!spname)) + LEX *lex= thd->lex->package_routine_start(thd, + &sp_handler_package_procedure, $2); + if (!lex) MYSQL_YYABORT; - thd->lex= $2; - if (unlikely(!$2->make_sp_head_no_recursive(thd, spname, - &sp_handler_package_procedure, - DEFAULT_AGGREGATE))) - MYSQL_YYABORT; - $1->sphead->get_package()->m_current_routine= $2; + thd->lex= lex; } - opt_sp_parenthesized_pdparam_list + sp_parameters sp_c_chistics { + $$= thd->lex; sp_head *sp= thd->lex->sphead; sp->restore_thd_mem_root(thd); thd->lex= $1; - $$= $2; } ; @@ -19266,7 +19325,7 @@ package_implementation_function_body: sp->set_c_chistics(thd->lex->sp_chistics); sp->set_body_start(thd, YYLIP->get_cpp_tok_start()); } - sp_body opt_package_routine_end_name + sp_package_function_body opt_package_routine_end_name { if (unlikely(thd->lex->sp_body_finalize_function(thd) || thd->lex->sphead->check_package_routine_end_name($5))) @@ -19285,7 +19344,7 @@ package_implementation_procedure_body: sp->set_c_chistics(thd->lex->sp_chistics); sp->set_body_start(thd, YYLIP->get_cpp_tok_start()); } - sp_body opt_package_routine_end_name + sp_package_procedure_body opt_package_routine_end_name { if (unlikely(thd->lex->sp_body_finalize_procedure(thd) || thd->lex->sphead->check_package_routine_end_name($5))) @@ -19295,10 +19354,6 @@ package_implementation_procedure_body: ; -package_implementation_item_declaration: - sp_decl_variable_list ';' - ; - opt_package_specification_element_list: _empty | package_specification_element_list @@ -19326,6 +19381,9 @@ package_specification_element: } ; + +%ifdef ORACLE + sp_decl_variable_list_anchored: sp_decl_idents_init_vars optionally_qualified_column_ident PERCENT_ORACLE_SYM TYPE_SYM @@ -19423,13 +19481,15 @@ sp_tail_standalone: } sp_tail_is sp_body - opt_sp_name + opt_trailing_sp_name { if (unlikely(Lex->sp_body_finalize_procedure_standalone(thd, $8))) MYSQL_YYABORT; } ; +%endif ORACLE + create_routine: create_or_replace definer_opt PROCEDURE_SYM opt_if_not_exists @@ -19447,12 +19507,12 @@ create_routine: if (Lex->stmt_create_stored_function_start($1 | $5, $3, $6)) MYSQL_YYABORT; } - opt_sp_parenthesized_fdparam_list - RETURN_ORACLE_SYM sf_return_type + sf_parameters + sf_returned_type_clause sf_c_chistics_and_body_standalone - opt_sp_name + opt_trailing_sp_name { - if (Lex->stmt_create_stored_function_finalize_standalone($12)) + if (Lex->stmt_create_stored_function_finalize_standalone($11)) MYSQL_YYABORT; } | create_or_replace no_definer opt_aggregate FUNCTION_SYM opt_if_not_exists @@ -19461,12 +19521,12 @@ create_routine: if (Lex->stmt_create_stored_function_start($1 | $5, $3, $6)) MYSQL_YYABORT; } - opt_sp_parenthesized_fdparam_list - RETURN_ORACLE_SYM sf_return_type + sf_parameters + sf_returned_type_clause sf_c_chistics_and_body_standalone - opt_sp_name + opt_trailing_sp_name { - if (Lex->stmt_create_stored_function_finalize_standalone($12)) + if (Lex->stmt_create_stored_function_finalize_standalone($11)) MYSQL_YYABORT; } | create_or_replace no_definer opt_aggregate FUNCTION_SYM opt_if_not_exists @@ -19476,59 +19536,54 @@ create_routine: (Item_result) $8, $10)) MYSQL_YYABORT; } - | create_or_replace definer_opt PACKAGE_ORACLE_SYM + | create_or_replace definer_opt sp_handler_package_spec opt_if_not_exists sp_name opt_create_package_chistics_init { sp_package *pkg; if (unlikely(!(pkg= Lex-> - create_package_start(thd, - SQLCOM_CREATE_PACKAGE, - &sp_handler_package_spec, - $5, $1 | $4)))) + create_package_start(thd, &sp_handler_package_spec, + $5, $1 | $4, + Lex->sp_chistics)))) MYSQL_YYABORT; - pkg->set_c_chistics(Lex->sp_chistics); Lex->sphead->set_body_start(thd, YYLIP->get_cpp_tok_start()); } sp_tail_is opt_package_specification_element_list END - remember_end_opt opt_sp_name + remember_end_opt opt_trailing_sp_name { if (unlikely(Lex->create_package_finalize(thd, $5, $12, $11))) MYSQL_YYABORT; } - | create_or_replace definer_opt PACKAGE_ORACLE_SYM BODY_ORACLE_SYM + | create_or_replace definer_opt sp_handler_package_body opt_if_not_exists sp_name opt_create_package_chistics_init { sp_package *pkg; if (unlikely(!(pkg= Lex-> - create_package_start(thd, - SQLCOM_CREATE_PACKAGE_BODY, - &sp_handler_package_body, - $6, $1 | $5)))) + create_package_start(thd, &sp_handler_package_body, + $5, $1 | $4, + Lex->sp_chistics)))) MYSQL_YYABORT; - pkg->set_c_chistics(Lex->sp_chistics); Lex->sphead->set_body_start(thd, YYLIP->get_cpp_tok_start()); Lex->sp_block_init(thd); } sp_tail_is package_implementation_declare_section - { - if (unlikely(Lex->sp_block_with_exceptions_finalize_declarations(thd))) - MYSQL_YYABORT; - } package_implementation_executable_section { - $10.hndlrs+= $12.hndlrs; - if (unlikely(Lex->sp_block_finalize(thd, $10))) + $9.hndlrs+= $10.hndlrs; + if (unlikely(Lex->sp_block_finalize(thd, $9))) MYSQL_YYABORT; } - remember_end_opt opt_sp_name + remember_end_opt opt_trailing_sp_name { - if (unlikely(Lex->create_package_finalize(thd, $6, $15, $14))) + if (unlikely(Lex->create_package_finalize(thd, $5, $13, $12))) MYSQL_YYABORT; } ; + +%ifdef ORACLE + opt_sp_decl_body_list: _empty {