diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt
index caaa2aaf45d86..211a995db1aeb 100644
--- a/libmysqld/CMakeLists.txt
+++ b/libmysqld/CMakeLists.txt
@@ -156,6 +156,7 @@ SET(SQL_EMBEDDED_SOURCES emb_qcache.cc libmysqld.c lib_sql.cc
            ../sql/json_table.cc
            ../sql/opt_histogram_json.cc
            ../sql/sp_instr.cc
+           ../sql/sql_path.cc
            ${GEN_SOURCES}
            ${MYSYS_LIBWRAP_SOURCE}
 )
diff --git a/mysql-test/include/commit.inc b/mysql-test/include/commit.inc
index dbbd7459b524c..cbc542de55c31 100644
--- a/mysql-test/include/commit.inc
+++ b/mysql-test/include/commit.inc
@@ -413,7 +413,7 @@ flush status;
 
 --echo #
 --echo # Count of reading of p_verify_status_increment() from mysql.proc
-call p_verify_status_increment(2, 0, 2, 0);
+call p_verify_status_increment(4, 0, 2, 0);
 
 --echo #
 --echo # 1. Read-only statement: SELECT
@@ -581,7 +581,7 @@ call p_verify_status_increment(4, 0, 4, 0);
 --echo # the binary log. 
 --echo #
 select f1();
-call p_verify_status_increment(3, 0, 3, 0);
+call p_verify_status_increment(5, 0, 3, 0);
 commit;
 call p_verify_status_increment(1, 0, 1, 0);
 
@@ -620,14 +620,20 @@ create temporary table t2 (a int);
 # One commit for the create temporary table, and two for committing the
 # read of the stored procedure from Aria table (creating temporary table
 # clears the sp cache).
-call p_verify_status_increment(3, 0, 2, 0);
+# After the sp cache cleard, another two commits increased due to the read
+# of the stored procedure from mysql.proc table during the invocation of
+# p_verify_status_increment() with using new sql path resolution mechanism.
+call p_verify_status_increment(5, 0, 2, 0);
 set sql_mode=default;
 --echo # 19. A function changes temp-trans-table.
 --echo #
 select f1();
 --echo # Two commits because a binary log record is written, and another two
 --echo # as the function f1() is reloaded after creating temporary table.
-call p_verify_status_increment(4, 0, 3, 0);
+--echo # After the function f1() is reloaded, another two commits increased due
+--echo # to the read of the stored procedure from mysql.proc table during the
+--echo # invocation of f1() with using new sql path resolution mechanism.
+call p_verify_status_increment(6, 0, 3, 0);
 commit;
 call p_verify_status_increment(2, 0, 1, 0);
 
@@ -682,7 +688,10 @@ call p_verify_status_increment(2, 0, 1, 0);
 drop temporary table t2;
 # Dropping temporary table clears SP caches, so get another two commit
 # increments from loading the p_verify_status_increment procedure.
-call p_verify_status_increment(3, 0, 2, 0);
+# After the sp cache cleard, another two commits increased due to the read
+# of the stored procedure from mysql.proc table during the invocation of
+# p_verify_status_increment() with using new sql path resolution mechanism.
+call p_verify_status_increment(5, 0, 2, 0);
 commit;
 call p_verify_status_increment(1, 0, 0, 0);
 
@@ -733,7 +742,10 @@ call p_verify_status_increment(0, 0, 0, 0);
 do (select f1() from t1 where a=2);
 # Again extra 2 commit increments from re-loading function f1 after
 # dropping temporary table.
-call p_verify_status_increment(4, 2, 4, 2);
+# After the function f1() is reloaded, another two commits increased due
+# to the read of the stored procedure from mysql.proc table during the
+# invocation of f1() with using new sql path resolution mechanism.
+call p_verify_status_increment(6, 2, 4, 2);
 commit;
 call p_verify_status_increment(2, 2, 2, 2);
 
diff --git a/mysql-test/include/deselect_db.inc b/mysql-test/include/deselect_db.inc
new file mode 100644
index 0000000000000..eda2875245dcc
--- /dev/null
+++ b/mysql-test/include/deselect_db.inc
@@ -0,0 +1,4 @@
+# Drop the current db. This de-selects any db.
+CREATE DATABASE deselect_db;
+USE deselect_db;
+DROP DATABASE deselect_db;
diff --git a/mysql-test/main/commit_1innodb.result b/mysql-test/main/commit_1innodb.result
index 973be9fde0d0a..ee32938498365 100644
--- a/mysql-test/main/commit_1innodb.result
+++ b/mysql-test/main/commit_1innodb.result
@@ -387,7 +387,7 @@ end|
 flush status;
 #
 # Count of reading of p_verify_status_increment() from mysql.proc
-call p_verify_status_increment(2, 0, 2, 0);
+call p_verify_status_increment(4, 0, 2, 0);
 SUCCESS
 
 #
@@ -585,7 +585,7 @@ SUCCESS
 select f1();
 f1()
 2
-call p_verify_status_increment(3, 0, 3, 0);
+call p_verify_status_increment(5, 0, 3, 0);
 SUCCESS
 
 commit;
@@ -634,7 +634,7 @@ SUCCESS
 drop table t2;
 set sql_mode=no_engine_substitution;
 create temporary table t2 (a int);
-call p_verify_status_increment(3, 0, 2, 0);
+call p_verify_status_increment(5, 0, 2, 0);
 SUCCESS
 
 set sql_mode=default;
@@ -645,7 +645,10 @@ f1()
 2
 # Two commits because a binary log record is written, and another two
 # as the function f1() is reloaded after creating temporary table.
-call p_verify_status_increment(4, 0, 3, 0);
+# After the function f1() is reloaded, another two commits increased due
+# to the read of the stored procedure from mysql.proc table during the
+# invocation of f1() with using new sql path resolution mechanism.
+call p_verify_status_increment(6, 0, 3, 0);
 SUCCESS
 
 commit;
@@ -716,7 +719,7 @@ SUCCESS
 # 25. DDL: DROP TEMPORARY TABLE, does not start a transaction
 #
 drop temporary table t2;
-call p_verify_status_increment(3, 0, 2, 0);
+call p_verify_status_increment(5, 0, 2, 0);
 SUCCESS
 
 commit;
@@ -802,7 +805,7 @@ call p_verify_status_increment(0, 0, 0, 0);
 SUCCESS
 
 do (select f1() from t1 where a=2);
-call p_verify_status_increment(4, 2, 4, 2);
+call p_verify_status_increment(6, 2, 4, 2);
 SUCCESS
 
 commit;
diff --git a/mysql-test/main/lock_sync.result b/mysql-test/main/lock_sync.result
index 69958811d6885..6b6028578b863 100644
--- a/mysql-test/main/lock_sync.result
+++ b/mysql-test/main/lock_sync.result
@@ -743,13 +743,17 @@ CREATE VIEW v1 AS SELECT * FROM t1 WHERE f1() = 1;
 DROP FUNCTION f1;
 connect con2, localhost, root;
 connect  con1, localhost, root;
-SET DEBUG_SYNC= 'open_tables_after_open_and_process_table SIGNAL opened WAIT_FOR dropped EXECUTE 2';
+SET DEBUG_SYNC= 'open_tables_after_open_and_process_table SIGNAL opened WAIT_FOR dropped EXECUTE 4';
 # Sending:
 SHOW CREATE VIEW v1;
 connection con2;
 SET DEBUG_SYNC= 'now WAIT_FOR opened';
 SET DEBUG_SYNC= 'now SIGNAL dropped';
 SET DEBUG_SYNC= 'now WAIT_FOR opened';
+SET DEBUG_SYNC= 'now SIGNAL dropped';
+SET DEBUG_SYNC= 'now WAIT_FOR opened';
+SET DEBUG_SYNC= 'now SIGNAL dropped';
+SET DEBUG_SYNC= 'now WAIT_FOR opened';
 # Sending:
 FLUSH TABLES t1;
 connection default;
diff --git a/mysql-test/main/lock_sync.test b/mysql-test/main/lock_sync.test
index 844d00d3a33b7..51c220a8843d6 100644
--- a/mysql-test/main/lock_sync.test
+++ b/mysql-test/main/lock_sync.test
@@ -947,7 +947,7 @@ connect(con2, localhost, root);
 connect (con1, localhost, root);
 # Need to trigger this sync point at least twice in order to
 # get valgrind test failures without the patch
-SET DEBUG_SYNC= 'open_tables_after_open_and_process_table SIGNAL opened WAIT_FOR dropped EXECUTE 2';
+SET DEBUG_SYNC= 'open_tables_after_open_and_process_table SIGNAL opened WAIT_FOR dropped EXECUTE 4';
 --echo # Sending:
 --send SHOW CREATE VIEW v1
 
@@ -955,6 +955,12 @@ connection con2;
 SET DEBUG_SYNC= 'now WAIT_FOR opened';
 SET DEBUG_SYNC= 'now SIGNAL dropped';
 SET DEBUG_SYNC= 'now WAIT_FOR opened';
+# Increase the count of sync point to 4 from 2 due to the new sql path
+# need to perform the db + routine/package lookup
+SET DEBUG_SYNC= 'now SIGNAL dropped';
+SET DEBUG_SYNC= 'now WAIT_FOR opened';
+SET DEBUG_SYNC= 'now SIGNAL dropped';
+SET DEBUG_SYNC= 'now WAIT_FOR opened';
 --echo # Sending:
 --send FLUSH TABLES t1
 
diff --git a/mysql-test/main/mysqld--help.result b/mysql-test/main/mysqld--help.result
index 00fbdf55eba79..c89a89d2a565c 100644
--- a/mysql-test/main/mysqld--help.result
+++ b/mysql-test/main/mysqld--help.result
@@ -915,6 +915,7 @@ The following specify which files/extra groups are read (specified before remain
  Cost of checking the row against the WHERE clause.
  Increasing this will have the optimizer to prefer plans
  with less row combinations
+ --path=name         SET PATH statement
  --performance-schema 
  Enable the performance schema
  --performance-schema-accounts-size=# 
@@ -1885,6 +1886,7 @@ optimizer-trace
 optimizer-trace-max-mem-size 1048576
 optimizer-use-condition-selectivity 4
 optimizer-where-cost 0.032
+path (No default value)
 performance-schema FALSE
 performance-schema-accounts-size -1
 performance-schema-consumer-events-stages-current FALSE
diff --git a/mysql-test/main/path_resolution.result b/mysql-test/main/path_resolution.result
new file mode 100644
index 0000000000000..07b32e40626a8
--- /dev/null
+++ b/mysql-test/main/path_resolution.result
@@ -0,0 +1,3006 @@
+#
+# MDEV-34391 Path resolution
+#
+CREATE DATABASE test2;
+#
+# type 1.1
+# sql_mode: DEFAULT | function | is unqualified
+# curr db: X | path set: no
+#
+CREATE FUNCTION func() RETURNS TEXT RETURN 'Invoke from Db: test, Rt: func';
+CREATE DATABASE deselect_db;
+USE deselect_db;
+DROP DATABASE deselect_db;
+SELECT func();
+ERROR 42000: FUNCTION func does not exist
+#
+# type 1.2
+# sql_mode: DEFAULT | function | is unqualified
+# curr db: X | path set: yes
+#
+SET PATH= 'sys,test';
+SELECT func();
+func()
+Invoke from Db: test, Rt: func
+SET @@path = DEFAULT;
+#
+# type 1.3
+# sql_mode: DEFAULT | function | is unqualified
+# curr db: test2 | path set: no
+#
+USE test2;
+SELECT func();
+ERROR 42000: FUNCTION test2.func does not exist
+#
+# type 1.4
+# sql_mode: DEFAULT | function | is unqualified
+# curr db: test2 | path set: yes
+#
+SET PATH= 'sys,test';
+USE test2;
+SELECT func();
+func()
+Invoke from Db: test, Rt: func
+SET @@path = DEFAULT;
+#
+# type 1.5
+# sql_mode: DEFAULT | function | is unqualified
+# curr db: X | path set: yes
+# lookup in between 2 unqualified functions with exactly the same name in different 2 databases
+#
+USE test2;
+CREATE FUNCTION func() RETURNS TEXT RETURN 'Invoke from Db: test2, Rt: func';
+CREATE DATABASE deselect_db;
+USE deselect_db;
+DROP DATABASE deselect_db;
+SET PATH= 'test,test2';
+SELECT func();
+func()
+Invoke from Db: test, Rt: func
+SET PATH= 'test2,test';
+SELECT func();
+func()
+Invoke from Db: test2, Rt: func
+DROP FUNCTION test2.func;
+SELECT func();
+func()
+Invoke from Db: test, Rt: func
+DROP FUNCTION test.func;
+SELECT func();
+ERROR 42000: FUNCTION func does not exist
+SET @@path = DEFAULT;
+#
+# type 1.6
+# sql_mode: DEFAULT | function | is unqualified
+# curr db: test2 | path set: yes
+# lookup in between 2 unqualified functions with exactly the same name in different 2 databases
+#
+USE test;
+CREATE FUNCTION func() RETURNS TEXT RETURN 'Invoke from Db: test, Rt: func';
+SET PATH= 'sys,test';
+USE test2;
+SELECT func();
+func()
+Invoke from Db: test, Rt: func
+CREATE FUNCTION func() RETURNS TEXT RETURN 'Invoke from Db: test2, Rt: func';
+SELECT func();
+func()
+Invoke from Db: test2, Rt: func
+DROP FUNCTION func;
+SELECT func();
+func()
+Invoke from Db: test, Rt: func
+DROP FUNCTION test.func;
+SELECT func();
+ERROR 42000: FUNCTION test2.func does not exist
+SET @@path = DEFAULT;
+#
+# type 1.7
+# sql_mode: DEFAULT | function | is unqualified
+# curr db: X | path set: yes
+# to test unqualified function invocation in an unqualified function
+#
+SET PATH= 'test,test2';
+USE test2;
+CREATE FUNCTION func() RETURNS TEXT RETURN 'Invoke from Db: test2, Rt: func';
+USE test;
+CREATE FUNCTION func_call_func() RETURNS TEXT RETURN func();
+CREATE DATABASE deselect_db;
+USE deselect_db;
+DROP DATABASE deselect_db;
+SELECT func_call_func();
+func_call_func()
+Invoke from Db: test2, Rt: func
+USE test;
+CREATE FUNCTION func() RETURNS TEXT RETURN 'Invoke from Db: test, Rt: func';
+CREATE DATABASE deselect_db;
+USE deselect_db;
+DROP DATABASE deselect_db;
+SELECT func_call_func();
+func_call_func()
+Invoke from Db: test, Rt: func
+DROP FUNCTION test.func;
+SELECT func_call_func();
+func_call_func()
+Invoke from Db: test2, Rt: func
+DROP FUNCTION test2.func;
+SELECT func_call_func();
+ERROR 42000: FUNCTION test.func does not exist
+USE test;
+DROP FUNCTION func_call_func;
+SET @@path = DEFAULT;
+#
+# type 1.8
+# sql_mode: DEFAULT | function | is unqualified
+# curr db: test | path set: yes
+# to test unqualified function invocation in an unqualified function
+#
+SET PATH= 'sys,test2';
+USE test2;
+CREATE FUNCTION func() RETURNS TEXT RETURN 'Invoke from Db: test2, Rt: func';
+USE test;
+CREATE FUNCTION func_call_func() RETURNS TEXT RETURN func();
+SELECT func_call_func();
+func_call_func()
+Invoke from Db: test2, Rt: func
+CREATE FUNCTION func() RETURNS TEXT RETURN 'Invoke from Db: test, Rt: func';
+SELECT func_call_func();
+func_call_func()
+Invoke from Db: test, Rt: func
+DROP FUNCTION func;
+SELECT func_call_func();
+func_call_func()
+Invoke from Db: test2, Rt: func
+DROP FUNCTION test2.func;
+SELECT func_call_func();
+ERROR 42000: FUNCTION test.func does not exist
+USE test;
+DROP FUNCTION func_call_func;
+SET @@path = DEFAULT;
+#
+# type 2.1
+# sql_mode: DEFAULT | function | is qualified
+# curr db: X | path set: no
+#
+USE test;
+CREATE PACKAGE pack
+FUNCTION func() RETURNS TEXT;
+END;
+$$
+CREATE PACKAGE BODY pack
+FUNCTION func() RETURNS TEXT RETURN 'Invoke from Db: test, Pack: pack, Rt: func';
+END;
+$$
+CREATE DATABASE deselect_db;
+USE deselect_db;
+DROP DATABASE deselect_db;
+SELECT pack.func();
+ERROR 42000: FUNCTION pack.func does not exist
+#
+# type 2.2
+# sql_mode: DEFAULT | function | is qualified
+# curr db: X | path set: yes
+#
+SET PATH= 'sys,test';
+SELECT pack.func();
+pack.func()
+Invoke from Db: test, Pack: pack, Rt: func
+SET @@path = DEFAULT;
+#
+# type 2.3
+# sql_mode: DEFAULT | function | is qualified
+# curr db: test2 | path set: no
+#
+USE test2;
+SELECT pack.func();
+ERROR 42000: FUNCTION pack.func does not exist
+#
+# type 2.4
+# sql_mode: DEFAULT | function | is qualified
+# curr db: test2 | path set: yes
+#
+SET PATH= 'sys,test';
+USE test2;
+SELECT pack.func();
+pack.func()
+Invoke from Db: test, Pack: pack, Rt: func
+SET @@path = DEFAULT;
+#
+# type 2.5
+# sql_mode: DEFAULT | function | is qualified
+# curr db: X | path set: yes
+# lookup in between 2 qualified packages function with exactly the same name in different 2 databases
+#
+USE test2;
+CREATE PACKAGE pack
+FUNCTION func() RETURNS TEXT;
+END;
+$$
+CREATE PACKAGE BODY pack
+FUNCTION func() RETURNS TEXT RETURN 'Invoke from Db: test2, Pack: pack, Rt: func';
+END;
+$$
+CREATE DATABASE deselect_db;
+USE deselect_db;
+DROP DATABASE deselect_db;
+SET PATH= 'test,test2';
+SELECT pack.func();
+pack.func()
+Invoke from Db: test, Pack: pack, Rt: func
+SET PATH= 'test2,test';
+SELECT pack.func();
+pack.func()
+Invoke from Db: test2, Pack: pack, Rt: func
+DROP PACKAGE BODY test2.pack;
+DROP PACKAGE test2.pack;
+SELECT pack.func();
+pack.func()
+Invoke from Db: test, Pack: pack, Rt: func
+DROP PACKAGE BODY test.pack;
+DROP PACKAGE test.pack;
+SELECT pack.func();
+ERROR 42000: FUNCTION pack.func does not exist
+SET @@path = DEFAULT;
+#
+# type 2.6
+# sql_mode: DEFAULT | function | is qualified
+# curr db: test2 | path set: yes
+# lookup in between 2 qualified packages function with exactly the same name in different 2 databases
+#
+USE test;
+CREATE PACKAGE pack
+FUNCTION func() RETURNS TEXT;
+END;
+$$
+CREATE PACKAGE BODY pack
+FUNCTION func() RETURNS TEXT RETURN 'Invoke from Db: test, Pack: pack, Rt: func';
+END;
+$$
+SET PATH= 'sys,test';
+USE test2;
+SELECT pack.func();
+pack.func()
+Invoke from Db: test, Pack: pack, Rt: func
+CREATE PACKAGE pack
+FUNCTION func() RETURNS TEXT;
+END;
+$$
+CREATE PACKAGE BODY pack
+FUNCTION func() RETURNS TEXT RETURN 'Invoke from Db: test2, Pack: pack, Rt: func';
+END;
+$$
+SELECT pack.func();
+pack.func()
+Invoke from Db: test2, Pack: pack, Rt: func
+DROP PACKAGE BODY pack;
+DROP PACKAGE pack;
+SELECT pack.func();
+pack.func()
+Invoke from Db: test, Pack: pack, Rt: func
+DROP PACKAGE BODY test.pack;
+DROP PACKAGE test.pack;
+SELECT pack.func();
+ERROR 42000: FUNCTION pack.func does not exist
+SET @@path = DEFAULT;
+#
+# type 2.7
+# sql_mode: DEFAULT | function | is qualified
+# curr db: X | path set: yes
+# to test unqualified function invocation in a qualified package function
+#
+SET PATH= 'test,test2';
+USE test2;
+CREATE FUNCTION func_local() RETURNS TEXT RETURN 'Invoke from Db: test2, Rt: func_local';
+USE test;
+CREATE PACKAGE pack
+FUNCTION func() RETURNS TEXT;
+END;
+$$
+CREATE PACKAGE BODY pack
+FUNCTION func() RETURNS TEXT RETURN func_local();
+END;
+$$
+CREATE DATABASE deselect_db;
+USE deselect_db;
+DROP DATABASE deselect_db;
+SELECT pack.func();
+pack.func()
+Invoke from Db: test2, Rt: func_local
+USE test;
+CREATE FUNCTION func_local() RETURNS TEXT RETURN 'Invoke from Db: test, Rt: func_local';
+CREATE DATABASE deselect_db;
+USE deselect_db;
+DROP DATABASE deselect_db;
+SELECT pack.func();
+pack.func()
+Invoke from Db: test, Rt: func_local
+DROP FUNCTION test.func_local;
+SELECT pack.func();
+pack.func()
+Invoke from Db: test2, Rt: func_local
+DROP FUNCTION test2.func_local;
+SELECT pack.func();
+ERROR 42000: FUNCTION test.func_local does not exist
+USE test;
+DROP PACKAGE BODY pack;
+DROP PACKAGE pack;
+SET @@path = DEFAULT;
+#
+# type 2.8
+# sql_mode: DEFAULT | function | is qualified
+# curr db: test | path set: yes
+# to test unqualified function invocation in a qualified package function
+#
+SET PATH= 'test,test2';
+USE test2;
+CREATE FUNCTION func_local() RETURNS TEXT RETURN 'Invoke from Db: test2, Rt: func_local';
+USE test;
+CREATE PACKAGE pack
+FUNCTION func() RETURNS TEXT;
+END;
+$$
+CREATE PACKAGE BODY pack
+FUNCTION func() RETURNS TEXT RETURN func_local();
+END;
+$$
+SELECT pack.func();
+pack.func()
+Invoke from Db: test2, Rt: func_local
+CREATE FUNCTION func_local() RETURNS TEXT RETURN 'Invoke from Db: test, Rt: func_local';
+SELECT pack.func();
+pack.func()
+Invoke from Db: test, Rt: func_local
+DROP FUNCTION func_local;
+SELECT pack.func();
+pack.func()
+Invoke from Db: test2, Rt: func_local
+DROP FUNCTION test2.func_local;
+SELECT pack.func();
+ERROR 42000: FUNCTION test.func_local does not exist
+USE test;
+DROP PACKAGE BODY pack;
+DROP PACKAGE pack;
+SET @@path = DEFAULT;
+#
+# type 2.9
+# sql_mode: DEFAULT | function | is qualified
+# curr db: X | path set: yes
+# to test qualified package function invocation in a qualified package function
+#
+SET PATH= 'test,test2';
+USE test2;
+CREATE PACKAGE pack2
+FUNCTION func() RETURNS TEXT;
+END;
+$$
+CREATE PACKAGE BODY pack2
+FUNCTION func() RETURNS TEXT RETURN 'Invoke from Db: test2, Pack: pack2, Rt: func';
+END;
+$$
+USE test;
+CREATE PACKAGE pack
+FUNCTION func() RETURNS TEXT;
+END;
+$$
+CREATE PACKAGE BODY pack
+FUNCTION func() RETURNS TEXT RETURN pack2.func();
+END;
+$$
+CREATE DATABASE deselect_db;
+USE deselect_db;
+DROP DATABASE deselect_db;
+SELECT pack.func();
+pack.func()
+Invoke from Db: test2, Pack: pack2, Rt: func
+USE test;
+CREATE PACKAGE pack2
+FUNCTION func() RETURNS TEXT;
+END;
+$$
+CREATE PACKAGE BODY pack2
+FUNCTION func() RETURNS TEXT RETURN 'Invoke from Db: test, Pack: pack2, Rt: func';
+END;
+$$
+CREATE DATABASE deselect_db;
+USE deselect_db;
+DROP DATABASE deselect_db;
+SELECT pack.func();
+pack.func()
+Invoke from Db: test, Pack: pack2, Rt: func
+DROP PACKAGE BODY test.pack2;
+DROP PACKAGE test.pack2;
+SELECT pack.func();
+pack.func()
+Invoke from Db: test2, Pack: pack2, Rt: func
+DROP PACKAGE BODY test2.pack2;
+DROP PACKAGE test2.pack2;
+SELECT pack.func();
+ERROR 42000: FUNCTION pack2.func does not exist
+USE test;
+DROP PACKAGE BODY pack;
+DROP PACKAGE pack;
+SET @@path = DEFAULT;
+#
+# type 2.10
+# sql_mode: DEFAULT | function | is qualified
+# curr db: test | path set: yes
+# to test qualified package function invocation in a qualified package function
+#
+SET PATH= 'sys,test2';
+USE test2;
+CREATE PACKAGE pack2
+FUNCTION func() RETURNS TEXT;
+END;
+$$
+CREATE PACKAGE BODY pack2
+FUNCTION func() RETURNS TEXT RETURN 'Invoke from Db: test2, Pack: pack2, Rt: func';
+END;
+$$
+USE test;
+CREATE PACKAGE pack
+FUNCTION func() RETURNS TEXT;
+END;
+$$
+CREATE PACKAGE BODY pack
+FUNCTION func() RETURNS TEXT RETURN pack2.func();
+END;
+$$
+SELECT pack.func();
+pack.func()
+Invoke from Db: test2, Pack: pack2, Rt: func
+CREATE PACKAGE pack2
+FUNCTION func() RETURNS TEXT;
+END;
+$$
+CREATE PACKAGE BODY pack2
+FUNCTION func() RETURNS TEXT RETURN 'Invoke from Db: test, Pack: pack2, Rt: func';
+END;
+$$
+SELECT pack.func();
+pack.func()
+Invoke from Db: test, Pack: pack2, Rt: func
+DROP PACKAGE BODY pack2;
+DROP PACKAGE pack2;
+SELECT pack.func();
+pack.func()
+Invoke from Db: test2, Pack: pack2, Rt: func
+DROP PACKAGE BODY test2.pack2;
+DROP PACKAGE test2.pack2;
+SELECT pack.func();
+ERROR 42000: FUNCTION pack2.func does not exist
+USE test;
+DROP PACKAGE BODY pack;
+DROP PACKAGE pack;
+SET @@path = DEFAULT;
+#
+# type 2.11
+# sql_mode: DEFAULT | function | is qualified
+# curr db: X | path set: yes
+# resolution priority in between qualified package function vs qualified db function resolution
+#
+USE test;
+CREATE PACKAGE pack
+FUNCTION func() RETURNS TEXT;
+END;
+$$
+CREATE PACKAGE BODY pack
+FUNCTION func() RETURNS TEXT RETURN 'Invoke from Db: test, Pack: pack, Rt: func';
+END;
+$$
+CREATE DATABASE pack;
+USE pack;
+CREATE FUNCTION func() RETURNS TEXT RETURN 'Invoke from Db: pack, Rt: func';
+CREATE DATABASE deselect_db;
+USE deselect_db;
+DROP DATABASE deselect_db;
+SELECT pack.func();
+pack.func()
+Invoke from Db: pack, Rt: func
+SET PATH= 'sys,test';
+SELECT pack.func();
+pack.func()
+Invoke from Db: test, Pack: pack, Rt: func
+DROP PACKAGE BODY test.pack;
+DROP PACKAGE test.pack;
+SELECT pack.func();
+pack.func()
+Invoke from Db: pack, Rt: func
+DROP FUNCTION pack.func;
+SELECT pack.func();
+ERROR 42000: FUNCTION pack.func does not exist
+SET @@path = DEFAULT;
+#
+# type 2.12
+# sql_mode: DEFAULT | function | is qualified
+# curr db: test | path set: yes
+# resolution priority in between qualified package function vs qualified db function resolution
+#
+USE test;
+CREATE PACKAGE pack
+FUNCTION func() RETURNS TEXT;
+END;
+$$
+CREATE PACKAGE BODY pack
+FUNCTION func() RETURNS TEXT RETURN 'Invoke from Db: test, Pack: pack, Rt: func';
+END;
+$$
+USE pack;
+CREATE FUNCTION func() RETURNS TEXT RETURN 'Invoke from Db: pack, Rt: func';
+USE test;
+SELECT pack.func();
+pack.func()
+Invoke from Db: test, Pack: pack, Rt: func
+DROP PACKAGE BODY pack;
+DROP PACKAGE pack;
+SELECT pack.func();
+pack.func()
+Invoke from Db: pack, Rt: func
+DROP FUNCTION pack.func;
+SELECT pack.func();
+ERROR 42000: FUNCTION pack.func does not exist
+SET @@path = DEFAULT;
+#
+# type 2.13
+# sql_mode: DEFAULT | function | is qualified
+# curr db: test2 | path set: yes
+# resolution priority in between qualified package function vs qualified db function resolution
+#
+USE test;
+CREATE PACKAGE pack
+FUNCTION func() RETURNS TEXT;
+END;
+$$
+CREATE PACKAGE BODY pack
+FUNCTION func() RETURNS TEXT RETURN 'Invoke from Db: test, Pack: pack, Rt: func';
+END;
+$$
+USE pack;
+CREATE FUNCTION func() RETURNS TEXT RETURN 'Invoke from Db: pack, Rt: func';
+USE test2;
+SELECT pack.func();
+pack.func()
+Invoke from Db: pack, Rt: func
+SET PATH= 'sys,test';
+SELECT pack.func();
+pack.func()
+Invoke from Db: test, Pack: pack, Rt: func
+DROP PACKAGE BODY test.pack;
+DROP PACKAGE test.pack;
+SELECT pack.func();
+pack.func()
+Invoke from Db: pack, Rt: func
+DROP FUNCTION pack.func;
+SELECT pack.func();
+ERROR 42000: FUNCTION pack.func does not exist
+DROP DATABASE pack;
+SET @@path = DEFAULT;
+#
+# type 2.14
+# sql_mode: DEFAULT | function | is qualified
+# curr db: X | path set: yes
+# qualified package function invoke internal private function
+#
+SET PATH= 'test,test2';
+USE test2;
+CREATE FUNCTION func_prv() RETURNS TEXT RETURN 'Invoke from Db: test2, Rt: func_prv';
+USE test;
+CREATE FUNCTION func_prv() RETURNS TEXT RETURN 'Invoke from Db: test, Rt: func_prv';
+CREATE PACKAGE pack
+FUNCTION func_pub() RETURNS TEXT;
+END;
+$$
+CREATE PACKAGE BODY pack
+FUNCTION func_prv() RETURNS TEXT RETURN 'Invoke from Db: test, Pack: pack, Rt: func_prv';
+FUNCTION func_pub() RETURNS TEXT RETURN func_prv();
+END;
+$$
+CREATE DATABASE deselect_db;
+USE deselect_db;
+DROP DATABASE deselect_db;
+SELECT pack.func_pub();
+pack.func_pub()
+Invoke from Db: test, Pack: pack, Rt: func_prv
+SET @@path = DEFAULT;
+#
+# type 2.15
+# sql_mode: DEFAULT | function | is qualified
+# curr db: test2 | path set: yes
+# qualified package function invoke internal private function
+#
+SET PATH= 'test,test2';
+USE test2;
+SELECT pack.func_pub();
+pack.func_pub()
+Invoke from Db: test, Pack: pack, Rt: func_prv
+DROP FUNCTION func_prv;
+USE test;
+DROP FUNCTION func_prv;
+DROP PACKAGE BODY pack;
+DROP PACKAGE pack;
+SET @@path = DEFAULT;
+#
+# type 3.1
+# sql_mode: DEFAULT | procedure | is unqualified
+# curr db: X | path set: no
+#
+CREATE PROCEDURE proc() SELECT 'Invoke from Db: test, Rt: proc';
+CREATE DATABASE deselect_db;
+USE deselect_db;
+DROP DATABASE deselect_db;
+CALL proc;
+ERROR 3D000: No database selected
+#
+# type 3.2
+# sql_mode: DEFAULT | procedure | is unqualified
+# curr db: X | path set: yes
+#
+SET PATH= 'sys,test';
+CALL proc;
+Invoke from Db: test, Rt: proc
+Invoke from Db: test, Rt: proc
+SET @@path = DEFAULT;
+#
+# type 3.3
+# sql_mode: DEFAULT | procedure | is unqualified
+# curr db: test2 | path set: no
+#
+USE test2;
+CALL proc;
+ERROR 42000: PROCEDURE test2.proc does not exist
+#
+# type 3.4
+# sql_mode: DEFAULT | procedure | is unqualified
+# curr db: test2 | path set: yes
+#
+SET PATH= 'sys,test';
+USE test2;
+CALL proc;
+Invoke from Db: test, Rt: proc
+Invoke from Db: test, Rt: proc
+SET @@path = DEFAULT;
+#
+# type 3.5
+# sql_mode: DEFAULT | procedure | is unqualified
+# curr db: X | path set: yes
+# lookup in between 2 unqualified procedures with exactly the same name in different 2 databases
+#
+USE test2;
+CREATE PROCEDURE proc() SELECT 'Invoke from Db: test2, Rt: proc';
+CREATE DATABASE deselect_db;
+USE deselect_db;
+DROP DATABASE deselect_db;
+SET PATH= 'test,test2';
+CALL proc;
+Invoke from Db: test, Rt: proc
+Invoke from Db: test, Rt: proc
+SET PATH= 'test2,test';
+CALL proc;
+Invoke from Db: test2, Rt: proc
+Invoke from Db: test2, Rt: proc
+DROP PROCEDURE test2.proc;
+CALL proc;
+Invoke from Db: test, Rt: proc
+Invoke from Db: test, Rt: proc
+DROP PROCEDURE test.proc;
+CALL proc;
+ERROR 3D000: No database selected
+SET @@path = DEFAULT;
+#
+# type 3.6
+# sql_mode: DEFAULT | procedure | is unqualified
+# curr db: test2 | path set: yes
+# lookup in between 2 unqualified procedures with exactly the same name in different 2 databases
+#
+USE test;
+CREATE PROCEDURE proc() SELECT 'Invoke from Db: test, Rt: proc';
+SET PATH= 'sys,test';
+USE test2;
+CALL proc;
+Invoke from Db: test, Rt: proc
+Invoke from Db: test, Rt: proc
+CREATE PROCEDURE proc() SELECT 'Invoke from Db: test2, Rt: proc';
+CALL proc;
+Invoke from Db: test2, Rt: proc
+Invoke from Db: test2, Rt: proc
+DROP PROCEDURE proc;
+CALL proc;
+Invoke from Db: test, Rt: proc
+Invoke from Db: test, Rt: proc
+DROP PROCEDURE test.proc;
+CALL proc;
+ERROR 42000: PROCEDURE test2.proc does not exist
+SET @@path = DEFAULT;
+#
+# type 3.7
+# sql_mode: DEFAULT | procedure | is unqualified
+# curr db: X | path set: yes
+# to test unqualified procedure invocation in an unqualified procedure
+#
+SET PATH= 'test,test2';
+USE test2;
+CREATE PROCEDURE proc() SELECT 'Invoke from Db: test2, Rt: proc';
+USE test;
+CREATE PROCEDURE proc_call_proc() CALL proc;
+CREATE DATABASE deselect_db;
+USE deselect_db;
+DROP DATABASE deselect_db;
+CALL proc_call_proc;
+Invoke from Db: test2, Rt: proc
+Invoke from Db: test2, Rt: proc
+USE test;
+CREATE PROCEDURE proc() SELECT 'Invoke from Db: test, Rt: proc';
+CREATE DATABASE deselect_db;
+USE deselect_db;
+DROP DATABASE deselect_db;
+CALL proc_call_proc;
+Invoke from Db: test, Rt: proc
+Invoke from Db: test, Rt: proc
+DROP PROCEDURE test.proc;
+CALL proc_call_proc;
+Invoke from Db: test2, Rt: proc
+Invoke from Db: test2, Rt: proc
+DROP PROCEDURE test2.proc;
+CALL proc_call_proc;
+ERROR 42000: PROCEDURE test.proc does not exist
+USE test;
+DROP PROCEDURE proc_call_proc;
+SET @@path = DEFAULT;
+#
+# type 3.8
+# sql_mode: DEFAULT | procedure | is unqualified
+# curr db: test | path set: yes
+# to test unqualified procedure invocation in an unqualified procedure
+#
+SET PATH= 'sys,test2';
+USE test2;
+CREATE PROCEDURE proc() SELECT 'Invoke from Db: test2, Rt: proc';
+USE test;
+CREATE PROCEDURE proc_call_proc() CALL proc;
+CALL proc_call_proc;
+Invoke from Db: test2, Rt: proc
+Invoke from Db: test2, Rt: proc
+CREATE PROCEDURE proc() SELECT 'Invoke from Db: test, Rt: proc';
+CALL proc_call_proc;
+Invoke from Db: test, Rt: proc
+Invoke from Db: test, Rt: proc
+DROP PROCEDURE proc;
+CALL proc_call_proc;
+Invoke from Db: test2, Rt: proc
+Invoke from Db: test2, Rt: proc
+DROP PROCEDURE test2.proc;
+CALL proc_call_proc;
+ERROR 42000: PROCEDURE test.proc does not exist
+USE test;
+DROP PROCEDURE proc_call_proc;
+SET @@path = DEFAULT;
+#
+# type 4.1
+# sql_mode: DEFAULT | procedure | is qualified
+# curr db: X | path set: no
+#
+USE test;
+CREATE PACKAGE pack
+PROCEDURE proc();
+END;
+$$
+CREATE PACKAGE BODY pack
+PROCEDURE proc() SELECT 'Invoke from Db: test, Pack: pack, Rt: proc';
+END;
+$$
+CREATE DATABASE deselect_db;
+USE deselect_db;
+DROP DATABASE deselect_db;
+CALL pack.proc;
+ERROR 42000: PROCEDURE pack.proc does not exist
+#
+# type 4.2
+# sql_mode: DEFAULT | procedure | is qualified
+# curr db: X | path set: yes
+#
+SET PATH= 'sys,test';
+CALL pack.proc;
+Invoke from Db: test, Pack: pack, Rt: proc
+Invoke from Db: test, Pack: pack, Rt: proc
+SET @@path = DEFAULT;
+#
+# type 4.3
+# sql_mode: DEFAULT | procedure | is qualified
+# curr db: test2 | path set: no
+#
+USE test2;
+CALL pack.proc;
+ERROR 42000: PROCEDURE pack.proc does not exist
+#
+# type 4.4
+# sql_mode: DEFAULT | procedure | is qualified
+# curr db: test2 | path set: yes
+#
+SET PATH= 'sys,test';
+USE test2;
+CALL pack.proc;
+Invoke from Db: test, Pack: pack, Rt: proc
+Invoke from Db: test, Pack: pack, Rt: proc
+SET @@path = DEFAULT;
+#
+# type 4.5
+# sql_mode: DEFAULT | procedure | is qualified
+# curr db: X | path set: yes
+# lookup in between 2 qualified packages procedure with exactly the same name in different 2 databases
+#
+USE test2;
+CREATE PACKAGE pack
+PROCEDURE proc();
+END;
+$$
+CREATE PACKAGE BODY pack
+PROCEDURE proc() SELECT 'Invoke from Db: test2, Pack: pack, Rt: proc';
+END;
+$$
+CREATE DATABASE deselect_db;
+USE deselect_db;
+DROP DATABASE deselect_db;
+SET PATH= 'test,test2';
+CALL pack.proc;
+Invoke from Db: test, Pack: pack, Rt: proc
+Invoke from Db: test, Pack: pack, Rt: proc
+SET PATH= 'test2,test';
+CALL pack.proc;
+Invoke from Db: test2, Pack: pack, Rt: proc
+Invoke from Db: test2, Pack: pack, Rt: proc
+DROP PACKAGE BODY test2.pack;
+DROP PACKAGE test2.pack;
+CALL pack.proc;
+Invoke from Db: test, Pack: pack, Rt: proc
+Invoke from Db: test, Pack: pack, Rt: proc
+DROP PACKAGE BODY test.pack;
+DROP PACKAGE test.pack;
+CALL pack.proc;
+ERROR 42000: PROCEDURE pack.proc does not exist
+SET @@path = DEFAULT;
+#
+# type 4.6
+# sql_mode: DEFAULT | procedure | is qualified
+# curr db: test2 | path set: yes
+# lookup in between 2 qualified packages procedure with exactly the same name in different 2 databases
+#
+USE test;
+CREATE PACKAGE pack
+PROCEDURE proc();
+END;
+$$
+CREATE PACKAGE BODY pack
+PROCEDURE proc() SELECT 'Invoke from Db: test, Pack: pack, Rt: proc';
+END;
+$$
+SET PATH= 'sys,test';
+USE test2;
+CALL pack.proc;
+Invoke from Db: test, Pack: pack, Rt: proc
+Invoke from Db: test, Pack: pack, Rt: proc
+CREATE PACKAGE pack
+PROCEDURE proc();
+END;
+$$
+CREATE PACKAGE BODY pack
+PROCEDURE proc() SELECT 'Invoke from Db: test2, Pack: pack, Rt: proc';
+END;
+$$
+CALL pack.proc;
+Invoke from Db: test2, Pack: pack, Rt: proc
+Invoke from Db: test2, Pack: pack, Rt: proc
+DROP PACKAGE BODY pack;
+DROP PACKAGE pack;
+CALL pack.proc;
+Invoke from Db: test, Pack: pack, Rt: proc
+Invoke from Db: test, Pack: pack, Rt: proc
+DROP PACKAGE BODY test.pack;
+DROP PACKAGE test.pack;
+CALL pack.proc;
+ERROR 42000: PROCEDURE pack.proc does not exist
+SET @@path = DEFAULT;
+#
+# type 4.7
+# sql_mode: DEFAULT | procedure | is qualified
+# curr db: X | path set: yes
+# to test unqualified procedure invocation in a qualified package procedure
+#
+SET PATH= 'test,test2';
+USE test2;
+CREATE PROCEDURE proc_local() SELECT 'Invoke from Db: test2, Rt: proc_local';
+USE test;
+CREATE PACKAGE pack
+PROCEDURE proc();
+END;
+$$
+CREATE PACKAGE BODY pack
+PROCEDURE proc() CALL proc_local;
+END;
+$$
+CREATE DATABASE deselect_db;
+USE deselect_db;
+DROP DATABASE deselect_db;
+CALL pack.proc;
+Invoke from Db: test2, Rt: proc_local
+Invoke from Db: test2, Rt: proc_local
+USE test;
+CREATE PROCEDURE proc_local() SELECT 'Invoke from Db: test, Rt: proc_local';
+CREATE DATABASE deselect_db;
+USE deselect_db;
+DROP DATABASE deselect_db;
+CALL pack.proc;
+Invoke from Db: test, Rt: proc_local
+Invoke from Db: test, Rt: proc_local
+DROP PROCEDURE test.proc_local;
+CALL pack.proc;
+Invoke from Db: test2, Rt: proc_local
+Invoke from Db: test2, Rt: proc_local
+DROP PROCEDURE test2.proc_local;
+CALL pack.proc;
+ERROR 42000: PROCEDURE test.proc_local does not exist
+USE test;
+DROP PACKAGE BODY pack;
+DROP PACKAGE pack;
+SET @@path = DEFAULT;
+#
+# type 4.8
+# sql_mode: DEFAULT | procedure | is qualified
+# curr db: test | path set: yes
+# to test unqualified procedure invocation in a qualified package procedure
+#
+SET PATH= 'test,test2';
+USE test2;
+CREATE PROCEDURE proc_local() SELECT 'Invoke from Db: test2, Rt: proc_local';
+USE test;
+CREATE PACKAGE pack
+PROCEDURE proc();
+END;
+$$
+CREATE PACKAGE BODY pack
+PROCEDURE proc() CALL proc_local;
+END;
+$$
+CALL pack.proc;
+Invoke from Db: test2, Rt: proc_local
+Invoke from Db: test2, Rt: proc_local
+CREATE PROCEDURE proc_local() SELECT 'Invoke from Db: test, Rt: proc_local';
+CALL pack.proc;
+Invoke from Db: test, Rt: proc_local
+Invoke from Db: test, Rt: proc_local
+DROP PROCEDURE proc_local;
+CALL pack.proc;
+Invoke from Db: test2, Rt: proc_local
+Invoke from Db: test2, Rt: proc_local
+DROP PROCEDURE test2.proc_local;
+CALL pack.proc;
+ERROR 42000: PROCEDURE test.proc_local does not exist
+USE test;
+DROP PACKAGE BODY pack;
+DROP PACKAGE pack;
+SET @@path = DEFAULT;
+#
+# type 4.9
+# sql_mode: DEFAULT | procedure | is qualified
+# curr db: X | path set: yes
+# to test qualified package procedure invocation in a qualified package procedure
+#
+SET PATH= 'test,test2';
+USE test2;
+CREATE PACKAGE pack2
+PROCEDURE proc();
+END;
+$$
+CREATE PACKAGE BODY pack2
+PROCEDURE proc() SELECT 'Invoke from Db: test2, Pack: pack2, Rt: proc';
+END;
+$$
+USE test;
+CREATE PACKAGE pack
+PROCEDURE proc();
+END;
+$$
+CREATE PACKAGE BODY pack
+PROCEDURE proc() CALL pack2.proc;
+END;
+$$
+CREATE DATABASE deselect_db;
+USE deselect_db;
+DROP DATABASE deselect_db;
+CALL pack.proc;
+Invoke from Db: test2, Pack: pack2, Rt: proc
+Invoke from Db: test2, Pack: pack2, Rt: proc
+USE test;
+CREATE PACKAGE pack2
+PROCEDURE proc();
+END;
+$$
+CREATE PACKAGE BODY pack2
+PROCEDURE proc() SELECT 'Invoke from Db: test, Pack: pack2, Rt: proc';
+END;
+$$
+CREATE DATABASE deselect_db;
+USE deselect_db;
+DROP DATABASE deselect_db;
+CALL pack.proc;
+Invoke from Db: test, Pack: pack2, Rt: proc
+Invoke from Db: test, Pack: pack2, Rt: proc
+DROP PACKAGE BODY test.pack2;
+DROP PACKAGE test.pack2;
+CALL pack.proc;
+Invoke from Db: test2, Pack: pack2, Rt: proc
+Invoke from Db: test2, Pack: pack2, Rt: proc
+DROP PACKAGE BODY test2.pack2;
+DROP PACKAGE test2.pack2;
+CALL pack.proc;
+ERROR 42000: PROCEDURE pack2.proc does not exist
+USE test;
+DROP PACKAGE BODY pack;
+DROP PACKAGE pack;
+SET @@path = DEFAULT;
+#
+# type 4.10
+# sql_mode: DEFAULT | procedure | is qualified
+# curr db: test | path set: yes
+# to test qualified package procedure invocation in a qualified package procedure
+#
+SET PATH= 'sys,test2';
+USE test2;
+CREATE PACKAGE pack2
+PROCEDURE proc();
+END;
+$$
+CREATE PACKAGE BODY pack2
+PROCEDURE proc() SELECT 'Invoke from Db: test2, Pack: pack2, Rt: proc';
+END;
+$$
+USE test;
+CREATE PACKAGE pack
+PROCEDURE proc();
+END;
+$$
+CREATE PACKAGE BODY pack
+PROCEDURE proc() CALL pack2.proc;
+END;
+$$
+CALL pack.proc;
+Invoke from Db: test2, Pack: pack2, Rt: proc
+Invoke from Db: test2, Pack: pack2, Rt: proc
+CREATE PACKAGE pack2
+PROCEDURE proc();
+END;
+$$
+CREATE PACKAGE BODY pack2
+PROCEDURE proc() SELECT 'Invoke from Db: test, Pack: pack2, Rt: proc';
+END;
+$$
+CALL pack.proc;
+Invoke from Db: test, Pack: pack2, Rt: proc
+Invoke from Db: test, Pack: pack2, Rt: proc
+DROP PACKAGE BODY pack2;
+DROP PACKAGE pack2;
+CALL pack.proc;
+Invoke from Db: test2, Pack: pack2, Rt: proc
+Invoke from Db: test2, Pack: pack2, Rt: proc
+DROP PACKAGE BODY test2.pack2;
+DROP PACKAGE test2.pack2;
+CALL pack.proc;
+ERROR 42000: PROCEDURE pack2.proc does not exist
+USE test;
+DROP PACKAGE BODY pack;
+DROP PACKAGE pack;
+SET @@path = DEFAULT;
+#
+# type 4.11
+# sql_mode: DEFAULT | procedure | is qualified
+# curr db: X | path set: yes
+# resolution priority in between qualified package procedure vs qualified db procedure resolution
+#
+USE test;
+CREATE PACKAGE pack
+PROCEDURE proc();
+END;
+$$
+CREATE PACKAGE BODY pack
+PROCEDURE proc() SELECT 'Invoke from Db: test, Pack: pack, Rt: proc';
+END;
+$$
+CREATE DATABASE pack;
+USE pack;
+CREATE PROCEDURE proc() SELECT 'Invoke from Db: pack, Rt: proc';
+CREATE DATABASE deselect_db;
+USE deselect_db;
+DROP DATABASE deselect_db;
+CALL pack.proc;
+Invoke from Db: pack, Rt: proc
+Invoke from Db: pack, Rt: proc
+SET PATH= 'sys,test';
+CALL pack.proc;
+Invoke from Db: test, Pack: pack, Rt: proc
+Invoke from Db: test, Pack: pack, Rt: proc
+DROP PACKAGE BODY test.pack;
+DROP PACKAGE test.pack;
+CALL pack.proc;
+Invoke from Db: pack, Rt: proc
+Invoke from Db: pack, Rt: proc
+DROP PROCEDURE pack.proc;
+CALL pack.proc;
+ERROR 42000: PROCEDURE pack.proc does not exist
+SET @@path = DEFAULT;
+#
+# type 4.12
+# sql_mode: DEFAULT | procedure | is qualified
+# curr db: test | path set: yes
+# resolution priority in between qualified package procedure vs qualified db procedure resolution
+#
+USE test;
+CREATE PACKAGE pack
+PROCEDURE proc();
+END;
+$$
+CREATE PACKAGE BODY pack
+PROCEDURE proc() SELECT 'Invoke from Db: test, Pack: pack, Rt: proc';
+END;
+$$
+USE pack;
+CREATE PROCEDURE proc() SELECT 'Invoke from Db: pack, Rt: proc';
+USE test;
+CALL pack.proc;
+Invoke from Db: test, Pack: pack, Rt: proc
+Invoke from Db: test, Pack: pack, Rt: proc
+DROP PACKAGE BODY pack;
+DROP PACKAGE pack;
+CALL pack.proc;
+Invoke from Db: pack, Rt: proc
+Invoke from Db: pack, Rt: proc
+DROP PROCEDURE pack.proc;
+CALL pack.proc;
+ERROR 42000: PROCEDURE pack.proc does not exist
+SET @@path = DEFAULT;
+#
+# type 4.13
+# sql_mode: DEFAULT | procedure | is qualified
+# curr db: test2 | path set: yes
+# resolution priority in between qualified package procedure vs qualified db procedure resolution
+#
+USE test;
+CREATE PACKAGE pack
+PROCEDURE proc();
+END;
+$$
+CREATE PACKAGE BODY pack
+PROCEDURE proc() SELECT 'Invoke from Db: test, Pack: pack, Rt: proc';
+END;
+$$
+USE pack;
+CREATE PROCEDURE proc() SELECT 'Invoke from Db: pack, Rt: proc';
+USE test2;
+CALL pack.proc;
+Invoke from Db: pack, Rt: proc
+Invoke from Db: pack, Rt: proc
+SET PATH= 'sys,test';
+CALL pack.proc;
+Invoke from Db: test, Pack: pack, Rt: proc
+Invoke from Db: test, Pack: pack, Rt: proc
+DROP PACKAGE BODY test.pack;
+DROP PACKAGE test.pack;
+CALL pack.proc;
+Invoke from Db: pack, Rt: proc
+Invoke from Db: pack, Rt: proc
+DROP PROCEDURE pack.proc;
+CALL pack.proc;
+ERROR 42000: PROCEDURE pack.proc does not exist
+DROP DATABASE pack;
+SET @@path = DEFAULT;
+#
+# type 4.14
+# sql_mode: DEFAULT | procedure | is qualified
+# curr db: X | path set: yes
+# qualified package procedure invoke internal private procedure
+#
+SET PATH= 'test,test2';
+USE test2;
+CREATE PROCEDURE proc_prv() SELECT 'Invoke from Db: test2, Rt: proc_prv';
+USE test;
+CREATE PROCEDURE proc_prv() SELECT 'Invoke from Db: test, Rt: proc_prv';
+CREATE PACKAGE pack
+PROCEDURE proc_pub();
+END;
+$$
+CREATE PACKAGE BODY pack
+PROCEDURE proc_prv() SELECT 'Invoke from Db: test, Pack: pack, Rt: proc_prv';
+PROCEDURE proc_pub() CALL proc_prv;
+END;
+$$
+CREATE DATABASE deselect_db;
+USE deselect_db;
+DROP DATABASE deselect_db;
+CALL pack.proc_pub;
+Invoke from Db: test, Pack: pack, Rt: proc_prv
+Invoke from Db: test, Pack: pack, Rt: proc_prv
+SET @@path = DEFAULT;
+#
+# type 4.15
+# sql_mode: DEFAULT | procedure | is qualified
+# curr db: test2 | path set: yes
+# qualified package procedure invoke internal private procedure
+#
+SET PATH= 'test,test2';
+USE test2;
+CALL pack.proc_pub;
+Invoke from Db: test, Pack: pack, Rt: proc_prv
+Invoke from Db: test, Pack: pack, Rt: proc_prv
+DROP PROCEDURE proc_prv;
+USE test;
+DROP PROCEDURE proc_prv;
+DROP PACKAGE BODY pack;
+DROP PACKAGE pack;
+SET @@path = DEFAULT;
+#
+# type 5.1
+# sql_mode: ORACLE | function | is unqualified
+# curr db: X | path set: no
+#
+SET sql_mode = ORACLE;
+USE test;
+CREATE FUNCTION func()
+RETURN TEXT AS
+BEGIN
+RETURN 'Invoke from Db: test, Rt: func';
+END;
+$$
+CREATE DATABASE deselect_db;
+USE deselect_db;
+DROP DATABASE deselect_db;
+SELECT func();
+ERROR 42000: FUNCTION func does not exist
+#
+# type 5.2
+# sql_mode: ORACLE | function | is unqualified
+# curr db: X | path set: yes
+#
+SET PATH= 'sys,test';
+SELECT func();
+func()
+Invoke from Db: test, Rt: func
+SET @@path = DEFAULT;
+#
+# type 5.3
+# sql_mode: ORACLE | function | is unqualified
+# curr db: test2 | path set: no
+#
+USE test2;
+SELECT func();
+ERROR 42000: FUNCTION test2.func does not exist
+#
+# type 5.4
+# sql_mode: ORACLE | function | is unqualified
+# curr db: test2 | path set: yes
+#
+SET PATH= 'sys,test';
+USE test2;
+SELECT func();
+func()
+Invoke from Db: test, Rt: func
+SET @@path = DEFAULT;
+#
+# type 5.5
+# sql_mode: ORACLE | function | is unqualified
+# curr db: X | path set: yes
+# lookup in between 2 unqualified functions with exactly the same name in different 2 databases
+#
+USE test2;
+CREATE FUNCTION func()
+RETURN TEXT AS
+BEGIN
+RETURN 'Invoke from Db: test2, Rt: func';
+END;
+$$
+CREATE DATABASE deselect_db;
+USE deselect_db;
+DROP DATABASE deselect_db;
+SET PATH= 'test,test2';
+SELECT func();
+func()
+Invoke from Db: test, Rt: func
+SET PATH= 'test2,test';
+SELECT func();
+func()
+Invoke from Db: test2, Rt: func
+DROP FUNCTION test2.func;
+SELECT func();
+func()
+Invoke from Db: test, Rt: func
+DROP FUNCTION test.func;
+SELECT func();
+ERROR 42000: FUNCTION func does not exist
+SET @@path = DEFAULT;
+#
+# type 5.6
+# sql_mode: ORACLE | function | is unqualified
+# curr db: test2 | path set: yes
+# lookup in between 2 unqualified functions with exactly the same name in different 2 databases
+#
+USE test;
+CREATE FUNCTION func()
+RETURN TEXT AS
+BEGIN
+RETURN 'Invoke from Db: test, Rt: func';
+END;
+$$
+SET PATH= 'sys,test';
+USE test2;
+SELECT func();
+func()
+Invoke from Db: test, Rt: func
+CREATE FUNCTION func()
+RETURN TEXT AS
+BEGIN
+RETURN 'Invoke from Db: test2, Rt: func';
+END;
+$$
+SELECT func();
+func()
+Invoke from Db: test2, Rt: func
+DROP FUNCTION func;
+SELECT func();
+func()
+Invoke from Db: test, Rt: func
+DROP FUNCTION test.func;
+SELECT func();
+ERROR 42000: FUNCTION test2.func does not exist
+SET @@path = DEFAULT;
+#
+# type 5.7
+# sql_mode: ORACLE | function | is unqualified
+# curr db: X | path set: yes
+# to test unqualified function invocation in an unqualified function
+#
+SET PATH= 'test,test2';
+USE test2;
+CREATE FUNCTION func()
+RETURN TEXT AS
+BEGIN
+RETURN 'Invoke from Db: test2, Rt: func';
+END;
+$$
+USE test;
+CREATE FUNCTION func_call_func()
+RETURN TEXT AS
+BEGIN
+RETURN func();
+END;
+$$
+CREATE DATABASE deselect_db;
+USE deselect_db;
+DROP DATABASE deselect_db;
+SELECT func_call_func();
+func_call_func()
+Invoke from Db: test2, Rt: func
+USE test;
+CREATE FUNCTION func()
+RETURN TEXT AS
+BEGIN
+RETURN 'Invoke from Db: test, Rt: func';
+END;
+$$
+CREATE DATABASE deselect_db;
+USE deselect_db;
+DROP DATABASE deselect_db;
+SELECT func_call_func();
+func_call_func()
+Invoke from Db: test, Rt: func
+DROP FUNCTION test.func;
+SELECT func_call_func();
+func_call_func()
+Invoke from Db: test2, Rt: func
+DROP FUNCTION test2.func;
+SELECT func_call_func();
+ERROR 42000: FUNCTION test.func does not exist
+USE test;
+DROP FUNCTION func_call_func;
+SET @@path = DEFAULT;
+#
+# type 5.8
+# sql_mode: ORACLE | function | is unqualified
+# curr db: test | path set: yes
+# to test unqualified function invocation in an unqualified function
+#
+SET PATH= 'sys,test2';
+USE test2;
+CREATE FUNCTION func()
+RETURN TEXT AS
+BEGIN
+RETURN 'Invoke from Db: test2, Rt: func';
+END;
+$$
+USE test;
+CREATE FUNCTION func_call_func()
+RETURN TEXT AS
+BEGIN
+RETURN func();
+END;
+$$
+SELECT func_call_func();
+func_call_func()
+Invoke from Db: test2, Rt: func
+CREATE FUNCTION func()
+RETURN TEXT AS
+BEGIN
+RETURN 'Invoke from Db: test, Rt: func';
+END;
+$$
+SELECT func_call_func();
+func_call_func()
+Invoke from Db: test, Rt: func
+DROP FUNCTION func;
+SELECT func_call_func();
+func_call_func()
+Invoke from Db: test2, Rt: func
+DROP FUNCTION test2.func;
+SELECT func_call_func();
+ERROR 42000: FUNCTION test.func does not exist
+USE test;
+DROP FUNCTION func_call_func;
+SET @@path = DEFAULT;
+#
+# type 6.1
+# sql_mode: ORACLE | function | is qualified
+# curr db: X | path set: no
+#
+USE test;
+CREATE PACKAGE pack AS
+FUNCTION func() RETURN TEXT;
+END;
+$$
+CREATE PACKAGE BODY pack AS
+FUNCTION func() RETURN TEXT AS
+BEGIN
+RETURN 'Invoke from Db: test, Pack: pack, Rt: func';
+END;
+END;
+$$
+CREATE DATABASE deselect_db;
+USE deselect_db;
+DROP DATABASE deselect_db;
+SELECT pack.func();
+ERROR 42000: FUNCTION pack.func does not exist
+#
+# type 6.2
+# sql_mode: ORACLE | function | is qualified
+# curr db: X | path set: yes
+#
+SET PATH= 'sys,test';
+SELECT pack.func();
+pack.func()
+Invoke from Db: test, Pack: pack, Rt: func
+SET @@path = DEFAULT;
+#
+# type 6.3
+# sql_mode: ORACLE | function | is qualified
+# curr db: test2 | path set: no
+#
+USE test2;
+SELECT pack.func();
+ERROR 42000: FUNCTION pack.func does not exist
+#
+# type 6.4
+# sql_mode: ORACLE | function | is qualified
+# curr db: test2 | path set: yes
+#
+SET PATH= 'sys,test';
+USE test2;
+SELECT pack.func();
+pack.func()
+Invoke from Db: test, Pack: pack, Rt: func
+SET @@path = DEFAULT;
+#
+# type 6.5
+# sql_mode: ORACLE | function | is qualified
+# curr db: X | path set: yes
+# lookup in between 2 qualified packages function with exactly the same name in different 2 databases
+#
+USE test2;
+CREATE PACKAGE pack AS
+FUNCTION func() RETURN TEXT;
+END;
+$$
+CREATE PACKAGE BODY pack AS
+FUNCTION func() RETURN TEXT AS
+BEGIN
+RETURN 'Invoke from Db: test2, Pack: pack, Rt: func';
+END;
+END;
+$$
+CREATE DATABASE deselect_db;
+USE deselect_db;
+DROP DATABASE deselect_db;
+SET PATH= 'test,test2';
+SELECT pack.func();
+pack.func()
+Invoke from Db: test, Pack: pack, Rt: func
+SET PATH= 'test2,test';
+SELECT pack.func();
+pack.func()
+Invoke from Db: test2, Pack: pack, Rt: func
+DROP PACKAGE BODY test2.pack;
+DROP PACKAGE test2.pack;
+SELECT pack.func();
+pack.func()
+Invoke from Db: test, Pack: pack, Rt: func
+DROP PACKAGE BODY test.pack;
+DROP PACKAGE test.pack;
+SELECT pack.func();
+ERROR 42000: FUNCTION pack.func does not exist
+SET @@path = DEFAULT;
+#
+# type 6.6
+# sql_mode: ORACLE | function | is qualified
+# curr db: test2 | path set: yes
+# lookup in between 2 qualified packages function with exactly the same name in different 2 databases
+#
+USE test;
+CREATE PACKAGE pack AS
+FUNCTION func() RETURN TEXT;
+END;
+$$
+CREATE PACKAGE BODY pack AS
+FUNCTION func() RETURN TEXT AS
+BEGIN
+RETURN 'Invoke from Db: test, Pack: pack, Rt: func';
+END;
+END;
+$$
+SET PATH= 'sys,test';
+USE test2;
+SELECT pack.func();
+pack.func()
+Invoke from Db: test, Pack: pack, Rt: func
+CREATE PACKAGE pack AS
+FUNCTION func() RETURN TEXT;
+END;
+$$
+CREATE PACKAGE BODY pack AS
+FUNCTION func() RETURN TEXT AS
+BEGIN
+RETURN 'Invoke from Db: test2, Pack: pack, Rt: func';
+END;
+END;
+$$
+SELECT pack.func();
+pack.func()
+Invoke from Db: test2, Pack: pack, Rt: func
+DROP PACKAGE BODY pack;
+DROP PACKAGE pack;
+SELECT pack.func();
+pack.func()
+Invoke from Db: test, Pack: pack, Rt: func
+DROP PACKAGE BODY test.pack;
+DROP PACKAGE test.pack;
+SELECT pack.func();
+ERROR 42000: FUNCTION pack.func does not exist
+SET @@path = DEFAULT;
+#
+# type 6.7
+# sql_mode: ORACLE | function | is qualified
+# curr db: X | path set: yes
+# to test unqualified function invocation in a qualified package function
+#
+SET PATH= 'test,test2';
+USE test2;
+CREATE FUNCTION func_local()
+RETURN TEXT AS
+BEGIN
+RETURN 'Invoke from Db: test2, Rt: func_local';
+END;
+$$
+USE test;
+CREATE PACKAGE pack AS
+FUNCTION func() RETURN TEXT;
+END;
+$$
+CREATE PACKAGE BODY pack AS
+FUNCTION func() RETURN TEXT AS
+BEGIN
+RETURN func_local();
+END;
+END;
+$$
+CREATE DATABASE deselect_db;
+USE deselect_db;
+DROP DATABASE deselect_db;
+SELECT pack.func();
+pack.func()
+Invoke from Db: test2, Rt: func_local
+USE test;
+CREATE FUNCTION func_local()
+RETURN TEXT AS
+BEGIN
+RETURN 'Invoke from Db: test, Rt: func_local';
+END;
+$$
+CREATE DATABASE deselect_db;
+USE deselect_db;
+DROP DATABASE deselect_db;
+SELECT pack.func();
+pack.func()
+Invoke from Db: test, Rt: func_local
+DROP FUNCTION test.func_local;
+SELECT pack.func();
+pack.func()
+Invoke from Db: test2, Rt: func_local
+DROP FUNCTION test2.func_local;
+SELECT pack.func();
+ERROR 42000: FUNCTION test.func_local does not exist
+USE test;
+DROP PACKAGE BODY pack;
+DROP PACKAGE pack;
+SET @@path = DEFAULT;
+#
+# type 6.8
+# sql_mode: ORACLE | function | is qualified
+# curr db: test | path set: yes
+# to test unqualified function invocation in a qualified package function
+#
+SET PATH= 'test,test2';
+USE test2;
+CREATE FUNCTION func_local()
+RETURN TEXT AS
+BEGIN
+RETURN 'Invoke from Db: test2, Rt: func_local';
+END;
+$$
+USE test;
+CREATE PACKAGE pack AS
+FUNCTION func() RETURN TEXT;
+END;
+$$
+CREATE PACKAGE BODY pack AS
+FUNCTION func() RETURN TEXT AS
+BEGIN
+RETURN func_local();
+END;
+END;
+$$
+SELECT pack.func();
+pack.func()
+Invoke from Db: test2, Rt: func_local
+CREATE FUNCTION func_local()
+RETURN TEXT AS
+BEGIN
+RETURN 'Invoke from Db: test, Rt: func_local';
+END;
+$$
+SELECT pack.func();
+pack.func()
+Invoke from Db: test, Rt: func_local
+DROP FUNCTION func_local;
+SELECT pack.func();
+pack.func()
+Invoke from Db: test2, Rt: func_local
+DROP FUNCTION test2.func_local;
+SELECT pack.func();
+ERROR 42000: FUNCTION test.func_local does not exist
+USE test;
+DROP PACKAGE BODY pack;
+DROP PACKAGE pack;
+SET @@path = DEFAULT;
+#
+# type 6.9
+# sql_mode: ORACLE | function | is qualified
+# curr db: X | path set: yes
+# to test qualified package function invocation in a qualified package function
+#
+SET PATH= 'test,test2';
+USE test2;
+CREATE PACKAGE pack2 AS
+FUNCTION func() RETURN TEXT;
+END;
+$$
+CREATE PACKAGE BODY pack2 AS
+FUNCTION func() RETURN TEXT AS
+BEGIN
+RETURN 'Invoke from Db: test2, Pack: pack2, Rt: func';
+END;
+END;
+$$
+USE test;
+CREATE PACKAGE pack AS
+FUNCTION func() RETURN TEXT;
+END;
+$$
+CREATE PACKAGE BODY pack AS
+FUNCTION func() RETURN TEXT AS
+BEGIN
+RETURN pack2.func();
+END;
+END;
+$$
+CREATE DATABASE deselect_db;
+USE deselect_db;
+DROP DATABASE deselect_db;
+SELECT pack.func();
+pack.func()
+Invoke from Db: test2, Pack: pack2, Rt: func
+USE test;
+CREATE PACKAGE pack2 AS
+FUNCTION func() RETURN TEXT;
+END;
+$$
+CREATE PACKAGE BODY pack2 AS
+FUNCTION func() RETURN TEXT AS
+BEGIN
+RETURN 'Invoke from Db: test, Pack: pack2, Rt: func';
+END;
+END;
+$$
+CREATE DATABASE deselect_db;
+USE deselect_db;
+DROP DATABASE deselect_db;
+SELECT pack.func();
+pack.func()
+Invoke from Db: test, Pack: pack2, Rt: func
+DROP PACKAGE BODY test.pack2;
+DROP PACKAGE test.pack2;
+SELECT pack.func();
+pack.func()
+Invoke from Db: test2, Pack: pack2, Rt: func
+DROP PACKAGE BODY test2.pack2;
+DROP PACKAGE test2.pack2;
+SELECT pack.func();
+ERROR 42000: FUNCTION pack2.func does not exist
+USE test;
+DROP PACKAGE BODY pack;
+DROP PACKAGE pack;
+SET @@path = DEFAULT;
+#
+# type 6.10
+# sql_mode: ORACLE | function | is qualified
+# curr db: test | path set: yes
+# to test qualified package function invocation in a qualified package function
+#
+SET PATH= 'sys,test2';
+USE test2;
+CREATE PACKAGE pack2 AS
+FUNCTION func() RETURN TEXT;
+END;
+$$
+CREATE PACKAGE BODY pack2 AS
+FUNCTION func() RETURN TEXT AS
+BEGIN
+RETURN 'Invoke from Db: test2, Pack: pack2, Rt: func';
+END;
+END;
+$$
+USE test;
+CREATE PACKAGE pack AS
+FUNCTION func() RETURN TEXT;
+END;
+$$
+CREATE PACKAGE BODY pack AS
+FUNCTION func() RETURN TEXT AS
+BEGIN
+RETURN pack2.func();
+END;
+END;
+$$
+SELECT pack.func();
+pack.func()
+Invoke from Db: test2, Pack: pack2, Rt: func
+CREATE PACKAGE pack2 AS
+FUNCTION func() RETURN TEXT;
+END;
+$$
+CREATE PACKAGE BODY pack2 AS
+FUNCTION func() RETURN TEXT AS
+BEGIN
+RETURN 'Invoke from Db: test, Pack: pack2, Rt: func';
+END;
+END;
+$$
+SELECT pack.func();
+pack.func()
+Invoke from Db: test, Pack: pack2, Rt: func
+DROP PACKAGE BODY pack2;
+DROP PACKAGE pack2;
+SELECT pack.func();
+pack.func()
+Invoke from Db: test2, Pack: pack2, Rt: func
+DROP PACKAGE BODY test2.pack2;
+DROP PACKAGE test2.pack2;
+SELECT pack.func();
+ERROR 42000: FUNCTION pack2.func does not exist
+USE test;
+DROP PACKAGE BODY pack;
+DROP PACKAGE pack;
+SET @@path = DEFAULT;
+#
+# type 6.11
+# sql_mode: ORACLE | function | is qualified
+# curr db: X | path set: yes
+# resolution priority in between qualified package function vs qualified db function resolution
+#
+USE test;
+CREATE PACKAGE pack AS
+FUNCTION func() RETURN TEXT;
+END;
+$$
+CREATE PACKAGE BODY pack AS
+FUNCTION func() RETURN TEXT AS
+BEGIN
+RETURN 'Invoke from Db: test, Pack: pack, Rt: func';
+END;
+END;
+$$
+CREATE DATABASE pack;
+USE pack;
+CREATE FUNCTION func()
+RETURN TEXT AS
+BEGIN
+RETURN 'Invoke from Db: pack, Rt: func';
+END;
+$$
+CREATE DATABASE deselect_db;
+USE deselect_db;
+DROP DATABASE deselect_db;
+SELECT pack.func();
+pack.func()
+Invoke from Db: pack, Rt: func
+SET PATH= 'sys,test';
+SELECT pack.func();
+pack.func()
+Invoke from Db: test, Pack: pack, Rt: func
+DROP PACKAGE BODY test.pack;
+DROP PACKAGE test.pack;
+SELECT pack.func();
+pack.func()
+Invoke from Db: pack, Rt: func
+DROP FUNCTION pack.func;
+SELECT pack.func();
+ERROR 42000: FUNCTION pack.func does not exist
+SET @@path = DEFAULT;
+#
+# type 6.12
+# sql_mode: ORACLE | function | is qualified
+# curr db: test | path set: yes
+# resolution priority in between qualified package function vs qualified db function resolution
+#
+USE test;
+CREATE PACKAGE pack AS
+FUNCTION func() RETURN TEXT;
+END;
+$$
+CREATE PACKAGE BODY pack AS
+FUNCTION func() RETURN TEXT AS
+BEGIN
+RETURN 'Invoke from Db: test, Pack: pack, Rt: func';
+END;
+END;
+$$
+USE pack;
+CREATE FUNCTION func()
+RETURN TEXT AS
+BEGIN
+RETURN 'Invoke from Db: pack, Rt: func';
+END;
+$$
+USE test;
+SELECT pack.func();
+pack.func()
+Invoke from Db: test, Pack: pack, Rt: func
+DROP PACKAGE BODY pack;
+DROP PACKAGE pack;
+SELECT pack.func();
+pack.func()
+Invoke from Db: pack, Rt: func
+DROP FUNCTION pack.func;
+SELECT pack.func();
+ERROR 42000: FUNCTION pack.func does not exist
+SET @@path = DEFAULT;
+#
+# type 6.13
+# sql_mode: ORACLE | function | is qualified
+# curr db: test2 | path set: yes
+# resolution priority in between qualified package function vs qualified db function resolution
+#
+USE test;
+CREATE PACKAGE pack AS
+FUNCTION func() RETURN TEXT;
+END;
+$$
+CREATE PACKAGE BODY pack AS
+FUNCTION func() RETURN TEXT AS
+BEGIN
+RETURN 'Invoke from Db: test, Pack: pack, Rt: func';
+END;
+END;
+$$
+USE pack;
+CREATE FUNCTION func()
+RETURN TEXT AS
+BEGIN
+RETURN 'Invoke from Db: pack, Rt: func';
+END;
+$$
+USE test2;
+SELECT pack.func();
+pack.func()
+Invoke from Db: pack, Rt: func
+SET PATH= 'sys,test';
+SELECT pack.func();
+pack.func()
+Invoke from Db: test, Pack: pack, Rt: func
+DROP PACKAGE BODY test.pack;
+DROP PACKAGE test.pack;
+SELECT pack.func();
+pack.func()
+Invoke from Db: pack, Rt: func
+DROP FUNCTION pack.func;
+SELECT pack.func();
+ERROR 42000: FUNCTION pack.func does not exist
+DROP DATABASE pack;
+SET @@path = DEFAULT;
+#
+# type 6.14
+# sql_mode: ORACLE | function | is qualified
+# curr db: X | path set: yes
+# qualified package function invoke internal private function
+#
+SET PATH= 'test,test2';
+USE test2;
+CREATE FUNCTION func_prv()
+RETURN TEXT AS
+BEGIN
+RETURN 'Invoke from Db: test2, Rt: func_prv';
+END;
+$$
+USE test;
+CREATE FUNCTION func_prv()
+RETURN TEXT AS
+BEGIN
+RETURN 'Invoke from Db: test, Rt: func_prv';
+END;
+$$
+CREATE PACKAGE pack AS
+FUNCTION func_pub() RETURN TEXT;
+END;
+$$
+CREATE PACKAGE BODY pack AS
+FUNCTION func_prv() RETURN TEXT AS
+BEGIN
+RETURN 'Invoke from Db: test, Pack: pack, Rt: func_prv';
+END;
+FUNCTION func_pub() RETURN TEXT AS
+BEGIN
+RETURN func_prv();
+END;
+END;
+$$
+CREATE DATABASE deselect_db;
+USE deselect_db;
+DROP DATABASE deselect_db;
+SELECT pack.func_pub();
+pack.func_pub()
+Invoke from Db: test, Pack: pack, Rt: func_prv
+SET @@path = DEFAULT;
+#
+# type 6.15
+# sql_mode: ORACLE | function | is qualified
+# curr db: test2 | path set: yes
+# qualified package function invoke internal private function
+#
+SET PATH= 'test,test2';
+USE test2;
+SELECT pack.func_pub();
+pack.func_pub()
+Invoke from Db: test, Pack: pack, Rt: func_prv
+DROP FUNCTION func_prv;
+USE test;
+DROP FUNCTION func_prv;
+DROP PACKAGE BODY pack;
+DROP PACKAGE pack;
+SET @@path = DEFAULT;
+#
+# type 7.1
+# sql_mode: ORACLE | procedure | is unqualified
+# curr db: X | path set: no
+#
+USE test;
+CREATE PROCEDURE proc() AS
+BEGIN
+SELECT 'Invoke from Db: test, Rt: proc';
+END;
+$$
+CREATE DATABASE deselect_db;
+USE deselect_db;
+DROP DATABASE deselect_db;
+CALL proc;
+ERROR 3D000: No database selected
+#
+# type 7.2
+# sql_mode: ORACLE | procedure | is unqualified
+# curr db: X | path set: yes
+#
+SET PATH= 'sys,test';
+CALL proc;
+Invoke from Db: test, Rt: proc
+Invoke from Db: test, Rt: proc
+SET @@path = DEFAULT;
+#
+# type 7.3
+# sql_mode: ORACLE | procedure | is unqualified
+# curr db: test2 | path set: no
+#
+USE test2;
+CALL proc;
+ERROR 42000: PROCEDURE test2.proc does not exist
+#
+# type 7.4
+# sql_mode: ORACLE | procedure | is unqualified
+# curr db: test2 | path set: yes
+#
+SET PATH= 'sys,test';
+USE test2;
+CALL proc;
+Invoke from Db: test, Rt: proc
+Invoke from Db: test, Rt: proc
+SET @@path = DEFAULT;
+#
+# type 7.5
+# sql_mode: ORACLE | procedure | is unqualified
+# curr db: X | path set: yes
+# lookup in between 2 unqualified procedures with exactly the same name in different 2 databases
+#
+USE test2;
+CREATE PROCEDURE proc() AS
+BEGIN
+SELECT 'Invoke from Db: test2, Rt: proc';
+END;
+$$
+CREATE DATABASE deselect_db;
+USE deselect_db;
+DROP DATABASE deselect_db;
+SET PATH= 'test,test2';
+CALL proc;
+Invoke from Db: test, Rt: proc
+Invoke from Db: test, Rt: proc
+SET PATH= 'test2,test';
+CALL proc;
+Invoke from Db: test2, Rt: proc
+Invoke from Db: test2, Rt: proc
+DROP PROCEDURE test2.proc;
+CALL proc;
+Invoke from Db: test, Rt: proc
+Invoke from Db: test, Rt: proc
+DROP PROCEDURE test.proc;
+CALL proc;
+ERROR 3D000: No database selected
+SET @@path = DEFAULT;
+#
+# type 7.6
+# sql_mode: ORACLE | procedure | is unqualified
+# curr db: test2 | path set: yes
+# lookup in between 2 unqualified procedures with exactly the same name in different 2 databases
+#
+USE test;
+CREATE PROCEDURE proc() AS
+BEGIN
+SELECT 'Invoke from Db: test, Rt: proc';
+END;
+$$
+SET PATH= 'sys,test';
+USE test2;
+CALL proc;
+Invoke from Db: test, Rt: proc
+Invoke from Db: test, Rt: proc
+CREATE PROCEDURE proc() AS
+BEGIN
+SELECT 'Invoke from Db: test2, Rt: proc';
+END;
+$$
+CALL proc;
+Invoke from Db: test2, Rt: proc
+Invoke from Db: test2, Rt: proc
+DROP PROCEDURE proc;
+CALL proc;
+Invoke from Db: test, Rt: proc
+Invoke from Db: test, Rt: proc
+DROP PROCEDURE test.proc;
+CALL proc;
+ERROR 42000: PROCEDURE test2.proc does not exist
+SET @@path = DEFAULT;
+#
+# type 7.7
+# sql_mode: ORACLE | procedure | is unqualified
+# curr db: X | path set: yes
+# to test unqualified procedure invocation in an unqualified procedure
+#
+SET PATH= 'test,test2';
+USE test2;
+CREATE PROCEDURE proc() AS
+BEGIN
+SELECT 'Invoke from Db: test2, Rt: proc';
+END;
+$$
+USE test;
+CREATE PROCEDURE proc_call_proc() AS
+BEGIN
+CALL proc;
+END;
+$$
+CREATE DATABASE deselect_db;
+USE deselect_db;
+DROP DATABASE deselect_db;
+CALL proc_call_proc;
+Invoke from Db: test2, Rt: proc
+Invoke from Db: test2, Rt: proc
+USE test;
+CREATE PROCEDURE proc() AS
+BEGIN
+SELECT 'Invoke from Db: test, Rt: proc';
+END;
+$$
+CREATE DATABASE deselect_db;
+USE deselect_db;
+DROP DATABASE deselect_db;
+CALL proc_call_proc;
+Invoke from Db: test, Rt: proc
+Invoke from Db: test, Rt: proc
+DROP PROCEDURE test.proc;
+CALL proc_call_proc;
+Invoke from Db: test2, Rt: proc
+Invoke from Db: test2, Rt: proc
+DROP PROCEDURE test2.proc;
+CALL proc_call_proc;
+ERROR 42000: PROCEDURE test.proc does not exist
+USE test;
+DROP PROCEDURE proc_call_proc;
+SET @@path = DEFAULT;
+#
+# type 7.8
+# sql_mode: ORACLE | procedure | is unqualified
+# curr db: test | path set: yes
+# to test unqualified procedure invocation in an unqualified procedure
+#
+SET PATH= 'sys,test2';
+USE test2;
+CREATE PROCEDURE proc() AS
+BEGIN
+SELECT 'Invoke from Db: test2, Rt: proc';
+END;
+$$
+USE test;
+CREATE PROCEDURE proc_call_proc() AS
+BEGIN
+CALL proc;
+END;
+$$
+CALL proc_call_proc;
+Invoke from Db: test2, Rt: proc
+Invoke from Db: test2, Rt: proc
+CREATE PROCEDURE proc() AS
+BEGIN
+SELECT 'Invoke from Db: test, Rt: proc';
+END;
+$$
+CALL proc_call_proc;
+Invoke from Db: test, Rt: proc
+Invoke from Db: test, Rt: proc
+DROP PROCEDURE proc;
+CALL proc_call_proc;
+Invoke from Db: test2, Rt: proc
+Invoke from Db: test2, Rt: proc
+DROP PROCEDURE test2.proc;
+CALL proc_call_proc;
+ERROR 42000: PROCEDURE test.proc does not exist
+USE test;
+DROP PROCEDURE proc_call_proc;
+SET @@path = DEFAULT;
+#
+# type 8.1
+# sql_mode: ORACLE | procedure | is qualified
+# curr db: X | path set: no
+#
+USE test;
+CREATE PACKAGE pack AS
+PROCEDURE proc();
+END;
+$$
+CREATE PACKAGE BODY pack AS
+PROCEDURE proc() AS
+BEGIN
+SELECT 'Invoke from Db: test, Pack: pack, Rt: proc';
+END;
+END;
+$$
+CREATE DATABASE deselect_db;
+USE deselect_db;
+DROP DATABASE deselect_db;
+CALL pack.proc;
+ERROR 42000: PROCEDURE pack.proc does not exist
+#
+# type 8.2
+# sql_mode: ORACLE | procedure | is qualified
+# curr db: X | path set: yes
+#
+SET PATH= 'sys,test';
+CALL pack.proc;
+Invoke from Db: test, Pack: pack, Rt: proc
+Invoke from Db: test, Pack: pack, Rt: proc
+SET @@path = DEFAULT;
+#
+# type 8.3
+# sql_mode: ORACLE | procedure | is qualified
+# curr db: test2 | path set: no
+#
+USE test2;
+CALL pack.proc;
+ERROR 42000: PROCEDURE pack.proc does not exist
+#
+# type 8.4
+# sql_mode: ORACLE | procedure | is qualified
+# curr db: test2 | path set: yes
+#
+SET PATH= 'sys,test';
+USE test2;
+CALL pack.proc;
+Invoke from Db: test, Pack: pack, Rt: proc
+Invoke from Db: test, Pack: pack, Rt: proc
+SET @@path = DEFAULT;
+#
+# type 8.5
+# sql_mode: ORACLE | procedure | is qualified
+# curr db: X | path set: yes
+# lookup in between 2 qualified packages procedure with exactly the same name in different 2 databases
+#
+USE test2;
+CREATE PACKAGE pack AS
+PROCEDURE proc();
+END;
+$$
+CREATE PACKAGE BODY pack AS
+PROCEDURE proc() AS
+BEGIN
+SELECT 'Invoke from Db: test2, Pack: pack, Rt: proc';
+END;
+END;
+$$
+CREATE DATABASE deselect_db;
+USE deselect_db;
+DROP DATABASE deselect_db;
+SET PATH= 'test,test2';
+CALL pack.proc;
+Invoke from Db: test, Pack: pack, Rt: proc
+Invoke from Db: test, Pack: pack, Rt: proc
+SET PATH= 'test2,test';
+CALL pack.proc;
+Invoke from Db: test2, Pack: pack, Rt: proc
+Invoke from Db: test2, Pack: pack, Rt: proc
+DROP PACKAGE BODY test2.pack;
+DROP PACKAGE test2.pack;
+CALL pack.proc;
+Invoke from Db: test, Pack: pack, Rt: proc
+Invoke from Db: test, Pack: pack, Rt: proc
+DROP PACKAGE BODY test.pack;
+DROP PACKAGE test.pack;
+CALL pack.proc;
+ERROR 42000: PROCEDURE pack.proc does not exist
+SET @@path = DEFAULT;
+#
+# type 8.6
+# sql_mode: ORACLE | procedure | is qualified
+# curr db: test2 | path set: yes
+# lookup in between 2 qualified packages procedure with exactly the same name in different 2 databases
+#
+USE test;
+CREATE PACKAGE pack AS
+PROCEDURE proc();
+END;
+$$
+CREATE PACKAGE BODY pack AS
+PROCEDURE proc() AS
+BEGIN
+SELECT 'Invoke from Db: test, Pack: pack, Rt: proc';
+END;
+END;
+$$
+SET PATH= 'sys,test';
+USE test2;
+CALL pack.proc;
+Invoke from Db: test, Pack: pack, Rt: proc
+Invoke from Db: test, Pack: pack, Rt: proc
+CREATE PACKAGE pack AS
+PROCEDURE proc();
+END;
+$$
+CREATE PACKAGE BODY pack AS
+PROCEDURE proc() AS
+BEGIN
+SELECT 'Invoke from Db: test2, Pack: pack, Rt: proc';
+END;
+END;
+$$
+CALL pack.proc;
+Invoke from Db: test2, Pack: pack, Rt: proc
+Invoke from Db: test2, Pack: pack, Rt: proc
+DROP PACKAGE BODY pack;
+DROP PACKAGE pack;
+CALL pack.proc;
+Invoke from Db: test, Pack: pack, Rt: proc
+Invoke from Db: test, Pack: pack, Rt: proc
+DROP PACKAGE BODY test.pack;
+DROP PACKAGE test.pack;
+CALL pack.proc;
+ERROR 42000: PROCEDURE pack.proc does not exist
+SET @@path = DEFAULT;
+#
+# type 8.7
+# sql_mode: ORACLE | procedure | is qualified
+# curr db: X | path set: yes
+# to test unqualified procedure invocation in a qualified package procedure
+#
+SET PATH= 'test,test2';
+USE test2;
+CREATE PROCEDURE proc_local() AS
+BEGIN
+SELECT 'Invoke from Db: test2, Rt: proc_local';
+END;
+$$
+USE test;
+CREATE PACKAGE pack AS
+PROCEDURE proc();
+END;
+$$
+CREATE PACKAGE BODY pack AS
+PROCEDURE proc() AS
+BEGIN
+CALL proc_local;
+END;
+END;
+$$
+CREATE DATABASE deselect_db;
+USE deselect_db;
+DROP DATABASE deselect_db;
+CALL pack.proc;
+Invoke from Db: test2, Rt: proc_local
+Invoke from Db: test2, Rt: proc_local
+USE test;
+CREATE PROCEDURE proc_local() AS
+BEGIN
+SELECT 'Invoke from Db: test, Rt: proc_local';
+END;
+$$
+CREATE DATABASE deselect_db;
+USE deselect_db;
+DROP DATABASE deselect_db;
+CALL pack.proc;
+Invoke from Db: test, Rt: proc_local
+Invoke from Db: test, Rt: proc_local
+DROP PROCEDURE test.proc_local;
+CALL pack.proc;
+Invoke from Db: test2, Rt: proc_local
+Invoke from Db: test2, Rt: proc_local
+DROP PROCEDURE test2.proc_local;
+CALL pack.proc;
+ERROR 42000: PROCEDURE test.proc_local does not exist
+USE test;
+DROP PACKAGE BODY pack;
+DROP PACKAGE pack;
+SET @@path = DEFAULT;
+#
+# type 8.8
+# sql_mode: ORACLE | procedure | is qualified
+# curr db: test | path set: yes
+# to test unqualified procedure invocation in a qualified package procedure
+#
+SET PATH= 'test,test2';
+USE test2;
+CREATE PROCEDURE proc_local() AS
+BEGIN
+SELECT 'Invoke from Db: test2, Rt: proc_local';
+END;
+$$
+USE test;
+CREATE PACKAGE pack AS
+PROCEDURE proc();
+END;
+$$
+CREATE PACKAGE BODY pack AS
+PROCEDURE proc() AS
+BEGIN
+CALL proc_local;
+END;
+END;
+$$
+CALL pack.proc;
+Invoke from Db: test2, Rt: proc_local
+Invoke from Db: test2, Rt: proc_local
+CREATE PROCEDURE proc_local() AS
+BEGIN
+SELECT 'Invoke from Db: test, Rt: proc_local';
+END;
+$$
+CALL pack.proc;
+Invoke from Db: test, Rt: proc_local
+Invoke from Db: test, Rt: proc_local
+DROP PROCEDURE proc_local;
+CALL pack.proc;
+Invoke from Db: test2, Rt: proc_local
+Invoke from Db: test2, Rt: proc_local
+DROP PROCEDURE test2.proc_local;
+CALL pack.proc;
+ERROR 42000: PROCEDURE test.proc_local does not exist
+USE test;
+DROP PACKAGE BODY pack;
+DROP PACKAGE pack;
+SET @@path = DEFAULT;
+#
+# type 8.9
+# sql_mode: ORACLE | procedure | is qualified
+# curr db: X | path set: yes
+# to test qualified package procedure invocation in a qualified package procedure
+#
+SET PATH= 'test,test2';
+USE test2;
+CREATE PACKAGE pack2 AS
+PROCEDURE proc();
+END;
+$$
+CREATE PACKAGE BODY pack2 AS
+PROCEDURE proc() AS
+BEGIN
+SELECT 'Invoke from Db: test2, Pack: pack2, Rt: proc';
+END;
+END;
+$$
+USE test;
+CREATE PACKAGE pack AS
+PROCEDURE proc();
+END;
+$$
+CREATE PACKAGE BODY pack AS
+PROCEDURE proc() AS
+BEGIN
+CALL pack2.proc;
+END;
+END;
+$$
+CREATE DATABASE deselect_db;
+USE deselect_db;
+DROP DATABASE deselect_db;
+CALL pack.proc;
+Invoke from Db: test2, Pack: pack2, Rt: proc
+Invoke from Db: test2, Pack: pack2, Rt: proc
+USE test;
+CREATE PACKAGE pack2 AS
+PROCEDURE proc();
+END;
+$$
+CREATE PACKAGE BODY pack2 AS
+PROCEDURE proc() AS
+BEGIN
+SELECT 'Invoke from Db: test, Pack: pack2, Rt: proc';
+END;
+END;
+$$
+CREATE DATABASE deselect_db;
+USE deselect_db;
+DROP DATABASE deselect_db;
+CALL pack.proc;
+Invoke from Db: test, Pack: pack2, Rt: proc
+Invoke from Db: test, Pack: pack2, Rt: proc
+DROP PACKAGE BODY test.pack2;
+DROP PACKAGE test.pack2;
+CALL pack.proc;
+Invoke from Db: test2, Pack: pack2, Rt: proc
+Invoke from Db: test2, Pack: pack2, Rt: proc
+DROP PACKAGE BODY test2.pack2;
+DROP PACKAGE test2.pack2;
+CALL pack.proc;
+ERROR 42000: PROCEDURE pack2.proc does not exist
+USE test;
+DROP PACKAGE BODY pack;
+DROP PACKAGE pack;
+SET @@path = DEFAULT;
+#
+# type 8.10
+# sql_mode: ORACLE | procedure | is qualified
+# curr db: test | path set: yes
+# to test qualified package procedure invocation in a qualified package procedure
+#
+SET PATH= 'sys,test2';
+USE test2;
+CREATE PACKAGE pack2 AS
+PROCEDURE proc();
+END;
+$$
+CREATE PACKAGE BODY pack2 AS
+PROCEDURE proc() AS
+BEGIN
+SELECT 'Invoke from Db: test2, Pack: pack2, Rt: proc';
+END;
+END;
+$$
+USE test;
+CREATE PACKAGE pack AS
+PROCEDURE proc();
+END;
+$$
+CREATE PACKAGE BODY pack AS
+PROCEDURE proc() AS
+BEGIN
+CALL pack2.proc;
+END;
+END;
+$$
+CALL pack.proc;
+Invoke from Db: test2, Pack: pack2, Rt: proc
+Invoke from Db: test2, Pack: pack2, Rt: proc
+CREATE PACKAGE pack2 AS
+PROCEDURE proc();
+END;
+$$
+CREATE PACKAGE BODY pack2 AS
+PROCEDURE proc() AS
+BEGIN
+SELECT 'Invoke from Db: test, Pack: pack2, Rt: proc';
+END;
+END;
+$$
+CALL pack.proc;
+Invoke from Db: test, Pack: pack2, Rt: proc
+Invoke from Db: test, Pack: pack2, Rt: proc
+DROP PACKAGE BODY pack2;
+DROP PACKAGE pack2;
+CALL pack.proc;
+Invoke from Db: test2, Pack: pack2, Rt: proc
+Invoke from Db: test2, Pack: pack2, Rt: proc
+DROP PACKAGE BODY test2.pack2;
+DROP PACKAGE test2.pack2;
+CALL pack.proc;
+ERROR 42000: PROCEDURE pack2.proc does not exist
+USE test;
+DROP PACKAGE BODY pack;
+DROP PACKAGE pack;
+SET @@path = DEFAULT;
+#
+# type 8.11
+# sql_mode: ORACLE | procedure | is qualified
+# curr db: X | path set: yes
+# resolution priority in between qualified package procedure vs qualified db procedure resolution
+#
+USE test;
+CREATE PACKAGE pack AS
+PROCEDURE proc();
+END;
+$$
+CREATE PACKAGE BODY pack AS
+PROCEDURE proc() AS
+BEGIN
+SELECT 'Invoke from Db: test, Pack: pack, Rt: proc';
+END;
+END;
+$$
+CREATE DATABASE pack;
+USE pack;
+CREATE PROCEDURE proc() AS
+BEGIN
+SELECT 'Invoke from Db: pack, Rt: proc';
+END;
+$$
+CREATE DATABASE deselect_db;
+USE deselect_db;
+DROP DATABASE deselect_db;
+CALL pack.proc;
+Invoke from Db: pack, Rt: proc
+Invoke from Db: pack, Rt: proc
+SET PATH= 'sys,test';
+CALL pack.proc;
+Invoke from Db: test, Pack: pack, Rt: proc
+Invoke from Db: test, Pack: pack, Rt: proc
+DROP PACKAGE BODY test.pack;
+DROP PACKAGE test.pack;
+CALL pack.proc;
+Invoke from Db: pack, Rt: proc
+Invoke from Db: pack, Rt: proc
+DROP PROCEDURE pack.proc;
+CALL pack.proc;
+ERROR 42000: PROCEDURE pack.proc does not exist
+SET @@path = DEFAULT;
+#
+# type 8.12
+# sql_mode: ORACLE | procedure | is qualified
+# curr db: test | path set: yes
+# resolution priority in between qualified package procedure vs qualified db procedure resolution
+#
+USE test;
+CREATE PACKAGE pack AS
+PROCEDURE proc();
+END;
+$$
+CREATE PACKAGE BODY pack AS
+PROCEDURE proc() AS
+BEGIN
+SELECT 'Invoke from Db: test, Pack: pack, Rt: proc';
+END;
+END;
+$$
+USE pack;
+CREATE PROCEDURE proc() AS
+BEGIN
+SELECT 'Invoke from Db: pack, Rt: proc';
+END;
+$$
+USE test;
+CALL pack.proc;
+Invoke from Db: test, Pack: pack, Rt: proc
+Invoke from Db: test, Pack: pack, Rt: proc
+DROP PACKAGE BODY pack;
+DROP PACKAGE pack;
+CALL pack.proc;
+Invoke from Db: pack, Rt: proc
+Invoke from Db: pack, Rt: proc
+DROP PROCEDURE pack.proc;
+CALL pack.proc;
+ERROR 42000: PROCEDURE pack.proc does not exist
+SET @@path = DEFAULT;
+#
+# type 8.13
+# sql_mode: ORACLE | procedure | is qualified
+# curr db: test2 | path set: yes
+# resolution priority in between qualified package procedure vs qualified db procedure resolution
+#
+USE test;
+CREATE PACKAGE pack AS
+PROCEDURE proc();
+END;
+$$
+CREATE PACKAGE BODY pack AS
+PROCEDURE proc() AS
+BEGIN
+SELECT 'Invoke from Db: test, Pack: pack, Rt: proc';
+END;
+END;
+$$
+USE pack;
+CREATE PROCEDURE proc() AS
+BEGIN
+SELECT 'Invoke from Db: pack, Rt: proc';
+END;
+$$
+USE test2;
+CALL pack.proc;
+Invoke from Db: pack, Rt: proc
+Invoke from Db: pack, Rt: proc
+SET PATH= 'sys,test';
+CALL pack.proc;
+Invoke from Db: test, Pack: pack, Rt: proc
+Invoke from Db: test, Pack: pack, Rt: proc
+DROP PACKAGE BODY test.pack;
+DROP PACKAGE test.pack;
+CALL pack.proc;
+Invoke from Db: pack, Rt: proc
+Invoke from Db: pack, Rt: proc
+DROP PROCEDURE pack.proc;
+CALL pack.proc;
+ERROR 42000: PROCEDURE pack.proc does not exist
+DROP DATABASE pack;
+SET @@path = DEFAULT;
+#
+# type 8.14
+# sql_mode: ORACLE | procedure | is qualified
+# curr db: X | path set: yes
+# qualified package procedure invoke internal private procedure
+#
+SET PATH= 'test,test2';
+USE test2;
+CREATE PROCEDURE proc_prv() AS
+BEGIN
+SELECT 'Invoke from Db: test2, Rt: proc_prv';
+END;
+$$
+USE test;
+CREATE PROCEDURE proc_prv() AS
+BEGIN
+SELECT 'Invoke from Db: test, Rt: proc_prv';
+END;
+$$
+CREATE PACKAGE pack AS
+PROCEDURE proc_pub();
+END;
+$$
+CREATE PACKAGE BODY pack AS
+PROCEDURE proc_prv() AS
+BEGIN
+SELECT 'Invoke from Db: test, Pack: pack, Rt: proc_prv';
+END;
+PROCEDURE proc_pub() AS
+BEGIN
+CALL proc_prv;
+END;
+END;
+$$
+CREATE DATABASE deselect_db;
+USE deselect_db;
+DROP DATABASE deselect_db;
+CALL pack.proc_pub;
+Invoke from Db: test, Pack: pack, Rt: proc_prv
+Invoke from Db: test, Pack: pack, Rt: proc_prv
+SET @@path = DEFAULT;
+#
+# type 8.15
+# sql_mode: ORACLE | procedure | is qualified
+# curr db: test2 | path set: yes
+# qualified package procedure invoke internal private procedure
+#
+SET PATH= 'test,test2';
+USE test2;
+CALL pack.proc_pub;
+Invoke from Db: test, Pack: pack, Rt: proc_prv
+Invoke from Db: test, Pack: pack, Rt: proc_prv
+DROP PROCEDURE proc_prv;
+DROP DATABASE test2;
+USE test;
+DROP PROCEDURE proc_prv;
+DROP PACKAGE BODY pack;
+DROP PACKAGE pack;
+SET @@path = DEFAULT;
+#
+# Resolution of routines in stored routines should be based on
+# the current path, not the path at the time of creation.
+#
+SET @@path= DEFAULT;
+SET sql_mode= DEFAULT;
+USE test;
+CREATE FUNCTION func() RETURNS TEXT RETURN 'Invoke from Db: test, Rt: func';
+CREATE DATABASE test3;
+USE test3;
+CREATE FUNCTION func() RETURNS TEXT RETURN 'Invoke from Db: test3, Rt: func';
+CREATE DATABASE test2;
+USE test2;
+SET @@path= 'test';
+CREATE FUNCTION func2() RETURNS TEXT RETURN func();
+USE test;
+SET @@path= 'test3';
+SELECT test2.func2();
+test2.func2()
+Invoke from Db: test3, Rt: func
+SET @@path= 'test';
+SELECT test2.func2();
+test2.func2()
+Invoke from Db: test, Rt: func
+DROP FUNCTION test.func;
+DROP DATABASE test2;
+DROP DATABASE test3;
+#
+# Internal schema (function_call_keyword:)
+#
+SET @@path= DEFAULT;
+SET sql_mode= DEFAULT;
+SELECT trim('     ');
+trim('     ')
+
+SET @@path= 'oracle_schema';
+SELECT trim('     ');
+trim('     ')
+NULL
+SET sql_mode='oracle';
+SET @@path= 'mariadb_schema';
+SELECT trim('     ');
+trim('     ')
+
+#
+# Internal schema (function_call_keyword:)
+# Views must behave as it was during creation time, regardless of
+# the current path
+#
+SET @@path= 'oracle_schema';
+SET sql_mode= DEFAULT;
+CREATE VIEW v_oracle AS SELECT trim('     ');
+SELECT * FROM v_oracle;
+trim('     ')
+NULL
+SET @@path= 'mariadb_schema';
+SELECT * FROM v_oracle;
+trim('     ')
+NULL
+SHOW CREATE VIEW v_oracle;
+View	Create View	character_set_client	collation_connection
+v_oracle	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v_oracle` AS select oracle_schema.trim('     ') AS `trim('     ')`	latin1	latin1_swedish_ci
+DROP VIEW v_oracle;
+SET @@path= 'mariadb_schema';
+CREATE VIEW v_mariadb AS SELECT trim('     ');
+SELECT * FROM v_mariadb;
+trim('     ')
+
+SET @@path= 'oracle_schema';
+SELECT * FROM v_mariadb;
+trim('     ')
+
+SHOW CREATE VIEW v_mariadb;
+View	Create View	character_set_client	collation_connection
+v_mariadb	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v_mariadb` AS select mariadb_schema.trim('     ') AS `trim('     ')`	latin1	latin1_swedish_ci
+DROP VIEW v_mariadb;
+#
+# Internal schema (function_call_keyword:)
+# Native functions gets resolved with the execution path not the creation path
+# TODO: This behavior is not consistent with the behavior with sql_mode but
+# it is consistent with the behavior of stored routines
+#
+SET @@path= 'oracle_schema';
+SET sql_mode= DEFAULT;
+CREATE FUNCTION func_oracle() RETURNS TEXT RETURN trim('     ');
+SELECT func_oracle();
+func_oracle()
+NULL
+SET @@path= 'mariadb_schema';
+SELECT func_oracle();
+func_oracle()
+
+DROP FUNCTION func_oracle;
+SET @@path= 'mariadb_schema';
+CREATE FUNCTION func_mariadb() RETURNS TEXT RETURN trim('     ');
+SELECT func_mariadb();
+func_mariadb()
+
+SET @@path= 'oracle_schema';
+SELECT func_mariadb();
+func_mariadb()
+NULL
+DROP FUNCTION func_mariadb;
+#
+# Internal schema (function_call_generic:)
+#
+SET @@path= DEFAULT;
+SET sql_mode= DEFAULT;
+SELECT CONCAT('Ma', 'ria', NULL, 'DB');
+CONCAT('Ma', 'ria', NULL, 'DB')
+NULL
+SET @@path= 'oracle_schema';
+SELECT CONCAT('Ma', 'ria', NULL, 'DB');
+CONCAT('Ma', 'ria', NULL, 'DB')
+MariaDB
+SET sql_mode='oracle';
+SET @@path= 'mariadb_schema';
+SELECT CONCAT('Ma', 'ria', NULL, 'DB');
+CONCAT('Ma', 'ria', NULL, 'DB')
+NULL
+#
+# Internal schema (function_call_generic:)
+# Views must behave as it was during creation time, regardless of
+# the current path
+#
+SET @@path= 'oracle_schema';
+SET sql_mode= DEFAULT;
+CREATE VIEW v_oracle AS SELECT CONCAT('Ma', 'ria', NULL, 'DB');
+SELECT * FROM v_oracle;
+CONCAT('Ma', 'ria', NULL, 'DB')
+MariaDB
+SET @@path= 'mariadb_schema';
+SELECT * FROM v_oracle;
+CONCAT('Ma', 'ria', NULL, 'DB')
+MariaDB
+SHOW CREATE VIEW v_oracle;
+View	Create View	character_set_client	collation_connection
+v_oracle	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v_oracle` AS select oracle_schema.concat('Ma','ria',NULL,'DB') AS `CONCAT('Ma', 'ria', NULL, 'DB')`	latin1	latin1_swedish_ci
+DROP VIEW v_oracle;
+SET @@path= 'mariadb_schema';
+CREATE VIEW v_mariadb AS SELECT CONCAT('Ma', 'ria', NULL, 'DB');
+SELECT * FROM v_mariadb;
+CONCAT('Ma', 'ria', NULL, 'DB')
+NULL
+SET @@path= 'oracle_schema';
+SELECT * FROM v_mariadb;
+CONCAT('Ma', 'ria', NULL, 'DB')
+NULL
+SHOW CREATE VIEW v_mariadb;
+View	Create View	character_set_client	collation_connection
+v_mariadb	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v_mariadb` AS select mariadb_schema.concat('Ma','ria',NULL,'DB') AS `CONCAT('Ma', 'ria', NULL, 'DB')`	latin1	latin1_swedish_ci
+DROP VIEW v_mariadb;
+SET @@path= DEFAULT;
+SET sql_mode= DEFAULT;
+#
+# Internal schema (function_call_generic:)
+# Native functions gets resolved with the execution path not the creation path
+# TODO: This behavior is not consistent with the behavior with sql_mode but
+# it is consistent with the behavior of stored routines
+#
+SET @@path= 'oracle_schema';
+SET sql_mode= DEFAULT;
+CREATE FUNCTION func_oracle() RETURNS TEXT RETURN CONCAT('Ma', 'ria', NULL, 'DB');
+SELECT func_oracle();
+func_oracle()
+MariaDB
+SET @@path= 'mariadb_schema';
+SELECT func_oracle();
+func_oracle()
+NULL
+DROP FUNCTION func_oracle;
+SET @@path= 'mariadb_schema';
+CREATE FUNCTION func_mariadb() RETURNS TEXT RETURN CONCAT('Ma', 'ria', NULL, 'DB');
+SELECT func_mariadb();
+func_mariadb()
+NULL
+SET @@path= 'oracle_schema';
+SELECT func_mariadb();
+func_mariadb()
+MariaDB
+DROP FUNCTION func_mariadb;
+SET @@path= DEFAULT;
+SET sql_mode= DEFAULT;
+#
+# Internal schema (type mapping for SHOW CREATE TABLE)
+#
+CREATE TABLE t1 (a DATE);
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `a` date DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+SET @@path= 'oracle_schema';
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `a` mariadb_schema.date DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+DROP TABLE t1;
+#
+# Path resolution where database name contains ','
+#
+CREATE DATABASE `a,b`;
+USE `a,b`;
+CREATE FUNCTION func() RETURNS TEXT RETURN 'Invoke from Db: \"a,b\", Rt: func';
+USE test;
+SELECT func();
+ERROR 42000: FUNCTION test.func does not exist
+SET @@path= '`a,b`';
+SELECT func();
+func()
+Invoke from Db: "a,b", Rt: func
+DROP DATABASE `a,b`;
+USE test;
+#
+# Path resolution where database name contains '"'
+#
+CREATE DATABASE `"`;
+USE `"`;
+CREATE FUNCTION func() RETURNS TEXT RETURN 'Invoke from Db: \", Rt: func';
+USE test;
+SELECT func();
+ERROR 42000: FUNCTION test.func does not exist
+SET @@path= '`"`';
+SELECT func();
+func()
+Invoke from Db: ", Rt: func
+DROP DATABASE `"`;
+USE test;
+SET @@path= DEFAULT;
+#
+# Modify session path within a stored routine
+# This is not allowed since we invalidate the sp caches when the session
+# path is changed
+#
+CREATE FUNCTION func() RETURNS TEXT
+BEGIN
+SET @@path= 'sys';
+RETURN '';
+END;
+$$
+SELECT func();
+ERROR HY000: The system variable path cannot be set in stored functions or triggers
+DROP FUNCTION func;
+#
+# Modify global path within a stored routine
+#
+CREATE FUNCTION func() RETURNS TEXT
+BEGIN
+SET @@global.path= 'sys';
+RETURN '';
+END;
+$$
+SELECT func();
+func()
+
+SET @@global.path= DEFAULT;
+DROP FUNCTION func;
+#
+# End of 11.8 tests
+#
diff --git a/mysql-test/main/path_resolution.test b/mysql-test/main/path_resolution.test
new file mode 100644
index 0000000000000..a7d42a98d94c6
--- /dev/null
+++ b/mysql-test/main/path_resolution.test
@@ -0,0 +1,3685 @@
+--echo #
+--echo # MDEV-34391 Path resolution
+--echo #
+######################################################################################
+#                             Path resolution                                        #
+######################################################################################
+# The path resolution unit test contains 8 kinds of tests.                           #
+# Following listed the types sequence in this test:                                  #
+# type 1: MariaDB Default SQL/PSM mode syntax, unqualified function                  #
+# type 2: MariaDB Default SQL/PSM mode syntax, qualified function, ie: with package  #
+# type 3: MariaDB Default SQL/PSM mode syntax, unqualified procedure                 #
+# type 4: MariaDB Default SQL/PSM mode syntax, qualified procedure, ie: with package #
+# type 5: MariaDB Oracle PL/SQL mode syntax,   unqualified function                  #
+# type 6: MariaDB Oracle PL/SQL mode syntax,   qualified function, ie: with package  #
+# type 7: MariaDB Oracle PL/SQL mode syntax,   unqualified procedure                 #
+# type 8: MariaDB Oracle PL/SQL mode syntax,   qualified procedure, ie: with package #
+#                                                                                    #
+# All the tests start with the following header that contained                       #
+# with 5 attributes delimited with the pipe ('|') symbol.                            #
+#                                                                                    #
+# sql_mode: DEFAULT | function | is unqualified                                      #
+# curr db: X | path set: no                                                          #
+#                                                                                    #
+# 1. sql_mode: To test DEFAULT or ORACLE mode                                        #
+# 2. function / procedure: To test function or procedure routine                     #
+# 3. is unqualified / is qualified: The test is contained unqualified routine only   #
+#                                   or qualified routine or package                  #
+# 4. curr db: Current selected database before execute the test                      #
+# 5. path set: is the system variable, path, set during the test?                    #
+######################################################################################
+
+CREATE DATABASE test2;
+
+--echo #
+--echo # type 1.1
+--echo # sql_mode: DEFAULT | function | is unqualified
+--echo # curr db: X | path set: no
+--echo #
+
+CREATE FUNCTION func() RETURNS TEXT RETURN 'Invoke from Db: test, Rt: func';
+
+--source include/deselect_db.inc
+
+# subtest start
+--error ER_SP_DOES_NOT_EXIST
+SELECT func();
+
+
+
+--echo #
+--echo # type 1.2
+--echo # sql_mode: DEFAULT | function | is unqualified
+--echo # curr db: X | path set: yes
+--echo #
+
+# set path
+SET PATH= 'sys,test';
+
+# subtest start
+SELECT func();
+
+# subtest finish, deinit
+SET @@path = DEFAULT;
+
+
+
+--echo #
+--echo # type 1.3
+--echo # sql_mode: DEFAULT | function | is unqualified
+--echo # curr db: test2 | path set: no
+--echo #
+
+# subtest start
+USE test2;
+--error ER_SP_DOES_NOT_EXIST
+SELECT func();
+
+
+
+--echo #
+--echo # type 1.4
+--echo # sql_mode: DEFAULT | function | is unqualified
+--echo # curr db: test2 | path set: yes
+--echo #
+
+# set path
+SET PATH= 'sys,test';
+
+# subtest start
+USE test2;
+SELECT func();
+
+# subtest finish, deinit
+SET @@path = DEFAULT;
+
+
+
+--echo #
+--echo # type 1.5
+--echo # sql_mode: DEFAULT | function | is unqualified
+--echo # curr db: X | path set: yes
+--echo # lookup in between 2 unqualified functions with exactly the same name in different 2 databases
+--echo #
+
+USE test2;
+CREATE FUNCTION func() RETURNS TEXT RETURN 'Invoke from Db: test2, Rt: func';
+
+# subtest start
+--source include/deselect_db.inc
+# set path
+SET PATH= 'test,test2';
+SELECT func();
+SET PATH= 'test2,test';
+SELECT func();
+DROP FUNCTION test2.func;
+SELECT func();
+DROP FUNCTION test.func;
+--error ER_SP_DOES_NOT_EXIST
+SELECT func();
+
+# subtest finish, deinit
+SET @@path = DEFAULT;
+
+
+
+--echo #
+--echo # type 1.6
+--echo # sql_mode: DEFAULT | function | is unqualified
+--echo # curr db: test2 | path set: yes
+--echo # lookup in between 2 unqualified functions with exactly the same name in different 2 databases
+--echo #
+
+USE test;
+CREATE FUNCTION func() RETURNS TEXT RETURN 'Invoke from Db: test, Rt: func';
+
+# set path
+SET PATH= 'sys,test';
+
+# subtest start
+USE test2;
+SELECT func();
+
+CREATE FUNCTION func() RETURNS TEXT RETURN 'Invoke from Db: test2, Rt: func';
+
+SELECT func();
+DROP FUNCTION func;
+SELECT func();
+DROP FUNCTION test.func;
+--error ER_SP_DOES_NOT_EXIST
+SELECT func();
+
+# subtest finish, deinit
+SET @@path = DEFAULT;
+
+
+
+--echo #
+--echo # type 1.7
+--echo # sql_mode: DEFAULT | function | is unqualified
+--echo # curr db: X | path set: yes
+--echo # to test unqualified function invocation in an unqualified function
+--echo #
+
+# subtest start
+SET PATH= 'test,test2';
+
+USE test2;
+CREATE FUNCTION func() RETURNS TEXT RETURN 'Invoke from Db: test2, Rt: func';
+
+USE test;
+CREATE FUNCTION func_call_func() RETURNS TEXT RETURN func();
+
+--source include/deselect_db.inc
+SELECT func_call_func();
+
+USE test;
+CREATE FUNCTION func() RETURNS TEXT RETURN 'Invoke from Db: test, Rt: func';
+
+--source include/deselect_db.inc
+SELECT func_call_func();
+
+DROP FUNCTION test.func;
+SELECT func_call_func();
+DROP FUNCTION test2.func;
+--error ER_SP_DOES_NOT_EXIST
+SELECT func_call_func();
+
+# subtest finish, deinit
+USE test;
+DROP FUNCTION func_call_func;
+SET @@path = DEFAULT;
+
+
+
+--echo #
+--echo # type 1.8
+--echo # sql_mode: DEFAULT | function | is unqualified
+--echo # curr db: test | path set: yes
+--echo # to test unqualified function invocation in an unqualified function
+--echo #
+
+# subtest start
+SET PATH= 'sys,test2';
+
+USE test2;
+CREATE FUNCTION func() RETURNS TEXT RETURN 'Invoke from Db: test2, Rt: func';
+
+USE test;
+CREATE FUNCTION func_call_func() RETURNS TEXT RETURN func();
+
+SELECT func_call_func();
+
+CREATE FUNCTION func() RETURNS TEXT RETURN 'Invoke from Db: test, Rt: func';
+
+SELECT func_call_func();
+
+DROP FUNCTION func;
+SELECT func_call_func();
+DROP FUNCTION test2.func;
+--error ER_SP_DOES_NOT_EXIST
+SELECT func_call_func();
+
+# subtest finish, deinit
+USE test;
+DROP FUNCTION func_call_func;
+SET @@path = DEFAULT;
+
+
+
+--echo #
+--echo # type 2.1
+--echo # sql_mode: DEFAULT | function | is qualified
+--echo # curr db: X | path set: no
+--echo #
+
+USE test;
+
+DELIMITER $$;
+CREATE PACKAGE pack
+  FUNCTION func() RETURNS TEXT;
+END;
+$$
+CREATE PACKAGE BODY pack
+  FUNCTION func() RETURNS TEXT RETURN 'Invoke from Db: test, Pack: pack, Rt: func';
+END;
+$$
+DELIMITER ;$$
+
+--source include/deselect_db.inc
+
+# subtest start
+--error ER_SP_DOES_NOT_EXIST
+SELECT pack.func();
+
+
+
+--echo #
+--echo # type 2.2
+--echo # sql_mode: DEFAULT | function | is qualified
+--echo # curr db: X | path set: yes
+--echo #
+
+# set path
+SET PATH= 'sys,test';
+
+# subtest start
+SELECT pack.func();
+
+# subtest finish, deinit
+SET @@path = DEFAULT;
+
+
+
+--echo #
+--echo # type 2.3
+--echo # sql_mode: DEFAULT | function | is qualified
+--echo # curr db: test2 | path set: no
+--echo #
+
+# subtest start
+USE test2;
+--error ER_SP_DOES_NOT_EXIST
+SELECT pack.func();
+
+
+
+--echo #
+--echo # type 2.4
+--echo # sql_mode: DEFAULT | function | is qualified
+--echo # curr db: test2 | path set: yes
+--echo #
+
+# set path
+SET PATH= 'sys,test';
+
+# subtest start
+USE test2;
+SELECT pack.func();
+
+# subtest finish, deinit
+SET @@path = DEFAULT;
+
+
+
+--echo #
+--echo # type 2.5
+--echo # sql_mode: DEFAULT | function | is qualified
+--echo # curr db: X | path set: yes
+--echo # lookup in between 2 qualified packages function with exactly the same name in different 2 databases
+--echo #
+
+USE test2;
+DELIMITER $$;
+CREATE PACKAGE pack
+  FUNCTION func() RETURNS TEXT;
+END;
+$$
+CREATE PACKAGE BODY pack
+  FUNCTION func() RETURNS TEXT RETURN 'Invoke from Db: test2, Pack: pack, Rt: func';
+END;
+$$
+DELIMITER ;$$
+
+# subtest start
+--source include/deselect_db.inc
+# set path
+SET PATH= 'test,test2';
+SELECT pack.func();
+SET PATH= 'test2,test';
+SELECT pack.func();
+DROP PACKAGE BODY test2.pack;
+DROP PACKAGE test2.pack;
+SELECT pack.func();
+DROP PACKAGE BODY test.pack;
+DROP PACKAGE test.pack;
+--error ER_SP_DOES_NOT_EXIST
+SELECT pack.func();
+
+# subtest finish, deinit
+SET @@path = DEFAULT;
+
+
+
+--echo #
+--echo # type 2.6
+--echo # sql_mode: DEFAULT | function | is qualified
+--echo # curr db: test2 | path set: yes
+--echo # lookup in between 2 qualified packages function with exactly the same name in different 2 databases
+--echo #
+
+USE test;
+
+DELIMITER $$;
+CREATE PACKAGE pack
+  FUNCTION func() RETURNS TEXT;
+END;
+$$
+CREATE PACKAGE BODY pack
+  FUNCTION func() RETURNS TEXT RETURN 'Invoke from Db: test, Pack: pack, Rt: func';
+END;
+$$
+DELIMITER ;$$
+
+# set path
+SET PATH= 'sys,test';
+
+# subtest start
+USE test2;
+SELECT pack.func();
+
+DELIMITER $$;
+CREATE PACKAGE pack
+  FUNCTION func() RETURNS TEXT;
+END;
+$$
+CREATE PACKAGE BODY pack
+  FUNCTION func() RETURNS TEXT RETURN 'Invoke from Db: test2, Pack: pack, Rt: func';
+END;
+$$
+DELIMITER ;$$
+
+SELECT pack.func();
+DROP PACKAGE BODY pack;
+DROP PACKAGE pack;
+SELECT pack.func();
+DROP PACKAGE BODY test.pack;
+DROP PACKAGE test.pack;
+--error ER_SP_DOES_NOT_EXIST
+SELECT pack.func();
+
+# subtest finish, deinit
+SET @@path = DEFAULT;
+
+
+
+--echo #
+--echo # type 2.7
+--echo # sql_mode: DEFAULT | function | is qualified
+--echo # curr db: X | path set: yes
+--echo # to test unqualified function invocation in a qualified package function
+--echo #
+
+# subtest start
+SET PATH= 'test,test2';
+
+USE test2;
+CREATE FUNCTION func_local() RETURNS TEXT RETURN 'Invoke from Db: test2, Rt: func_local';
+
+USE test;
+DELIMITER $$;
+CREATE PACKAGE pack
+  FUNCTION func() RETURNS TEXT;
+END;
+$$
+CREATE PACKAGE BODY pack
+  FUNCTION func() RETURNS TEXT RETURN func_local();
+END;
+$$
+DELIMITER ;$$
+
+--source include/deselect_db.inc
+SELECT pack.func();
+
+USE test;
+CREATE FUNCTION func_local() RETURNS TEXT RETURN 'Invoke from Db: test, Rt: func_local';
+
+--source include/deselect_db.inc
+SELECT pack.func();
+
+DROP FUNCTION test.func_local;
+SELECT pack.func();
+DROP FUNCTION test2.func_local;
+--error ER_SP_DOES_NOT_EXIST
+SELECT pack.func();
+
+# subtest finish, deinit
+USE test;
+DROP PACKAGE BODY pack;
+DROP PACKAGE pack;
+SET @@path = DEFAULT;
+
+
+
+--echo #
+--echo # type 2.8
+--echo # sql_mode: DEFAULT | function | is qualified
+--echo # curr db: test | path set: yes
+--echo # to test unqualified function invocation in a qualified package function
+--echo #
+
+# subtest start
+SET PATH= 'test,test2';
+
+USE test2;
+CREATE FUNCTION func_local() RETURNS TEXT RETURN 'Invoke from Db: test2, Rt: func_local';
+
+USE test;
+DELIMITER $$;
+CREATE PACKAGE pack
+  FUNCTION func() RETURNS TEXT;
+END;
+$$
+CREATE PACKAGE BODY pack
+  FUNCTION func() RETURNS TEXT RETURN func_local();
+END;
+$$
+DELIMITER ;$$
+
+SELECT pack.func();
+
+CREATE FUNCTION func_local() RETURNS TEXT RETURN 'Invoke from Db: test, Rt: func_local';
+
+SELECT pack.func();
+DROP FUNCTION func_local;
+SELECT pack.func();
+DROP FUNCTION test2.func_local;
+--error ER_SP_DOES_NOT_EXIST
+SELECT pack.func();
+
+# subtest finish, deinit
+USE test;
+DROP PACKAGE BODY pack;
+DROP PACKAGE pack;
+SET @@path = DEFAULT;
+
+
+
+--echo #
+--echo # type 2.9
+--echo # sql_mode: DEFAULT | function | is qualified
+--echo # curr db: X | path set: yes
+--echo # to test qualified package function invocation in a qualified package function
+--echo #
+
+# subtest start
+SET PATH= 'test,test2';
+
+USE test2;
+DELIMITER $$;
+CREATE PACKAGE pack2
+  FUNCTION func() RETURNS TEXT;
+END;
+$$
+CREATE PACKAGE BODY pack2
+  FUNCTION func() RETURNS TEXT RETURN 'Invoke from Db: test2, Pack: pack2, Rt: func';
+END;
+$$
+DELIMITER ;$$
+
+USE test;
+DELIMITER $$;
+CREATE PACKAGE pack
+  FUNCTION func() RETURNS TEXT;
+END;
+$$
+CREATE PACKAGE BODY pack
+  FUNCTION func() RETURNS TEXT RETURN pack2.func();
+END;
+$$
+DELIMITER ;$$
+
+--source include/deselect_db.inc
+SELECT pack.func();
+
+USE test;
+DELIMITER $$;
+CREATE PACKAGE pack2
+  FUNCTION func() RETURNS TEXT;
+END;
+$$
+CREATE PACKAGE BODY pack2
+  FUNCTION func() RETURNS TEXT RETURN 'Invoke from Db: test, Pack: pack2, Rt: func';
+END;
+$$
+DELIMITER ;$$
+
+--source include/deselect_db.inc
+SELECT pack.func();
+
+DROP PACKAGE BODY test.pack2;
+DROP PACKAGE test.pack2;
+SELECT pack.func();
+DROP PACKAGE BODY test2.pack2;
+DROP PACKAGE test2.pack2;
+--error ER_SP_DOES_NOT_EXIST
+SELECT pack.func();
+
+# subtest finish, deinit
+USE test;
+DROP PACKAGE BODY pack;
+DROP PACKAGE pack;
+SET @@path = DEFAULT;
+
+
+
+--echo #
+--echo # type 2.10
+--echo # sql_mode: DEFAULT | function | is qualified
+--echo # curr db: test | path set: yes
+--echo # to test qualified package function invocation in a qualified package function
+--echo #
+
+# subtest start
+SET PATH= 'sys,test2';
+
+USE test2;
+DELIMITER $$;
+CREATE PACKAGE pack2
+  FUNCTION func() RETURNS TEXT;
+END;
+$$
+CREATE PACKAGE BODY pack2
+  FUNCTION func() RETURNS TEXT RETURN 'Invoke from Db: test2, Pack: pack2, Rt: func';
+END;
+$$
+DELIMITER ;$$
+
+USE test;
+DELIMITER $$;
+CREATE PACKAGE pack
+  FUNCTION func() RETURNS TEXT;
+END;
+$$
+CREATE PACKAGE BODY pack
+  FUNCTION func() RETURNS TEXT RETURN pack2.func();
+END;
+$$
+DELIMITER ;$$
+
+SELECT pack.func();
+
+DELIMITER $$;
+CREATE PACKAGE pack2
+  FUNCTION func() RETURNS TEXT;
+END;
+$$
+CREATE PACKAGE BODY pack2
+  FUNCTION func() RETURNS TEXT RETURN 'Invoke from Db: test, Pack: pack2, Rt: func';
+END;
+$$
+DELIMITER ;$$
+
+SELECT pack.func();
+
+DROP PACKAGE BODY pack2;
+DROP PACKAGE pack2;
+SELECT pack.func();
+DROP PACKAGE BODY test2.pack2;
+DROP PACKAGE test2.pack2;
+--error ER_SP_DOES_NOT_EXIST
+SELECT pack.func();
+
+# subtest finish, deinit
+USE test;
+DROP PACKAGE BODY pack;
+DROP PACKAGE pack;
+SET @@path = DEFAULT;
+
+
+
+--echo #
+--echo # type 2.11
+--echo # sql_mode: DEFAULT | function | is qualified
+--echo # curr db: X | path set: yes
+--echo # resolution priority in between qualified package function vs qualified db function resolution
+--echo #
+
+USE test;
+DELIMITER $$;
+CREATE PACKAGE pack
+  FUNCTION func() RETURNS TEXT;
+END;
+$$
+CREATE PACKAGE BODY pack
+  FUNCTION func() RETURNS TEXT RETURN 'Invoke from Db: test, Pack: pack, Rt: func';
+END;
+$$
+DELIMITER ;$$
+
+CREATE DATABASE pack;
+USE pack;
+CREATE FUNCTION func() RETURNS TEXT RETURN 'Invoke from Db: pack, Rt: func';
+
+--source include/deselect_db.inc
+
+# subtest start
+SELECT pack.func();
+# set path
+SET PATH= 'sys,test';
+SELECT pack.func();
+DROP PACKAGE BODY test.pack;
+DROP PACKAGE test.pack;
+SELECT pack.func();
+DROP FUNCTION pack.func;
+--error ER_SP_DOES_NOT_EXIST
+SELECT pack.func();
+
+# subtest finish, deinit
+SET @@path = DEFAULT;
+
+
+
+--echo #
+--echo # type 2.12
+--echo # sql_mode: DEFAULT | function | is qualified
+--echo # curr db: test | path set: yes
+--echo # resolution priority in between qualified package function vs qualified db function resolution
+--echo #
+
+USE test;
+DELIMITER $$;
+CREATE PACKAGE pack
+  FUNCTION func() RETURNS TEXT;
+END;
+$$
+CREATE PACKAGE BODY pack
+  FUNCTION func() RETURNS TEXT RETURN 'Invoke from Db: test, Pack: pack, Rt: func';
+END;
+$$
+DELIMITER ;$$
+
+USE pack;
+CREATE FUNCTION func() RETURNS TEXT RETURN 'Invoke from Db: pack, Rt: func';
+
+# subtest start
+USE test;
+SELECT pack.func();
+DROP PACKAGE BODY pack;
+DROP PACKAGE pack;
+SELECT pack.func();
+DROP FUNCTION pack.func;
+--error ER_SP_DOES_NOT_EXIST
+SELECT pack.func();
+
+# subtest finish, deinit
+SET @@path = DEFAULT;
+
+
+
+--echo #
+--echo # type 2.13
+--echo # sql_mode: DEFAULT | function | is qualified
+--echo # curr db: test2 | path set: yes
+--echo # resolution priority in between qualified package function vs qualified db function resolution
+--echo #
+
+USE test;
+DELIMITER $$;
+CREATE PACKAGE pack
+  FUNCTION func() RETURNS TEXT;
+END;
+$$
+CREATE PACKAGE BODY pack
+  FUNCTION func() RETURNS TEXT RETURN 'Invoke from Db: test, Pack: pack, Rt: func';
+END;
+$$
+DELIMITER ;$$
+
+USE pack;
+CREATE FUNCTION func() RETURNS TEXT RETURN 'Invoke from Db: pack, Rt: func';
+
+# subtest start
+USE test2;
+SELECT pack.func();
+# set path
+SET PATH= 'sys,test';
+SELECT pack.func();
+DROP PACKAGE BODY test.pack;
+DROP PACKAGE test.pack;
+SELECT pack.func();
+DROP FUNCTION pack.func;
+--error ER_SP_DOES_NOT_EXIST
+SELECT pack.func();
+
+# subtest finish, deinit
+DROP DATABASE pack;
+SET @@path = DEFAULT;
+
+
+
+--echo #
+--echo # type 2.14
+--echo # sql_mode: DEFAULT | function | is qualified
+--echo # curr db: X | path set: yes
+--echo # qualified package function invoke internal private function
+--echo #
+
+# subtest start
+SET PATH= 'test,test2';
+
+USE test2;
+CREATE FUNCTION func_prv() RETURNS TEXT RETURN 'Invoke from Db: test2, Rt: func_prv';
+
+USE test;
+CREATE FUNCTION func_prv() RETURNS TEXT RETURN 'Invoke from Db: test, Rt: func_prv';
+
+DELIMITER $$;
+CREATE PACKAGE pack
+  FUNCTION func_pub() RETURNS TEXT;
+END;
+$$
+CREATE PACKAGE BODY pack
+  FUNCTION func_prv() RETURNS TEXT RETURN 'Invoke from Db: test, Pack: pack, Rt: func_prv';
+
+  FUNCTION func_pub() RETURNS TEXT RETURN func_prv();
+END;
+$$
+DELIMITER ;$$
+
+--source include/deselect_db.inc
+SELECT pack.func_pub();
+
+# subtest finish, deinit
+SET @@path = DEFAULT;
+
+
+
+--echo #
+--echo # type 2.15
+--echo # sql_mode: DEFAULT | function | is qualified
+--echo # curr db: test2 | path set: yes
+--echo # qualified package function invoke internal private function
+--echo #
+
+# subtest start
+SET PATH= 'test,test2';
+
+USE test2;
+SELECT pack.func_pub();
+
+# subtest finish, deinit
+DROP FUNCTION func_prv;
+USE test;
+DROP FUNCTION func_prv;
+DROP PACKAGE BODY pack;
+DROP PACKAGE pack;
+SET @@path = DEFAULT;
+
+
+
+--echo #
+--echo # type 3.1
+--echo # sql_mode: DEFAULT | procedure | is unqualified
+--echo # curr db: X | path set: no
+--echo #
+
+CREATE PROCEDURE proc() SELECT 'Invoke from Db: test, Rt: proc';
+
+--source include/deselect_db.inc
+
+# subtest start
+--error ER_NO_DB_ERROR
+CALL proc;
+
+
+
+--echo #
+--echo # type 3.2
+--echo # sql_mode: DEFAULT | procedure | is unqualified
+--echo # curr db: X | path set: yes
+--echo #
+
+# set path
+SET PATH= 'sys,test';
+
+# subtest start
+CALL proc;
+
+# subtest finish, deinit
+SET @@path = DEFAULT;
+
+
+
+--echo #
+--echo # type 3.3
+--echo # sql_mode: DEFAULT | procedure | is unqualified
+--echo # curr db: test2 | path set: no
+--echo #
+
+# subtest start
+USE test2;
+--error ER_SP_DOES_NOT_EXIST
+CALL proc;
+
+
+
+--echo #
+--echo # type 3.4
+--echo # sql_mode: DEFAULT | procedure | is unqualified
+--echo # curr db: test2 | path set: yes
+--echo #
+
+# set path
+SET PATH= 'sys,test';
+
+# subtest start
+USE test2;
+CALL proc;
+
+# subtest finish, deinit
+SET @@path = DEFAULT;
+
+
+
+--echo #
+--echo # type 3.5
+--echo # sql_mode: DEFAULT | procedure | is unqualified
+--echo # curr db: X | path set: yes
+--echo # lookup in between 2 unqualified procedures with exactly the same name in different 2 databases
+--echo #
+
+USE test2;
+CREATE PROCEDURE proc() SELECT 'Invoke from Db: test2, Rt: proc';
+
+# subtest start
+--source include/deselect_db.inc
+# set path
+SET PATH= 'test,test2';
+CALL proc;
+SET PATH= 'test2,test';
+CALL proc;
+DROP PROCEDURE test2.proc;
+CALL proc;
+DROP PROCEDURE test.proc;
+--error ER_NO_DB_ERROR
+CALL proc;
+
+# subtest finish, deinit
+SET @@path = DEFAULT;
+
+
+
+--echo #
+--echo # type 3.6
+--echo # sql_mode: DEFAULT | procedure | is unqualified
+--echo # curr db: test2 | path set: yes
+--echo # lookup in between 2 unqualified procedures with exactly the same name in different 2 databases
+--echo #
+
+USE test;
+CREATE PROCEDURE proc() SELECT 'Invoke from Db: test, Rt: proc';
+
+# set path
+SET PATH= 'sys,test';
+
+# subtest start
+USE test2;
+CALL proc;
+
+CREATE PROCEDURE proc() SELECT 'Invoke from Db: test2, Rt: proc';
+
+CALL proc;
+DROP PROCEDURE proc;
+CALL proc;
+DROP PROCEDURE test.proc;
+--error ER_SP_DOES_NOT_EXIST
+CALL proc;
+
+# subtest finish, deinit
+SET @@path = DEFAULT;
+
+
+
+--echo #
+--echo # type 3.7
+--echo # sql_mode: DEFAULT | procedure | is unqualified
+--echo # curr db: X | path set: yes
+--echo # to test unqualified procedure invocation in an unqualified procedure
+--echo #
+
+# subtest start
+SET PATH= 'test,test2';
+
+USE test2;
+CREATE PROCEDURE proc() SELECT 'Invoke from Db: test2, Rt: proc';
+
+USE test;
+CREATE PROCEDURE proc_call_proc() CALL proc;
+
+--source include/deselect_db.inc
+CALL proc_call_proc;
+
+USE test;
+CREATE PROCEDURE proc() SELECT 'Invoke from Db: test, Rt: proc';
+
+--source include/deselect_db.inc
+CALL proc_call_proc;
+
+DROP PROCEDURE test.proc;
+CALL proc_call_proc;
+DROP PROCEDURE test2.proc;
+--error ER_SP_DOES_NOT_EXIST
+CALL proc_call_proc;
+
+# subtest finish, deinit
+USE test;
+DROP PROCEDURE proc_call_proc;
+SET @@path = DEFAULT;
+
+
+
+--echo #
+--echo # type 3.8
+--echo # sql_mode: DEFAULT | procedure | is unqualified
+--echo # curr db: test | path set: yes
+--echo # to test unqualified procedure invocation in an unqualified procedure
+--echo #
+
+# subtest start
+SET PATH= 'sys,test2';
+
+USE test2;
+CREATE PROCEDURE proc() SELECT 'Invoke from Db: test2, Rt: proc';
+
+USE test;
+CREATE PROCEDURE proc_call_proc() CALL proc;
+
+CALL proc_call_proc;
+
+CREATE PROCEDURE proc() SELECT 'Invoke from Db: test, Rt: proc';
+
+CALL proc_call_proc;
+
+DROP PROCEDURE proc;
+CALL proc_call_proc;
+DROP PROCEDURE test2.proc;
+--error ER_SP_DOES_NOT_EXIST
+CALL proc_call_proc;
+
+# subtest finish, deinit
+USE test;
+DROP PROCEDURE proc_call_proc;
+SET @@path = DEFAULT;
+
+
+
+--echo #
+--echo # type 4.1
+--echo # sql_mode: DEFAULT | procedure | is qualified
+--echo # curr db: X | path set: no
+--echo #
+
+USE test;
+
+DELIMITER $$;
+CREATE PACKAGE pack
+  PROCEDURE proc();
+END;
+$$
+CREATE PACKAGE BODY pack
+  PROCEDURE proc() SELECT 'Invoke from Db: test, Pack: pack, Rt: proc';
+END;
+$$
+DELIMITER ;$$
+
+--source include/deselect_db.inc
+
+# subtest start
+--error ER_SP_DOES_NOT_EXIST
+CALL pack.proc;
+
+
+
+--echo #
+--echo # type 4.2
+--echo # sql_mode: DEFAULT | procedure | is qualified
+--echo # curr db: X | path set: yes
+--echo #
+
+# set path
+SET PATH= 'sys,test';
+
+# subtest start
+CALL pack.proc;
+
+# subtest finish, deinit
+SET @@path = DEFAULT;
+
+
+
+--echo #
+--echo # type 4.3
+--echo # sql_mode: DEFAULT | procedure | is qualified
+--echo # curr db: test2 | path set: no
+--echo #
+
+# subtest start
+USE test2;
+--error ER_SP_DOES_NOT_EXIST
+CALL pack.proc;
+
+
+
+--echo #
+--echo # type 4.4
+--echo # sql_mode: DEFAULT | procedure | is qualified
+--echo # curr db: test2 | path set: yes
+--echo #
+
+# set path
+SET PATH= 'sys,test';
+
+# subtest start
+USE test2;
+CALL pack.proc;
+
+# subtest finish, deinit
+SET @@path = DEFAULT;
+
+
+
+--echo #
+--echo # type 4.5
+--echo # sql_mode: DEFAULT | procedure | is qualified
+--echo # curr db: X | path set: yes
+--echo # lookup in between 2 qualified packages procedure with exactly the same name in different 2 databases
+--echo #
+
+USE test2;
+DELIMITER $$;
+CREATE PACKAGE pack
+  PROCEDURE proc();
+END;
+$$
+CREATE PACKAGE BODY pack
+  PROCEDURE proc() SELECT 'Invoke from Db: test2, Pack: pack, Rt: proc';
+END;
+$$
+DELIMITER ;$$
+
+# subtest start
+--source include/deselect_db.inc
+# set path
+SET PATH= 'test,test2';
+CALL pack.proc;
+SET PATH= 'test2,test';
+CALL pack.proc;
+DROP PACKAGE BODY test2.pack;
+DROP PACKAGE test2.pack;
+CALL pack.proc;
+DROP PACKAGE BODY test.pack;
+DROP PACKAGE test.pack;
+--error ER_SP_DOES_NOT_EXIST
+CALL pack.proc;
+
+# subtest finish, deinit
+SET @@path = DEFAULT;
+
+
+
+--echo #
+--echo # type 4.6
+--echo # sql_mode: DEFAULT | procedure | is qualified
+--echo # curr db: test2 | path set: yes
+--echo # lookup in between 2 qualified packages procedure with exactly the same name in different 2 databases
+--echo #
+
+USE test;
+
+DELIMITER $$;
+CREATE PACKAGE pack
+  PROCEDURE proc();
+END;
+$$
+CREATE PACKAGE BODY pack
+  PROCEDURE proc() SELECT 'Invoke from Db: test, Pack: pack, Rt: proc';
+END;
+$$
+DELIMITER ;$$
+
+# set path
+SET PATH= 'sys,test';
+
+# subtest start
+USE test2;
+CALL pack.proc;
+
+DELIMITER $$;
+CREATE PACKAGE pack
+  PROCEDURE proc();
+END;
+$$
+CREATE PACKAGE BODY pack
+  PROCEDURE proc() SELECT 'Invoke from Db: test2, Pack: pack, Rt: proc';
+END;
+$$
+DELIMITER ;$$
+
+CALL pack.proc;
+DROP PACKAGE BODY pack;
+DROP PACKAGE pack;
+CALL pack.proc;
+DROP PACKAGE BODY test.pack;
+DROP PACKAGE test.pack;
+--error ER_SP_DOES_NOT_EXIST
+CALL pack.proc;
+
+# subtest finish, deinit
+SET @@path = DEFAULT;
+
+
+
+--echo #
+--echo # type 4.7
+--echo # sql_mode: DEFAULT | procedure | is qualified
+--echo # curr db: X | path set: yes
+--echo # to test unqualified procedure invocation in a qualified package procedure
+--echo #
+
+# subtest start
+SET PATH= 'test,test2';
+
+USE test2;
+CREATE PROCEDURE proc_local() SELECT 'Invoke from Db: test2, Rt: proc_local';
+
+USE test;
+DELIMITER $$;
+CREATE PACKAGE pack
+  PROCEDURE proc();
+END;
+$$
+CREATE PACKAGE BODY pack
+  PROCEDURE proc() CALL proc_local;
+END;
+$$
+DELIMITER ;$$
+
+--source include/deselect_db.inc
+CALL pack.proc;
+
+USE test;
+CREATE PROCEDURE proc_local() SELECT 'Invoke from Db: test, Rt: proc_local';
+
+--source include/deselect_db.inc
+CALL pack.proc;
+
+DROP PROCEDURE test.proc_local;
+CALL pack.proc;
+DROP PROCEDURE test2.proc_local;
+--error ER_SP_DOES_NOT_EXIST
+CALL pack.proc;
+
+# subtest finish, deinit
+USE test;
+DROP PACKAGE BODY pack;
+DROP PACKAGE pack;
+SET @@path = DEFAULT;
+
+
+
+--echo #
+--echo # type 4.8
+--echo # sql_mode: DEFAULT | procedure | is qualified
+--echo # curr db: test | path set: yes
+--echo # to test unqualified procedure invocation in a qualified package procedure
+--echo #
+
+# subtest start
+SET PATH= 'test,test2';
+
+USE test2;
+CREATE PROCEDURE proc_local() SELECT 'Invoke from Db: test2, Rt: proc_local';
+
+USE test;
+DELIMITER $$;
+CREATE PACKAGE pack
+  PROCEDURE proc();
+END;
+$$
+CREATE PACKAGE BODY pack
+  PROCEDURE proc() CALL proc_local;
+END;
+$$
+DELIMITER ;$$
+
+CALL pack.proc;
+
+CREATE PROCEDURE proc_local() SELECT 'Invoke from Db: test, Rt: proc_local';
+
+CALL pack.proc;
+DROP PROCEDURE proc_local;
+CALL pack.proc;
+DROP PROCEDURE test2.proc_local;
+--error ER_SP_DOES_NOT_EXIST
+CALL pack.proc;
+
+# subtest finish, deinit
+USE test;
+DROP PACKAGE BODY pack;
+DROP PACKAGE pack;
+SET @@path = DEFAULT;
+
+
+
+--echo #
+--echo # type 4.9
+--echo # sql_mode: DEFAULT | procedure | is qualified
+--echo # curr db: X | path set: yes
+--echo # to test qualified package procedure invocation in a qualified package procedure
+--echo #
+
+# subtest start
+SET PATH= 'test,test2';
+
+USE test2;
+DELIMITER $$;
+CREATE PACKAGE pack2
+  PROCEDURE proc();
+END;
+$$
+CREATE PACKAGE BODY pack2
+  PROCEDURE proc() SELECT 'Invoke from Db: test2, Pack: pack2, Rt: proc';
+END;
+$$
+DELIMITER ;$$
+
+USE test;
+DELIMITER $$;
+CREATE PACKAGE pack
+  PROCEDURE proc();
+END;
+$$
+CREATE PACKAGE BODY pack
+  PROCEDURE proc() CALL pack2.proc;
+END;
+$$
+DELIMITER ;$$
+
+--source include/deselect_db.inc
+CALL pack.proc;
+
+USE test;
+DELIMITER $$;
+CREATE PACKAGE pack2
+  PROCEDURE proc();
+END;
+$$
+CREATE PACKAGE BODY pack2
+  PROCEDURE proc() SELECT 'Invoke from Db: test, Pack: pack2, Rt: proc';
+END;
+$$
+DELIMITER ;$$
+
+--source include/deselect_db.inc
+CALL pack.proc;
+
+DROP PACKAGE BODY test.pack2;
+DROP PACKAGE test.pack2;
+CALL pack.proc;
+DROP PACKAGE BODY test2.pack2;
+DROP PACKAGE test2.pack2;
+--error ER_SP_DOES_NOT_EXIST
+CALL pack.proc;
+
+# subtest finish, deinit
+USE test;
+DROP PACKAGE BODY pack;
+DROP PACKAGE pack;
+SET @@path = DEFAULT;
+
+
+
+--echo #
+--echo # type 4.10
+--echo # sql_mode: DEFAULT | procedure | is qualified
+--echo # curr db: test | path set: yes
+--echo # to test qualified package procedure invocation in a qualified package procedure
+--echo #
+
+# subtest start
+SET PATH= 'sys,test2';
+
+USE test2;
+DELIMITER $$;
+CREATE PACKAGE pack2
+  PROCEDURE proc();
+END;
+$$
+CREATE PACKAGE BODY pack2
+  PROCEDURE proc() SELECT 'Invoke from Db: test2, Pack: pack2, Rt: proc';
+END;
+$$
+DELIMITER ;$$
+
+USE test;
+DELIMITER $$;
+CREATE PACKAGE pack
+  PROCEDURE proc();
+END;
+$$
+CREATE PACKAGE BODY pack
+  PROCEDURE proc() CALL pack2.proc;
+END;
+$$
+DELIMITER ;$$
+
+CALL pack.proc;
+
+DELIMITER $$;
+CREATE PACKAGE pack2
+  PROCEDURE proc();
+END;
+$$
+CREATE PACKAGE BODY pack2
+  PROCEDURE proc() SELECT 'Invoke from Db: test, Pack: pack2, Rt: proc';
+END;
+$$
+DELIMITER ;$$
+
+CALL pack.proc;
+
+DROP PACKAGE BODY pack2;
+DROP PACKAGE pack2;
+CALL pack.proc;
+DROP PACKAGE BODY test2.pack2;
+DROP PACKAGE test2.pack2;
+--error ER_SP_DOES_NOT_EXIST
+CALL pack.proc;
+
+# subtest finish, deinit
+USE test;
+DROP PACKAGE BODY pack;
+DROP PACKAGE pack;
+SET @@path = DEFAULT;
+
+
+
+--echo #
+--echo # type 4.11
+--echo # sql_mode: DEFAULT | procedure | is qualified
+--echo # curr db: X | path set: yes
+--echo # resolution priority in between qualified package procedure vs qualified db procedure resolution
+--echo #
+
+USE test;
+DELIMITER $$;
+CREATE PACKAGE pack
+  PROCEDURE proc();
+END;
+$$
+CREATE PACKAGE BODY pack
+  PROCEDURE proc() SELECT 'Invoke from Db: test, Pack: pack, Rt: proc';
+END;
+$$
+DELIMITER ;$$
+
+CREATE DATABASE pack;
+USE pack;
+CREATE PROCEDURE proc() SELECT 'Invoke from Db: pack, Rt: proc';
+
+--source include/deselect_db.inc
+
+# subtest start
+CALL pack.proc;
+# set path
+SET PATH= 'sys,test';
+CALL pack.proc;
+DROP PACKAGE BODY test.pack;
+DROP PACKAGE test.pack;
+CALL pack.proc;
+DROP PROCEDURE pack.proc;
+--error ER_SP_DOES_NOT_EXIST
+CALL pack.proc;
+
+# subtest finish, deinit
+SET @@path = DEFAULT;
+
+
+
+--echo #
+--echo # type 4.12
+--echo # sql_mode: DEFAULT | procedure | is qualified
+--echo # curr db: test | path set: yes
+--echo # resolution priority in between qualified package procedure vs qualified db procedure resolution
+--echo #
+
+USE test;
+DELIMITER $$;
+CREATE PACKAGE pack
+  PROCEDURE proc();
+END;
+$$
+CREATE PACKAGE BODY pack
+  PROCEDURE proc() SELECT 'Invoke from Db: test, Pack: pack, Rt: proc';
+END;
+$$
+DELIMITER ;$$
+
+USE pack;
+CREATE PROCEDURE proc() SELECT 'Invoke from Db: pack, Rt: proc';
+
+# subtest start
+USE test;
+CALL pack.proc;
+DROP PACKAGE BODY pack;
+DROP PACKAGE pack;
+CALL pack.proc;
+DROP PROCEDURE pack.proc;
+--error ER_SP_DOES_NOT_EXIST
+CALL pack.proc;
+
+# subtest finish, deinit
+SET @@path = DEFAULT;
+
+
+
+--echo #
+--echo # type 4.13
+--echo # sql_mode: DEFAULT | procedure | is qualified
+--echo # curr db: test2 | path set: yes
+--echo # resolution priority in between qualified package procedure vs qualified db procedure resolution
+--echo #
+
+USE test;
+DELIMITER $$;
+CREATE PACKAGE pack
+  PROCEDURE proc();
+END;
+$$
+CREATE PACKAGE BODY pack
+  PROCEDURE proc() SELECT 'Invoke from Db: test, Pack: pack, Rt: proc';
+END;
+$$
+DELIMITER ;$$
+
+USE pack;
+CREATE PROCEDURE proc() SELECT 'Invoke from Db: pack, Rt: proc';
+
+# subtest start
+USE test2;
+CALL pack.proc;
+# set path
+SET PATH= 'sys,test';
+CALL pack.proc;
+DROP PACKAGE BODY test.pack;
+DROP PACKAGE test.pack;
+CALL pack.proc;
+DROP PROCEDURE pack.proc;
+--error ER_SP_DOES_NOT_EXIST
+CALL pack.proc;
+
+# subtest finish, deinit
+DROP DATABASE pack;
+SET @@path = DEFAULT;
+
+
+
+--echo #
+--echo # type 4.14
+--echo # sql_mode: DEFAULT | procedure | is qualified
+--echo # curr db: X | path set: yes
+--echo # qualified package procedure invoke internal private procedure
+--echo #
+
+# subtest start
+SET PATH= 'test,test2';
+
+USE test2;
+CREATE PROCEDURE proc_prv() SELECT 'Invoke from Db: test2, Rt: proc_prv';
+
+USE test;
+CREATE PROCEDURE proc_prv() SELECT 'Invoke from Db: test, Rt: proc_prv';
+
+DELIMITER $$;
+CREATE PACKAGE pack
+  PROCEDURE proc_pub();
+END;
+$$
+CREATE PACKAGE BODY pack
+  PROCEDURE proc_prv() SELECT 'Invoke from Db: test, Pack: pack, Rt: proc_prv';
+
+  PROCEDURE proc_pub() CALL proc_prv;
+END;
+$$
+DELIMITER ;$$
+
+--source include/deselect_db.inc
+CALL pack.proc_pub;
+
+# subtest finish, deinit
+SET @@path = DEFAULT;
+
+
+
+--echo #
+--echo # type 4.15
+--echo # sql_mode: DEFAULT | procedure | is qualified
+--echo # curr db: test2 | path set: yes
+--echo # qualified package procedure invoke internal private procedure
+--echo #
+
+# subtest start
+SET PATH= 'test,test2';
+
+USE test2;
+CALL pack.proc_pub;
+
+# subtest finish, deinit
+DROP PROCEDURE proc_prv;
+USE test;
+DROP PROCEDURE proc_prv;
+DROP PACKAGE BODY pack;
+DROP PACKAGE pack;
+SET @@path = DEFAULT;
+
+
+
+--echo #
+--echo # type 5.1
+--echo # sql_mode: ORACLE | function | is unqualified
+--echo # curr db: X | path set: no
+--echo #
+
+SET sql_mode = ORACLE;
+
+USE test;
+
+DELIMITER $$;
+CREATE FUNCTION func()
+  RETURN TEXT AS
+BEGIN
+  RETURN 'Invoke from Db: test, Rt: func';
+END;
+$$
+DELIMITER ;$$
+
+--source include/deselect_db.inc
+
+# subtest start
+--error ER_SP_DOES_NOT_EXIST
+SELECT func();
+
+
+
+--echo #
+--echo # type 5.2
+--echo # sql_mode: ORACLE | function | is unqualified
+--echo # curr db: X | path set: yes
+--echo #
+
+# set path
+SET PATH= 'sys,test';
+
+# subtest start
+SELECT func();
+
+# subtest finish, deinit
+SET @@path = DEFAULT;
+
+
+
+--echo #
+--echo # type 5.3
+--echo # sql_mode: ORACLE | function | is unqualified
+--echo # curr db: test2 | path set: no
+--echo #
+
+# subtest start
+USE test2;
+--error ER_SP_DOES_NOT_EXIST
+SELECT func();
+
+
+
+--echo #
+--echo # type 5.4
+--echo # sql_mode: ORACLE | function | is unqualified
+--echo # curr db: test2 | path set: yes
+--echo #
+
+# set path
+SET PATH= 'sys,test';
+
+# subtest start
+USE test2;
+SELECT func();
+
+# subtest finish, deinit
+SET @@path = DEFAULT;
+
+
+
+--echo #
+--echo # type 5.5
+--echo # sql_mode: ORACLE | function | is unqualified
+--echo # curr db: X | path set: yes
+--echo # lookup in between 2 unqualified functions with exactly the same name in different 2 databases
+--echo #
+
+USE test2;
+DELIMITER $$;
+CREATE FUNCTION func()
+  RETURN TEXT AS
+BEGIN
+  RETURN 'Invoke from Db: test2, Rt: func';
+END;
+$$
+DELIMITER ;$$
+
+# subtest start
+--source include/deselect_db.inc
+# set path
+SET PATH= 'test,test2';
+SELECT func();
+SET PATH= 'test2,test';
+SELECT func();
+DROP FUNCTION test2.func;
+SELECT func();
+DROP FUNCTION test.func;
+--error ER_SP_DOES_NOT_EXIST
+SELECT func();
+
+# subtest finish, deinit
+SET @@path = DEFAULT;
+
+
+
+--echo #
+--echo # type 5.6
+--echo # sql_mode: ORACLE | function | is unqualified
+--echo # curr db: test2 | path set: yes
+--echo # lookup in between 2 unqualified functions with exactly the same name in different 2 databases
+--echo #
+
+USE test;
+DELIMITER $$;
+CREATE FUNCTION func()
+  RETURN TEXT AS
+BEGIN
+  RETURN 'Invoke from Db: test, Rt: func';
+END;
+$$
+DELIMITER ;$$
+
+# set path
+SET PATH= 'sys,test';
+
+# subtest start
+USE test2;
+SELECT func();
+
+DELIMITER $$;
+CREATE FUNCTION func()
+  RETURN TEXT AS
+BEGIN
+  RETURN 'Invoke from Db: test2, Rt: func';
+END;
+$$
+DELIMITER ;$$
+
+SELECT func();
+DROP FUNCTION func;
+SELECT func();
+DROP FUNCTION test.func;
+--error ER_SP_DOES_NOT_EXIST
+SELECT func();
+
+# subtest finish, deinit
+SET @@path = DEFAULT;
+
+
+
+--echo #
+--echo # type 5.7
+--echo # sql_mode: ORACLE | function | is unqualified
+--echo # curr db: X | path set: yes
+--echo # to test unqualified function invocation in an unqualified function
+--echo #
+
+# subtest start
+SET PATH= 'test,test2';
+
+USE test2;
+DELIMITER $$;
+CREATE FUNCTION func()
+  RETURN TEXT AS
+BEGIN
+  RETURN 'Invoke from Db: test2, Rt: func';
+END;
+$$
+DELIMITER ;$$
+
+USE test;
+DELIMITER $$;
+CREATE FUNCTION func_call_func()
+  RETURN TEXT AS
+BEGIN
+  RETURN func();
+END;
+$$
+DELIMITER ;$$
+
+--source include/deselect_db.inc
+SELECT func_call_func();
+
+USE test;
+DELIMITER $$;
+CREATE FUNCTION func()
+  RETURN TEXT AS
+BEGIN
+  RETURN 'Invoke from Db: test, Rt: func';
+END;
+$$
+DELIMITER ;$$
+
+--source include/deselect_db.inc
+SELECT func_call_func();
+
+DROP FUNCTION test.func;
+SELECT func_call_func();
+DROP FUNCTION test2.func;
+--error ER_SP_DOES_NOT_EXIST
+SELECT func_call_func();
+
+# subtest finish, deinit
+USE test;
+DROP FUNCTION func_call_func;
+SET @@path = DEFAULT;
+
+
+
+--echo #
+--echo # type 5.8
+--echo # sql_mode: ORACLE | function | is unqualified
+--echo # curr db: test | path set: yes
+--echo # to test unqualified function invocation in an unqualified function
+--echo #
+
+# subtest start
+SET PATH= 'sys,test2';
+
+USE test2;
+DELIMITER $$;
+CREATE FUNCTION func()
+  RETURN TEXT AS
+BEGIN
+  RETURN 'Invoke from Db: test2, Rt: func';
+END;
+$$
+DELIMITER ;$$
+
+USE test;
+DELIMITER $$;
+CREATE FUNCTION func_call_func()
+  RETURN TEXT AS
+BEGIN
+  RETURN func();
+END;
+$$
+DELIMITER ;$$
+
+SELECT func_call_func();
+
+DELIMITER $$;
+CREATE FUNCTION func()
+  RETURN TEXT AS
+BEGIN
+  RETURN 'Invoke from Db: test, Rt: func';
+END;
+$$
+DELIMITER ;$$
+
+SELECT func_call_func();
+
+DROP FUNCTION func;
+SELECT func_call_func();
+DROP FUNCTION test2.func;
+--error ER_SP_DOES_NOT_EXIST
+SELECT func_call_func();
+
+# subtest finish, deinit
+USE test;
+DROP FUNCTION func_call_func;
+SET @@path = DEFAULT;
+
+
+
+--echo #
+--echo # type 6.1
+--echo # sql_mode: ORACLE | function | is qualified
+--echo # curr db: X | path set: no
+--echo #
+
+USE test;
+
+DELIMITER $$;
+CREATE PACKAGE pack AS
+  FUNCTION func() RETURN TEXT;
+END;
+$$
+CREATE PACKAGE BODY pack AS
+  FUNCTION func() RETURN TEXT AS
+  BEGIN
+    RETURN 'Invoke from Db: test, Pack: pack, Rt: func';
+  END;
+END;
+$$
+DELIMITER ;$$
+
+--source include/deselect_db.inc
+
+# subtest start
+--error ER_SP_DOES_NOT_EXIST
+SELECT pack.func();
+
+
+
+--echo #
+--echo # type 6.2
+--echo # sql_mode: ORACLE | function | is qualified
+--echo # curr db: X | path set: yes
+--echo #
+
+# set path
+SET PATH= 'sys,test';
+
+# subtest start
+SELECT pack.func();
+
+# subtest finish, deinit
+SET @@path = DEFAULT;
+
+
+
+--echo #
+--echo # type 6.3
+--echo # sql_mode: ORACLE | function | is qualified
+--echo # curr db: test2 | path set: no
+--echo #
+
+# subtest start
+USE test2;
+--error ER_SP_DOES_NOT_EXIST
+SELECT pack.func();
+
+
+
+--echo #
+--echo # type 6.4
+--echo # sql_mode: ORACLE | function | is qualified
+--echo # curr db: test2 | path set: yes
+--echo #
+
+# set path
+SET PATH= 'sys,test';
+
+# subtest start
+USE test2;
+SELECT pack.func();
+
+# subtest finish, deinit
+SET @@path = DEFAULT;
+
+
+
+--echo #
+--echo # type 6.5
+--echo # sql_mode: ORACLE | function | is qualified
+--echo # curr db: X | path set: yes
+--echo # lookup in between 2 qualified packages function with exactly the same name in different 2 databases
+--echo #
+
+USE test2;
+DELIMITER $$;
+CREATE PACKAGE pack AS
+  FUNCTION func() RETURN TEXT;
+END;
+$$
+CREATE PACKAGE BODY pack AS
+  FUNCTION func() RETURN TEXT AS
+  BEGIN
+    RETURN 'Invoke from Db: test2, Pack: pack, Rt: func';
+  END;
+END;
+$$
+DELIMITER ;$$
+
+# subtest start
+--source include/deselect_db.inc
+# set path
+SET PATH= 'test,test2';
+SELECT pack.func();
+SET PATH= 'test2,test';
+SELECT pack.func();
+DROP PACKAGE BODY test2.pack;
+DROP PACKAGE test2.pack;
+SELECT pack.func();
+DROP PACKAGE BODY test.pack;
+DROP PACKAGE test.pack;
+--error ER_SP_DOES_NOT_EXIST
+SELECT pack.func();
+
+# subtest finish, deinit
+SET @@path = DEFAULT;
+
+
+
+--echo #
+--echo # type 6.6
+--echo # sql_mode: ORACLE | function | is qualified
+--echo # curr db: test2 | path set: yes
+--echo # lookup in between 2 qualified packages function with exactly the same name in different 2 databases
+--echo #
+
+USE test;
+
+DELIMITER $$;
+CREATE PACKAGE pack AS
+  FUNCTION func() RETURN TEXT;
+END;
+$$
+CREATE PACKAGE BODY pack AS
+  FUNCTION func() RETURN TEXT AS
+  BEGIN
+    RETURN 'Invoke from Db: test, Pack: pack, Rt: func';
+  END;
+END;
+$$
+DELIMITER ;$$
+
+# set path
+SET PATH= 'sys,test';
+
+# subtest start
+USE test2;
+SELECT pack.func();
+
+DELIMITER $$;
+CREATE PACKAGE pack AS
+  FUNCTION func() RETURN TEXT;
+END;
+$$
+CREATE PACKAGE BODY pack AS
+  FUNCTION func() RETURN TEXT AS
+  BEGIN
+    RETURN 'Invoke from Db: test2, Pack: pack, Rt: func';
+  END;
+END;
+$$
+DELIMITER ;$$
+
+SELECT pack.func();
+DROP PACKAGE BODY pack;
+DROP PACKAGE pack;
+SELECT pack.func();
+DROP PACKAGE BODY test.pack;
+DROP PACKAGE test.pack;
+--error ER_SP_DOES_NOT_EXIST
+SELECT pack.func();
+
+# subtest finish, deinit
+SET @@path = DEFAULT;
+
+
+
+--echo #
+--echo # type 6.7
+--echo # sql_mode: ORACLE | function | is qualified
+--echo # curr db: X | path set: yes
+--echo # to test unqualified function invocation in a qualified package function
+--echo #
+
+# subtest start
+SET PATH= 'test,test2';
+
+USE test2;
+DELIMITER $$;
+CREATE FUNCTION func_local()
+  RETURN TEXT AS
+BEGIN
+  RETURN 'Invoke from Db: test2, Rt: func_local';
+END;
+$$
+DELIMITER ;$$
+
+USE test;
+DELIMITER $$;
+CREATE PACKAGE pack AS
+  FUNCTION func() RETURN TEXT;
+END;
+$$
+CREATE PACKAGE BODY pack AS
+  FUNCTION func() RETURN TEXT AS
+  BEGIN
+    RETURN func_local();
+  END;
+END;
+$$
+DELIMITER ;$$
+
+--source include/deselect_db.inc
+SELECT pack.func();
+
+USE test;
+DELIMITER $$;
+CREATE FUNCTION func_local()
+  RETURN TEXT AS
+BEGIN
+  RETURN 'Invoke from Db: test, Rt: func_local';
+END;
+$$
+DELIMITER ;$$
+
+--source include/deselect_db.inc
+SELECT pack.func();
+
+DROP FUNCTION test.func_local;
+SELECT pack.func();
+DROP FUNCTION test2.func_local;
+--error ER_SP_DOES_NOT_EXIST
+SELECT pack.func();
+
+# subtest finish, deinit
+USE test;
+DROP PACKAGE BODY pack;
+DROP PACKAGE pack;
+SET @@path = DEFAULT;
+
+
+
+--echo #
+--echo # type 6.8
+--echo # sql_mode: ORACLE | function | is qualified
+--echo # curr db: test | path set: yes
+--echo # to test unqualified function invocation in a qualified package function
+--echo #
+
+# subtest start
+SET PATH= 'test,test2';
+
+USE test2;
+DELIMITER $$;
+CREATE FUNCTION func_local()
+  RETURN TEXT AS
+BEGIN
+  RETURN 'Invoke from Db: test2, Rt: func_local';
+END;
+$$
+DELIMITER ;$$
+
+USE test;
+DELIMITER $$;
+CREATE PACKAGE pack AS
+  FUNCTION func() RETURN TEXT;
+END;
+$$
+CREATE PACKAGE BODY pack AS
+  FUNCTION func() RETURN TEXT AS
+  BEGIN
+    RETURN func_local();
+  END;
+END;
+$$
+DELIMITER ;$$
+
+SELECT pack.func();
+
+DELIMITER $$;
+CREATE FUNCTION func_local()
+  RETURN TEXT AS
+BEGIN
+  RETURN 'Invoke from Db: test, Rt: func_local';
+END;
+$$
+DELIMITER ;$$
+
+SELECT pack.func();
+DROP FUNCTION func_local;
+SELECT pack.func();
+DROP FUNCTION test2.func_local;
+--error ER_SP_DOES_NOT_EXIST
+SELECT pack.func();
+
+# subtest finish, deinit
+USE test;
+DROP PACKAGE BODY pack;
+DROP PACKAGE pack;
+SET @@path = DEFAULT;
+
+
+
+--echo #
+--echo # type 6.9
+--echo # sql_mode: ORACLE | function | is qualified
+--echo # curr db: X | path set: yes
+--echo # to test qualified package function invocation in a qualified package function
+--echo #
+
+# subtest start
+SET PATH= 'test,test2';
+
+USE test2;
+DELIMITER $$;
+CREATE PACKAGE pack2 AS
+  FUNCTION func() RETURN TEXT;
+END;
+$$
+CREATE PACKAGE BODY pack2 AS
+  FUNCTION func() RETURN TEXT AS
+  BEGIN
+    RETURN 'Invoke from Db: test2, Pack: pack2, Rt: func';
+  END;
+END;
+$$
+DELIMITER ;$$
+
+USE test;
+DELIMITER $$;
+CREATE PACKAGE pack AS
+  FUNCTION func() RETURN TEXT;
+END;
+$$
+CREATE PACKAGE BODY pack AS
+  FUNCTION func() RETURN TEXT AS
+  BEGIN
+    RETURN pack2.func();
+  END;
+END;
+$$
+DELIMITER ;$$
+
+--source include/deselect_db.inc
+SELECT pack.func();
+
+USE test;
+DELIMITER $$;
+CREATE PACKAGE pack2 AS
+  FUNCTION func() RETURN TEXT;
+END;
+$$
+CREATE PACKAGE BODY pack2 AS
+  FUNCTION func() RETURN TEXT AS
+  BEGIN
+    RETURN 'Invoke from Db: test, Pack: pack2, Rt: func';
+  END;
+END;
+$$
+DELIMITER ;$$
+
+--source include/deselect_db.inc
+SELECT pack.func();
+
+DROP PACKAGE BODY test.pack2;
+DROP PACKAGE test.pack2;
+SELECT pack.func();
+DROP PACKAGE BODY test2.pack2;
+DROP PACKAGE test2.pack2;
+--error ER_SP_DOES_NOT_EXIST
+SELECT pack.func();
+
+# subtest finish, deinit
+USE test;
+DROP PACKAGE BODY pack;
+DROP PACKAGE pack;
+SET @@path = DEFAULT;
+
+
+
+--echo #
+--echo # type 6.10
+--echo # sql_mode: ORACLE | function | is qualified
+--echo # curr db: test | path set: yes
+--echo # to test qualified package function invocation in a qualified package function
+--echo #
+
+# subtest start
+SET PATH= 'sys,test2';
+
+USE test2;
+DELIMITER $$;
+CREATE PACKAGE pack2 AS
+  FUNCTION func() RETURN TEXT;
+END;
+$$
+CREATE PACKAGE BODY pack2 AS
+  FUNCTION func() RETURN TEXT AS
+  BEGIN
+    RETURN 'Invoke from Db: test2, Pack: pack2, Rt: func';
+  END;
+END;
+$$
+DELIMITER ;$$
+
+USE test;
+DELIMITER $$;
+CREATE PACKAGE pack AS
+  FUNCTION func() RETURN TEXT;
+END;
+$$
+CREATE PACKAGE BODY pack AS
+  FUNCTION func() RETURN TEXT AS
+  BEGIN
+    RETURN pack2.func();
+  END;
+END;
+$$
+DELIMITER ;$$
+
+SELECT pack.func();
+
+DELIMITER $$;
+CREATE PACKAGE pack2 AS
+  FUNCTION func() RETURN TEXT;
+END;
+$$
+CREATE PACKAGE BODY pack2 AS
+  FUNCTION func() RETURN TEXT AS
+  BEGIN
+    RETURN 'Invoke from Db: test, Pack: pack2, Rt: func';
+  END;
+END;
+$$
+DELIMITER ;$$
+
+SELECT pack.func();
+
+DROP PACKAGE BODY pack2;
+DROP PACKAGE pack2;
+SELECT pack.func();
+DROP PACKAGE BODY test2.pack2;
+DROP PACKAGE test2.pack2;
+--error ER_SP_DOES_NOT_EXIST
+SELECT pack.func();
+
+# subtest finish, deinit
+USE test;
+DROP PACKAGE BODY pack;
+DROP PACKAGE pack;
+SET @@path = DEFAULT;
+
+
+
+--echo #
+--echo # type 6.11
+--echo # sql_mode: ORACLE | function | is qualified
+--echo # curr db: X | path set: yes
+--echo # resolution priority in between qualified package function vs qualified db function resolution
+--echo #
+
+USE test;
+DELIMITER $$;
+CREATE PACKAGE pack AS
+  FUNCTION func() RETURN TEXT;
+END;
+$$
+CREATE PACKAGE BODY pack AS
+  FUNCTION func() RETURN TEXT AS
+  BEGIN
+    RETURN 'Invoke from Db: test, Pack: pack, Rt: func';
+  END;
+END;
+$$
+DELIMITER ;$$
+
+CREATE DATABASE pack;
+USE pack;
+DELIMITER $$;
+CREATE FUNCTION func()
+  RETURN TEXT AS
+BEGIN
+  RETURN 'Invoke from Db: pack, Rt: func';
+END;
+$$
+DELIMITER ;$$
+
+--source include/deselect_db.inc
+
+# subtest start
+SELECT pack.func();
+# set path
+SET PATH= 'sys,test';
+SELECT pack.func();
+DROP PACKAGE BODY test.pack;
+DROP PACKAGE test.pack;
+SELECT pack.func();
+DROP FUNCTION pack.func;
+--error ER_SP_DOES_NOT_EXIST
+SELECT pack.func();
+
+# subtest finish, deinit
+SET @@path = DEFAULT;
+
+
+
+--echo #
+--echo # type 6.12
+--echo # sql_mode: ORACLE | function | is qualified
+--echo # curr db: test | path set: yes
+--echo # resolution priority in between qualified package function vs qualified db function resolution
+--echo #
+
+USE test;
+DELIMITER $$;
+CREATE PACKAGE pack AS
+  FUNCTION func() RETURN TEXT;
+END;
+$$
+CREATE PACKAGE BODY pack AS
+  FUNCTION func() RETURN TEXT AS
+  BEGIN
+    RETURN 'Invoke from Db: test, Pack: pack, Rt: func';
+  END;
+END;
+$$
+DELIMITER ;$$
+
+USE pack;
+DELIMITER $$;
+CREATE FUNCTION func()
+  RETURN TEXT AS
+BEGIN
+  RETURN 'Invoke from Db: pack, Rt: func';
+END;
+$$
+DELIMITER ;$$
+
+# subtest start
+USE test;
+SELECT pack.func();
+DROP PACKAGE BODY pack;
+DROP PACKAGE pack;
+SELECT pack.func();
+DROP FUNCTION pack.func;
+--error ER_SP_DOES_NOT_EXIST
+SELECT pack.func();
+
+# subtest finish, deinit
+SET @@path = DEFAULT;
+
+
+
+--echo #
+--echo # type 6.13
+--echo # sql_mode: ORACLE | function | is qualified
+--echo # curr db: test2 | path set: yes
+--echo # resolution priority in between qualified package function vs qualified db function resolution
+--echo #
+
+USE test;
+DELIMITER $$;
+CREATE PACKAGE pack AS
+  FUNCTION func() RETURN TEXT;
+END;
+$$
+CREATE PACKAGE BODY pack AS
+  FUNCTION func() RETURN TEXT AS
+  BEGIN
+    RETURN 'Invoke from Db: test, Pack: pack, Rt: func';
+  END;
+END;
+$$
+DELIMITER ;$$
+
+USE pack;
+DELIMITER $$;
+CREATE FUNCTION func()
+  RETURN TEXT AS
+BEGIN
+  RETURN 'Invoke from Db: pack, Rt: func';
+END;
+$$
+DELIMITER ;$$
+
+# subtest start
+USE test2;
+SELECT pack.func();
+# set path
+SET PATH= 'sys,test';
+SELECT pack.func();
+DROP PACKAGE BODY test.pack;
+DROP PACKAGE test.pack;
+SELECT pack.func();
+DROP FUNCTION pack.func;
+--error ER_SP_DOES_NOT_EXIST
+SELECT pack.func();
+
+# subtest finish, deinit
+DROP DATABASE pack;
+SET @@path = DEFAULT;
+
+
+
+--echo #
+--echo # type 6.14
+--echo # sql_mode: ORACLE | function | is qualified
+--echo # curr db: X | path set: yes
+--echo # qualified package function invoke internal private function
+--echo #
+
+# subtest start
+SET PATH= 'test,test2';
+
+USE test2;
+DELIMITER $$;
+CREATE FUNCTION func_prv()
+  RETURN TEXT AS
+BEGIN
+  RETURN 'Invoke from Db: test2, Rt: func_prv';
+END;
+$$
+DELIMITER ;$$
+
+USE test;
+DELIMITER $$;
+CREATE FUNCTION func_prv()
+  RETURN TEXT AS
+BEGIN
+  RETURN 'Invoke from Db: test, Rt: func_prv';
+END;
+$$
+
+CREATE PACKAGE pack AS
+  FUNCTION func_pub() RETURN TEXT;
+END;
+$$
+CREATE PACKAGE BODY pack AS
+  FUNCTION func_prv() RETURN TEXT AS
+  BEGIN
+    RETURN 'Invoke from Db: test, Pack: pack, Rt: func_prv';
+  END;
+
+  FUNCTION func_pub() RETURN TEXT AS
+  BEGIN
+    RETURN func_prv();
+  END;
+END;
+$$
+DELIMITER ;$$
+
+--source include/deselect_db.inc
+SELECT pack.func_pub();
+
+# subtest finish, deinit
+SET @@path = DEFAULT;
+
+
+
+--echo #
+--echo # type 6.15
+--echo # sql_mode: ORACLE | function | is qualified
+--echo # curr db: test2 | path set: yes
+--echo # qualified package function invoke internal private function
+--echo #
+
+# subtest start
+SET PATH= 'test,test2';
+
+USE test2;
+SELECT pack.func_pub();
+
+# subtest finish, deinit
+DROP FUNCTION func_prv;
+USE test;
+DROP FUNCTION func_prv;
+DROP PACKAGE BODY pack;
+DROP PACKAGE pack;
+SET @@path = DEFAULT;
+
+
+
+--echo #
+--echo # type 7.1
+--echo # sql_mode: ORACLE | procedure | is unqualified
+--echo # curr db: X | path set: no
+--echo #
+
+USE test;
+
+DELIMITER $$;
+CREATE PROCEDURE proc() AS
+BEGIN
+  SELECT 'Invoke from Db: test, Rt: proc';
+END;
+$$
+DELIMITER ;$$
+
+--source include/deselect_db.inc
+
+# subtest start
+--error ER_NO_DB_ERROR
+CALL proc;
+
+
+
+--echo #
+--echo # type 7.2
+--echo # sql_mode: ORACLE | procedure | is unqualified
+--echo # curr db: X | path set: yes
+--echo #
+
+# set path
+SET PATH= 'sys,test';
+
+# subtest start
+CALL proc;
+
+# subtest finish, deinit
+SET @@path = DEFAULT;
+
+
+
+--echo #
+--echo # type 7.3
+--echo # sql_mode: ORACLE | procedure | is unqualified
+--echo # curr db: test2 | path set: no
+--echo #
+
+# subtest start
+USE test2;
+--error ER_SP_DOES_NOT_EXIST
+CALL proc;
+
+
+
+--echo #
+--echo # type 7.4
+--echo # sql_mode: ORACLE | procedure | is unqualified
+--echo # curr db: test2 | path set: yes
+--echo #
+
+# set path
+SET PATH= 'sys,test';
+
+# subtest start
+USE test2;
+CALL proc;
+
+# subtest finish, deinit
+SET @@path = DEFAULT;
+
+
+
+--echo #
+--echo # type 7.5
+--echo # sql_mode: ORACLE | procedure | is unqualified
+--echo # curr db: X | path set: yes
+--echo # lookup in between 2 unqualified procedures with exactly the same name in different 2 databases
+--echo #
+
+USE test2;
+DELIMITER $$;
+CREATE PROCEDURE proc() AS
+BEGIN
+  SELECT 'Invoke from Db: test2, Rt: proc';
+END;
+$$
+DELIMITER ;$$
+
+# subtest start
+--source include/deselect_db.inc
+# set path
+SET PATH= 'test,test2';
+CALL proc;
+SET PATH= 'test2,test';
+CALL proc;
+DROP PROCEDURE test2.proc;
+CALL proc;
+DROP PROCEDURE test.proc;
+--error ER_NO_DB_ERROR
+CALL proc;
+
+# subtest finish, deinit
+SET @@path = DEFAULT;
+
+
+
+--echo #
+--echo # type 7.6
+--echo # sql_mode: ORACLE | procedure | is unqualified
+--echo # curr db: test2 | path set: yes
+--echo # lookup in between 2 unqualified procedures with exactly the same name in different 2 databases
+--echo #
+
+USE test;
+DELIMITER $$;
+CREATE PROCEDURE proc() AS
+BEGIN
+  SELECT 'Invoke from Db: test, Rt: proc';
+END;
+$$
+DELIMITER ;$$
+
+# set path
+SET PATH= 'sys,test';
+
+# subtest start
+USE test2;
+CALL proc;
+
+DELIMITER $$;
+CREATE PROCEDURE proc() AS
+BEGIN
+  SELECT 'Invoke from Db: test2, Rt: proc';
+END;
+$$
+DELIMITER ;$$
+
+CALL proc;
+DROP PROCEDURE proc;
+CALL proc;
+DROP PROCEDURE test.proc;
+--error ER_SP_DOES_NOT_EXIST
+CALL proc;
+
+# subtest finish, deinit
+SET @@path = DEFAULT;
+
+
+
+--echo #
+--echo # type 7.7
+--echo # sql_mode: ORACLE | procedure | is unqualified
+--echo # curr db: X | path set: yes
+--echo # to test unqualified procedure invocation in an unqualified procedure
+--echo #
+
+# subtest start
+SET PATH= 'test,test2';
+
+USE test2;
+DELIMITER $$;
+CREATE PROCEDURE proc() AS
+BEGIN
+  SELECT 'Invoke from Db: test2, Rt: proc';
+END;
+$$
+DELIMITER ;$$
+
+USE test;
+DELIMITER $$;
+CREATE PROCEDURE proc_call_proc() AS
+BEGIN
+  CALL proc;
+END;
+$$
+DELIMITER ;$$
+
+--source include/deselect_db.inc
+CALL proc_call_proc;
+
+USE test;
+DELIMITER $$;
+CREATE PROCEDURE proc() AS
+BEGIN
+  SELECT 'Invoke from Db: test, Rt: proc';
+END;
+$$
+DELIMITER ;$$
+
+--source include/deselect_db.inc
+CALL proc_call_proc;
+
+DROP PROCEDURE test.proc;
+CALL proc_call_proc;
+DROP PROCEDURE test2.proc;
+--error ER_SP_DOES_NOT_EXIST
+CALL proc_call_proc;
+
+# subtest finish, deinit
+USE test;
+DROP PROCEDURE proc_call_proc;
+SET @@path = DEFAULT;
+
+
+
+--echo #
+--echo # type 7.8
+--echo # sql_mode: ORACLE | procedure | is unqualified
+--echo # curr db: test | path set: yes
+--echo # to test unqualified procedure invocation in an unqualified procedure
+--echo #
+
+# subtest start
+SET PATH= 'sys,test2';
+
+USE test2;
+DELIMITER $$;
+CREATE PROCEDURE proc() AS
+BEGIN
+  SELECT 'Invoke from Db: test2, Rt: proc';
+END;
+$$
+DELIMITER ;$$
+
+USE test;
+DELIMITER $$;
+CREATE PROCEDURE proc_call_proc() AS
+BEGIN
+  CALL proc;
+END;
+$$
+DELIMITER ;$$
+
+CALL proc_call_proc;
+
+DELIMITER $$;
+CREATE PROCEDURE proc() AS
+BEGIN
+  SELECT 'Invoke from Db: test, Rt: proc';
+END;
+$$
+DELIMITER ;$$
+
+CALL proc_call_proc;
+
+DROP PROCEDURE proc;
+CALL proc_call_proc;
+DROP PROCEDURE test2.proc;
+--error ER_SP_DOES_NOT_EXIST
+CALL proc_call_proc;
+
+# subtest finish, deinit
+USE test;
+DROP PROCEDURE proc_call_proc;
+SET @@path = DEFAULT;
+
+
+
+--echo #
+--echo # type 8.1
+--echo # sql_mode: ORACLE | procedure | is qualified
+--echo # curr db: X | path set: no
+--echo #
+
+USE test;
+
+DELIMITER $$;
+CREATE PACKAGE pack AS
+  PROCEDURE proc();
+END;
+$$
+CREATE PACKAGE BODY pack AS
+  PROCEDURE proc() AS
+  BEGIN
+    SELECT 'Invoke from Db: test, Pack: pack, Rt: proc';
+  END;
+END;
+$$
+DELIMITER ;$$
+
+--source include/deselect_db.inc
+
+# subtest start
+--error ER_SP_DOES_NOT_EXIST
+CALL pack.proc;
+
+
+
+--echo #
+--echo # type 8.2
+--echo # sql_mode: ORACLE | procedure | is qualified
+--echo # curr db: X | path set: yes
+--echo #
+
+# set path
+SET PATH= 'sys,test';
+
+# subtest start
+CALL pack.proc;
+
+# subtest finish, deinit
+SET @@path = DEFAULT;
+
+
+
+--echo #
+--echo # type 8.3
+--echo # sql_mode: ORACLE | procedure | is qualified
+--echo # curr db: test2 | path set: no
+--echo #
+
+# subtest start
+USE test2;
+--error ER_SP_DOES_NOT_EXIST
+CALL pack.proc;
+
+
+
+--echo #
+--echo # type 8.4
+--echo # sql_mode: ORACLE | procedure | is qualified
+--echo # curr db: test2 | path set: yes
+--echo #
+
+# set path
+SET PATH= 'sys,test';
+
+# subtest start
+USE test2;
+CALL pack.proc;
+
+# subtest finish, deinit
+SET @@path = DEFAULT;
+
+
+
+--echo #
+--echo # type 8.5
+--echo # sql_mode: ORACLE | procedure | is qualified
+--echo # curr db: X | path set: yes
+--echo # lookup in between 2 qualified packages procedure with exactly the same name in different 2 databases
+--echo #
+
+USE test2;
+DELIMITER $$;
+CREATE PACKAGE pack AS
+  PROCEDURE proc();
+END;
+$$
+CREATE PACKAGE BODY pack AS
+  PROCEDURE proc() AS
+  BEGIN
+    SELECT 'Invoke from Db: test2, Pack: pack, Rt: proc';
+  END;
+END;
+$$
+DELIMITER ;$$
+
+# subtest start
+--source include/deselect_db.inc
+# set path
+SET PATH= 'test,test2';
+CALL pack.proc;
+SET PATH= 'test2,test';
+CALL pack.proc;
+DROP PACKAGE BODY test2.pack;
+DROP PACKAGE test2.pack;
+CALL pack.proc;
+DROP PACKAGE BODY test.pack;
+DROP PACKAGE test.pack;
+--error ER_SP_DOES_NOT_EXIST
+CALL pack.proc;
+
+# subtest finish, deinit
+SET @@path = DEFAULT;
+
+
+
+--echo #
+--echo # type 8.6
+--echo # sql_mode: ORACLE | procedure | is qualified
+--echo # curr db: test2 | path set: yes
+--echo # lookup in between 2 qualified packages procedure with exactly the same name in different 2 databases
+--echo #
+
+USE test;
+
+DELIMITER $$;
+CREATE PACKAGE pack AS
+  PROCEDURE proc();
+END;
+$$
+CREATE PACKAGE BODY pack AS
+  PROCEDURE proc() AS
+  BEGIN
+    SELECT 'Invoke from Db: test, Pack: pack, Rt: proc';
+  END;
+END;
+$$
+DELIMITER ;$$
+
+# set path
+SET PATH= 'sys,test';
+
+# subtest start
+USE test2;
+CALL pack.proc;
+
+DELIMITER $$;
+CREATE PACKAGE pack AS
+  PROCEDURE proc();
+END;
+$$
+CREATE PACKAGE BODY pack AS
+  PROCEDURE proc() AS
+  BEGIN
+    SELECT 'Invoke from Db: test2, Pack: pack, Rt: proc';
+  END;
+END;
+$$
+DELIMITER ;$$
+
+CALL pack.proc;
+DROP PACKAGE BODY pack;
+DROP PACKAGE pack;
+CALL pack.proc;
+DROP PACKAGE BODY test.pack;
+DROP PACKAGE test.pack;
+--error ER_SP_DOES_NOT_EXIST
+CALL pack.proc;
+
+# subtest finish, deinit
+SET @@path = DEFAULT;
+
+
+
+--echo #
+--echo # type 8.7
+--echo # sql_mode: ORACLE | procedure | is qualified
+--echo # curr db: X | path set: yes
+--echo # to test unqualified procedure invocation in a qualified package procedure
+--echo #
+
+# subtest start
+SET PATH= 'test,test2';
+
+USE test2;
+DELIMITER $$;
+CREATE PROCEDURE proc_local() AS
+BEGIN
+  SELECT 'Invoke from Db: test2, Rt: proc_local';
+END;
+$$
+DELIMITER ;$$
+
+USE test;
+DELIMITER $$;
+CREATE PACKAGE pack AS
+  PROCEDURE proc();
+END;
+$$
+CREATE PACKAGE BODY pack AS
+  PROCEDURE proc() AS
+  BEGIN
+    CALL proc_local;
+  END;
+END;
+$$
+DELIMITER ;$$
+
+--source include/deselect_db.inc
+CALL pack.proc;
+
+USE test;
+DELIMITER $$;
+CREATE PROCEDURE proc_local() AS
+BEGIN
+  SELECT 'Invoke from Db: test, Rt: proc_local';
+END;
+$$
+DELIMITER ;$$
+
+--source include/deselect_db.inc
+CALL pack.proc;
+
+DROP PROCEDURE test.proc_local;
+CALL pack.proc;
+DROP PROCEDURE test2.proc_local;
+--error ER_SP_DOES_NOT_EXIST
+CALL pack.proc;
+
+# subtest finish, deinit
+USE test;
+DROP PACKAGE BODY pack;
+DROP PACKAGE pack;
+SET @@path = DEFAULT;
+
+
+
+--echo #
+--echo # type 8.8
+--echo # sql_mode: ORACLE | procedure | is qualified
+--echo # curr db: test | path set: yes
+--echo # to test unqualified procedure invocation in a qualified package procedure
+--echo #
+
+# subtest start
+SET PATH= 'test,test2';
+
+USE test2;
+DELIMITER $$;
+CREATE PROCEDURE proc_local() AS
+BEGIN
+  SELECT 'Invoke from Db: test2, Rt: proc_local';
+END;
+$$
+DELIMITER ;$$
+
+USE test;
+DELIMITER $$;
+CREATE PACKAGE pack AS
+  PROCEDURE proc();
+END;
+$$
+CREATE PACKAGE BODY pack AS
+  PROCEDURE proc() AS
+  BEGIN
+    CALL proc_local;
+  END;
+END;
+$$
+DELIMITER ;$$
+
+CALL pack.proc;
+
+DELIMITER $$;
+CREATE PROCEDURE proc_local() AS
+BEGIN
+  SELECT 'Invoke from Db: test, Rt: proc_local';
+END;
+$$
+DELIMITER ;$$
+
+CALL pack.proc;
+DROP PROCEDURE proc_local;
+CALL pack.proc;
+DROP PROCEDURE test2.proc_local;
+--error ER_SP_DOES_NOT_EXIST
+CALL pack.proc;
+
+# subtest finish, deinit
+USE test;
+DROP PACKAGE BODY pack;
+DROP PACKAGE pack;
+SET @@path = DEFAULT;
+
+
+
+--echo #
+--echo # type 8.9
+--echo # sql_mode: ORACLE | procedure | is qualified
+--echo # curr db: X | path set: yes
+--echo # to test qualified package procedure invocation in a qualified package procedure
+--echo #
+
+# subtest start
+SET PATH= 'test,test2';
+
+USE test2;
+DELIMITER $$;
+CREATE PACKAGE pack2 AS
+  PROCEDURE proc();
+END;
+$$
+CREATE PACKAGE BODY pack2 AS
+  PROCEDURE proc() AS
+  BEGIN
+    SELECT 'Invoke from Db: test2, Pack: pack2, Rt: proc';
+  END;
+END;
+$$
+DELIMITER ;$$
+
+USE test;
+DELIMITER $$;
+CREATE PACKAGE pack AS
+  PROCEDURE proc();
+END;
+$$
+CREATE PACKAGE BODY pack AS
+  PROCEDURE proc() AS
+  BEGIN
+    CALL pack2.proc;
+  END;
+END;
+$$
+DELIMITER ;$$
+
+--source include/deselect_db.inc
+CALL pack.proc;
+
+USE test;
+DELIMITER $$;
+CREATE PACKAGE pack2 AS
+  PROCEDURE proc();
+END;
+$$
+CREATE PACKAGE BODY pack2 AS
+  PROCEDURE proc() AS
+  BEGIN
+    SELECT 'Invoke from Db: test, Pack: pack2, Rt: proc';
+  END;
+END;
+$$
+DELIMITER ;$$
+
+--source include/deselect_db.inc
+CALL pack.proc;
+
+DROP PACKAGE BODY test.pack2;
+DROP PACKAGE test.pack2;
+CALL pack.proc;
+DROP PACKAGE BODY test2.pack2;
+DROP PACKAGE test2.pack2;
+--error ER_SP_DOES_NOT_EXIST
+CALL pack.proc;
+
+# subtest finish, deinit
+USE test;
+DROP PACKAGE BODY pack;
+DROP PACKAGE pack;
+SET @@path = DEFAULT;
+
+
+
+--echo #
+--echo # type 8.10
+--echo # sql_mode: ORACLE | procedure | is qualified
+--echo # curr db: test | path set: yes
+--echo # to test qualified package procedure invocation in a qualified package procedure
+--echo #
+
+# subtest start
+SET PATH= 'sys,test2';
+
+USE test2;
+DELIMITER $$;
+CREATE PACKAGE pack2 AS
+  PROCEDURE proc();
+END;
+$$
+CREATE PACKAGE BODY pack2 AS
+  PROCEDURE proc() AS
+  BEGIN
+    SELECT 'Invoke from Db: test2, Pack: pack2, Rt: proc';
+  END;
+END;
+$$
+DELIMITER ;$$
+
+USE test;
+DELIMITER $$;
+CREATE PACKAGE pack AS
+  PROCEDURE proc();
+END;
+$$
+CREATE PACKAGE BODY pack AS
+  PROCEDURE proc() AS
+  BEGIN
+    CALL pack2.proc;
+  END;
+END;
+$$
+DELIMITER ;$$
+
+CALL pack.proc;
+
+DELIMITER $$;
+CREATE PACKAGE pack2 AS
+  PROCEDURE proc();
+END;
+$$
+CREATE PACKAGE BODY pack2 AS
+  PROCEDURE proc() AS
+  BEGIN
+    SELECT 'Invoke from Db: test, Pack: pack2, Rt: proc';
+  END;
+END;
+$$
+DELIMITER ;$$
+
+CALL pack.proc;
+
+DROP PACKAGE BODY pack2;
+DROP PACKAGE pack2;
+CALL pack.proc;
+DROP PACKAGE BODY test2.pack2;
+DROP PACKAGE test2.pack2;
+--error ER_SP_DOES_NOT_EXIST
+CALL pack.proc;
+
+# subtest finish, deinit
+USE test;
+DROP PACKAGE BODY pack;
+DROP PACKAGE pack;
+SET @@path = DEFAULT;
+
+
+
+--echo #
+--echo # type 8.11
+--echo # sql_mode: ORACLE | procedure | is qualified
+--echo # curr db: X | path set: yes
+--echo # resolution priority in between qualified package procedure vs qualified db procedure resolution
+--echo #
+
+USE test;
+DELIMITER $$;
+CREATE PACKAGE pack AS
+  PROCEDURE proc();
+END;
+$$
+CREATE PACKAGE BODY pack AS
+  PROCEDURE proc() AS
+  BEGIN
+    SELECT 'Invoke from Db: test, Pack: pack, Rt: proc';
+  END;
+END;
+$$
+DELIMITER ;$$
+
+CREATE DATABASE pack;
+USE pack;
+DELIMITER $$;
+CREATE PROCEDURE proc() AS
+BEGIN
+  SELECT 'Invoke from Db: pack, Rt: proc';
+END;
+$$
+DELIMITER ;$$
+
+--source include/deselect_db.inc
+
+# subtest start
+CALL pack.proc;
+# set path
+SET PATH= 'sys,test';
+CALL pack.proc;
+DROP PACKAGE BODY test.pack;
+DROP PACKAGE test.pack;
+CALL pack.proc;
+DROP PROCEDURE pack.proc;
+--error ER_SP_DOES_NOT_EXIST
+CALL pack.proc;
+
+# subtest finish, deinit
+SET @@path = DEFAULT;
+
+
+
+--echo #
+--echo # type 8.12
+--echo # sql_mode: ORACLE | procedure | is qualified
+--echo # curr db: test | path set: yes
+--echo # resolution priority in between qualified package procedure vs qualified db procedure resolution
+--echo #
+
+USE test;
+DELIMITER $$;
+CREATE PACKAGE pack AS
+  PROCEDURE proc();
+END;
+$$
+CREATE PACKAGE BODY pack AS
+  PROCEDURE proc() AS
+  BEGIN
+    SELECT 'Invoke from Db: test, Pack: pack, Rt: proc';
+  END;
+END;
+$$
+DELIMITER ;$$
+
+USE pack;
+DELIMITER $$;
+CREATE PROCEDURE proc() AS
+BEGIN
+  SELECT 'Invoke from Db: pack, Rt: proc';
+END;
+$$
+DELIMITER ;$$
+
+# subtest start
+USE test;
+CALL pack.proc;
+DROP PACKAGE BODY pack;
+DROP PACKAGE pack;
+CALL pack.proc;
+DROP PROCEDURE pack.proc;
+--error ER_SP_DOES_NOT_EXIST
+CALL pack.proc;
+
+# subtest finish, deinit
+SET @@path = DEFAULT;
+
+
+
+--echo #
+--echo # type 8.13
+--echo # sql_mode: ORACLE | procedure | is qualified
+--echo # curr db: test2 | path set: yes
+--echo # resolution priority in between qualified package procedure vs qualified db procedure resolution
+--echo #
+
+USE test;
+DELIMITER $$;
+CREATE PACKAGE pack AS
+  PROCEDURE proc();
+END;
+$$
+CREATE PACKAGE BODY pack AS
+  PROCEDURE proc() AS
+  BEGIN
+    SELECT 'Invoke from Db: test, Pack: pack, Rt: proc';
+  END;
+END;
+$$
+DELIMITER ;$$
+
+USE pack;
+DELIMITER $$;
+CREATE PROCEDURE proc() AS
+BEGIN
+  SELECT 'Invoke from Db: pack, Rt: proc';
+END;
+$$
+DELIMITER ;$$
+
+# subtest start
+USE test2;
+CALL pack.proc;
+# set path
+SET PATH= 'sys,test';
+CALL pack.proc;
+DROP PACKAGE BODY test.pack;
+DROP PACKAGE test.pack;
+CALL pack.proc;
+DROP PROCEDURE pack.proc;
+--error ER_SP_DOES_NOT_EXIST
+CALL pack.proc;
+
+# subtest finish, deinit
+DROP DATABASE pack;
+SET @@path = DEFAULT;
+
+
+
+--echo #
+--echo # type 8.14
+--echo # sql_mode: ORACLE | procedure | is qualified
+--echo # curr db: X | path set: yes
+--echo # qualified package procedure invoke internal private procedure
+--echo #
+
+# subtest start
+SET PATH= 'test,test2';
+
+USE test2;
+DELIMITER $$;
+CREATE PROCEDURE proc_prv() AS
+BEGIN
+  SELECT 'Invoke from Db: test2, Rt: proc_prv';
+END;
+$$
+DELIMITER ;$$
+
+USE test;
+DELIMITER $$;
+CREATE PROCEDURE proc_prv() AS
+BEGIN
+  SELECT 'Invoke from Db: test, Rt: proc_prv';
+END;
+$$
+
+CREATE PACKAGE pack AS
+  PROCEDURE proc_pub();
+END;
+$$
+CREATE PACKAGE BODY pack AS
+  PROCEDURE proc_prv() AS
+  BEGIN
+    SELECT 'Invoke from Db: test, Pack: pack, Rt: proc_prv';
+  END;
+
+  PROCEDURE proc_pub() AS
+  BEGIN
+    CALL proc_prv;
+  END;
+END;
+$$
+DELIMITER ;$$
+
+--source include/deselect_db.inc
+CALL pack.proc_pub;
+
+# subtest finish, deinit
+SET @@path = DEFAULT;
+
+
+
+--echo #
+--echo # type 8.15
+--echo # sql_mode: ORACLE | procedure | is qualified
+--echo # curr db: test2 | path set: yes
+--echo # qualified package procedure invoke internal private procedure
+--echo #
+
+# subtest start
+SET PATH= 'test,test2';
+
+USE test2;
+CALL pack.proc_pub;
+
+# subtest finish, deinit
+DROP PROCEDURE proc_prv;
+DROP DATABASE test2;
+USE test;
+DROP PROCEDURE proc_prv;
+DROP PACKAGE BODY pack;
+DROP PACKAGE pack;
+SET @@path = DEFAULT;
+
+--echo #
+--echo # Resolution of routines in stored routines should be based on
+--echo # the current path, not the path at the time of creation.
+--echo #
+SET @@path= DEFAULT;
+SET sql_mode= DEFAULT;
+USE test;
+CREATE FUNCTION func() RETURNS TEXT RETURN 'Invoke from Db: test, Rt: func';
+
+CREATE DATABASE test3;
+USE test3;
+CREATE FUNCTION func() RETURNS TEXT RETURN 'Invoke from Db: test3, Rt: func';
+
+CREATE DATABASE test2;
+USE test2;
+SET @@path= 'test';
+CREATE FUNCTION func2() RETURNS TEXT RETURN func();
+
+USE test;
+SET @@path= 'test3';
+SELECT test2.func2();
+SET @@path= 'test';
+SELECT test2.func2();
+
+DROP FUNCTION test.func;
+DROP DATABASE test2;
+DROP DATABASE test3;
+
+--echo #
+--echo # Internal schema (function_call_keyword:)
+--echo #
+SET @@path= DEFAULT;
+SET sql_mode= DEFAULT;
+SELECT trim('     ');
+SET @@path= 'oracle_schema';
+SELECT trim('     ');
+SET sql_mode='oracle';
+SET @@path= 'mariadb_schema';
+SELECT trim('     ');
+
+
+--echo #
+--echo # Internal schema (function_call_keyword:)
+--echo # Views must behave as it was during creation time, regardless of
+--echo # the current path
+--echo #
+SET @@path= 'oracle_schema';
+SET sql_mode= DEFAULT;
+CREATE VIEW v_oracle AS SELECT trim('     ');
+SELECT * FROM v_oracle;
+SET @@path= 'mariadb_schema';
+SELECT * FROM v_oracle;
+SHOW CREATE VIEW v_oracle;
+
+DROP VIEW v_oracle;
+
+SET @@path= 'mariadb_schema';
+CREATE VIEW v_mariadb AS SELECT trim('     ');
+SELECT * FROM v_mariadb;
+SET @@path= 'oracle_schema';
+SELECT * FROM v_mariadb;
+SHOW CREATE VIEW v_mariadb;
+
+DROP VIEW v_mariadb;
+
+--echo #
+--echo # Internal schema (function_call_keyword:)
+--echo # Native functions gets resolved with the execution path not the creation path
+--echo # TODO: This behavior is not consistent with the behavior with sql_mode but
+--echo # it is consistent with the behavior of stored routines
+--echo #
+SET @@path= 'oracle_schema';
+SET sql_mode= DEFAULT;
+CREATE FUNCTION func_oracle() RETURNS TEXT RETURN trim('     ');
+SELECT func_oracle();
+SET @@path= 'mariadb_schema';
+SELECT func_oracle();
+
+DROP FUNCTION func_oracle;
+
+SET @@path= 'mariadb_schema';
+CREATE FUNCTION func_mariadb() RETURNS TEXT RETURN trim('     ');
+SELECT func_mariadb();
+SET @@path= 'oracle_schema';
+SELECT func_mariadb();
+
+DROP FUNCTION func_mariadb;
+
+
+--echo #
+--echo # Internal schema (function_call_generic:)
+--echo #
+SET @@path= DEFAULT;
+SET sql_mode= DEFAULT;
+SELECT CONCAT('Ma', 'ria', NULL, 'DB');
+SET @@path= 'oracle_schema';
+SELECT CONCAT('Ma', 'ria', NULL, 'DB');
+SET sql_mode='oracle';
+SET @@path= 'mariadb_schema';
+SELECT CONCAT('Ma', 'ria', NULL, 'DB');
+
+--echo #
+--echo # Internal schema (function_call_generic:)
+--echo # Views must behave as it was during creation time, regardless of
+--echo # the current path
+--echo #
+SET @@path= 'oracle_schema';
+SET sql_mode= DEFAULT;
+CREATE VIEW v_oracle AS SELECT CONCAT('Ma', 'ria', NULL, 'DB');
+SELECT * FROM v_oracle;
+SET @@path= 'mariadb_schema';
+SELECT * FROM v_oracle;
+SHOW CREATE VIEW v_oracle;
+
+DROP VIEW v_oracle;
+
+SET @@path= 'mariadb_schema';
+CREATE VIEW v_mariadb AS SELECT CONCAT('Ma', 'ria', NULL, 'DB');
+SELECT * FROM v_mariadb;
+SET @@path= 'oracle_schema';
+SELECT * FROM v_mariadb;
+SHOW CREATE VIEW v_mariadb;
+
+DROP VIEW v_mariadb;
+
+SET @@path= DEFAULT;
+SET sql_mode= DEFAULT;
+
+--echo #
+--echo # Internal schema (function_call_generic:)
+--echo # Native functions gets resolved with the execution path not the creation path
+--echo # TODO: This behavior is not consistent with the behavior with sql_mode but
+--echo # it is consistent with the behavior of stored routines
+--echo #
+SET @@path= 'oracle_schema';
+SET sql_mode= DEFAULT;
+CREATE FUNCTION func_oracle() RETURNS TEXT RETURN CONCAT('Ma', 'ria', NULL, 'DB');
+SELECT func_oracle();
+SET @@path= 'mariadb_schema';
+SELECT func_oracle();
+
+DROP FUNCTION func_oracle;
+
+SET @@path= 'mariadb_schema';
+CREATE FUNCTION func_mariadb() RETURNS TEXT RETURN CONCAT('Ma', 'ria', NULL, 'DB');
+SELECT func_mariadb();
+SET @@path= 'oracle_schema';
+SELECT func_mariadb();
+
+DROP FUNCTION func_mariadb;
+
+SET @@path= DEFAULT;
+SET sql_mode= DEFAULT;
+
+--echo #
+--echo # Internal schema (type mapping for SHOW CREATE TABLE)
+--echo #
+CREATE TABLE t1 (a DATE);
+SHOW CREATE TABLE t1;
+SET @@path= 'oracle_schema';
+SHOW CREATE TABLE t1;
+DROP TABLE t1;
+
+--echo #
+--echo # Path resolution where database name contains ','
+--echo #
+CREATE DATABASE `a,b`;
+USE `a,b`;
+CREATE FUNCTION func() RETURNS TEXT RETURN 'Invoke from Db: \"a,b\", Rt: func';
+
+USE test;
+--error ER_SP_DOES_NOT_EXIST
+SELECT func();
+SET @@path= '`a,b`';
+SELECT func();
+
+DROP DATABASE `a,b`;
+USE test;
+
+--echo #
+--echo # Path resolution where database name contains '"'
+--echo #
+CREATE DATABASE `"`;
+USE `"`;
+CREATE FUNCTION func() RETURNS TEXT RETURN 'Invoke from Db: \", Rt: func';
+
+USE test;
+--error ER_SP_DOES_NOT_EXIST
+SELECT func();
+SET @@path= '`"`';
+SELECT func();
+
+DROP DATABASE `"`;
+USE test;
+SET @@path= DEFAULT;
+
+--echo #
+--echo # Modify session path within a stored routine
+--echo # This is not allowed since we invalidate the sp caches when the session
+--echo # path is changed
+--echo #
+DELIMITER $$;
+CREATE FUNCTION func() RETURNS TEXT
+BEGIN
+  SET @@path= 'sys';
+  RETURN '';
+END;
+$$
+DELIMITER ;$$
+--error ER_VARIABLE_NOT_SETTABLE_IN_SF_OR_TRIGGER
+SELECT func();
+
+DROP FUNCTION func;
+
+--echo #
+--echo # Modify global path within a stored routine
+--echo #
+DELIMITER $$;
+CREATE FUNCTION func() RETURNS TEXT
+BEGIN
+  SET @@global.path= 'sys';
+  RETURN '';
+END;
+$$
+DELIMITER ;$$
+SELECT func();
+
+SET @@global.path= DEFAULT;
+
+DROP FUNCTION func;
+
+--echo #
+--echo # End of 11.8 tests
+--echo #
diff --git a/mysql-test/main/sp.result b/mysql-test/main/sp.result
index de043b04a797a..ffec0d96d14ba 100644
--- a/mysql-test/main/sp.result
+++ b/mysql-test/main/sp.result
@@ -7723,7 +7723,7 @@ UPDATE t1 SET a = '+' WHERE daynum=tdn();
 SHOW STATUS LIKE '%Handler_read%';
 Variable_name	Value
 Handler_read_first	0
-Handler_read_key	9
+Handler_read_key	10
 Handler_read_last	0
 Handler_read_next	4097
 Handler_read_prev	0
diff --git a/mysql-test/main/status_debug.result b/mysql-test/main/status_debug.result
index 73d9d8c838adf..85f38fa245369 100644
--- a/mysql-test/main/status_debug.result
+++ b/mysql-test/main/status_debug.result
@@ -105,7 +105,7 @@ a
 show status like '%rows%';
 Variable_name	Value
 Not_flushed_delayed_rows	0
-Rows_read	8
+Rows_read	9
 Rows_sent	5
 Rows_tmp_read	0
 Sort_rows	0
diff --git a/mysql-test/suite/perfschema/r/event_aggregate.result b/mysql-test/suite/perfschema/r/event_aggregate.result
index 02d2c134c9a87..3141db23cc788 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	12
+user1	localhost	stage/sql/closing tables	13
 user1	localhost	stage/sql/init	3
-user1	localhost	stage/sql/Opening tables	8
+user1	localhost	stage/sql/Opening tables	9
 user1	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	12
+user1	stage/sql/closing tables	13
 user1	stage/sql/init	3
-user1	stage/sql/Opening tables	8
+user1	stage/sql/Opening tables	9
 user1	stage/sql/starting	7
 execute dump_stages_host;
 host	event_name	count_star
 localhost	stage/sql/checking permissions	4
-localhost	stage/sql/closing tables	12
+localhost	stage/sql/closing tables	13
 localhost	stage/sql/init	3
-localhost	stage/sql/Opening tables	8
+localhost	stage/sql/Opening tables	9
 localhost	stage/sql/starting	7
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	4
-stage/sql/closing tables	12
+stage/sql/closing tables	13
 stage/sql/init	3
-stage/sql/Opening tables	8
+stage/sql/Opening tables	9
 stage/sql/starting	7
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	4
-stage/sql/closing tables	12
+stage/sql/closing tables	13
 stage/sql/init	3
-stage/sql/Opening tables	8
+stage/sql/Opening tables	9
 stage/sql/starting	7
 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	3
+user1	localhost	transaction	4
 execute dump_transactions_user;
 user	event_name	count_star
-user1	transaction	3
+user1	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
-localhost	transaction	3
+localhost	transaction	4
 execute dump_transactions_global;
 event_name	count_star
-transaction	3
+transaction	4
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	3
+transaction	4
 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	12
+user1	localhost	stage/sql/closing tables	13
 user1	localhost	stage/sql/init	3
-user1	localhost	stage/sql/Opening tables	8
+user1	localhost	stage/sql/Opening tables	9
 user1	localhost	stage/sql/starting	7
 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	12
+user1	stage/sql/closing tables	13
 user1	stage/sql/init	3
-user1	stage/sql/Opening tables	8
+user1	stage/sql/Opening tables	9
 user1	stage/sql/starting	7
 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	12
+localhost	stage/sql/closing tables	13
 localhost	stage/sql/init	3
-localhost	stage/sql/Opening tables	8
+localhost	stage/sql/Opening tables	9
 localhost	stage/sql/starting	7
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	4
-stage/sql/closing tables	12
+stage/sql/closing tables	13
 stage/sql/init	3
-stage/sql/Opening tables	8
+stage/sql/Opening tables	9
 stage/sql/starting	7
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	4
-stage/sql/closing tables	12
+stage/sql/closing tables	13
 stage/sql/init	3
-stage/sql/Opening tables	8
+stage/sql/Opening tables	9
 stage/sql/starting	7
 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	3
+user1	localhost	transaction	4
 user2	localhost	transaction	0
 execute dump_transactions_user;
 user	event_name	count_star
-user1	transaction	3
+user1	transaction	4
 user2	transaction	0
 execute dump_transactions_host;
 host	event_name	count_star
-localhost	transaction	3
+localhost	transaction	4
 execute dump_transactions_global;
 event_name	count_star
-transaction	3
+transaction	4
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	3
+transaction	4
 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	12
+user1	localhost	stage/sql/closing tables	13
 user1	localhost	stage/sql/init	3
-user1	localhost	stage/sql/Opening tables	8
+user1	localhost	stage/sql/Opening tables	9
 user1	localhost	stage/sql/starting	7
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/closing tables	12
 user2	localhost	stage/sql/init	3
-user2	localhost	stage/sql/Opening tables	7
+user2	localhost	stage/sql/Opening tables	8
 user2	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	12
+user1	stage/sql/closing tables	13
 user1	stage/sql/init	3
-user1	stage/sql/Opening tables	8
+user1	stage/sql/Opening tables	9
 user1	stage/sql/starting	7
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	11
+user2	stage/sql/closing tables	12
 user2	stage/sql/init	3
-user2	stage/sql/Opening tables	7
+user2	stage/sql/Opening tables	8
 user2	stage/sql/starting	7
 execute dump_stages_host;
 host	event_name	count_star
 localhost	stage/sql/checking permissions	8
-localhost	stage/sql/closing tables	23
+localhost	stage/sql/closing tables	25
 localhost	stage/sql/init	6
-localhost	stage/sql/Opening tables	15
+localhost	stage/sql/Opening tables	17
 localhost	stage/sql/starting	14
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	8
-stage/sql/closing tables	23
+stage/sql/closing tables	25
 stage/sql/init	6
-stage/sql/Opening tables	15
+stage/sql/Opening tables	17
 stage/sql/starting	14
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	8
-stage/sql/closing tables	23
+stage/sql/closing tables	25
 stage/sql/init	6
-stage/sql/Opening tables	15
+stage/sql/Opening tables	17
 stage/sql/starting	14
 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	3
-user2	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
 execute dump_transactions_user;
 user	event_name	count_star
-user1	transaction	3
-user2	transaction	3
+user1	transaction	4
+user2	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
-localhost	transaction	6
+localhost	transaction	8
 execute dump_transactions_global;
 event_name	count_star
-transaction	6
+transaction	8
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	6
+transaction	8
 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	12
+user1	localhost	stage/sql/closing tables	13
 user1	localhost	stage/sql/init	3
-user1	localhost	stage/sql/Opening tables	8
+user1	localhost	stage/sql/Opening tables	9
 user1	localhost	stage/sql/starting	7
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/closing tables	12
 user2	localhost	stage/sql/init	3
-user2	localhost	stage/sql/Opening tables	7
+user2	localhost	stage/sql/Opening tables	8
 user2	localhost	stage/sql/starting	7
 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	12
+user1	stage/sql/closing tables	13
 user1	stage/sql/init	3
-user1	stage/sql/Opening tables	8
+user1	stage/sql/Opening tables	9
 user1	stage/sql/starting	7
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	11
+user2	stage/sql/closing tables	12
 user2	stage/sql/init	3
-user2	stage/sql/Opening tables	7
+user2	stage/sql/Opening tables	8
 user2	stage/sql/starting	7
 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	23
+localhost	stage/sql/closing tables	25
 localhost	stage/sql/init	6
-localhost	stage/sql/Opening tables	15
+localhost	stage/sql/Opening tables	17
 localhost	stage/sql/starting	14
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	8
-stage/sql/closing tables	23
+stage/sql/closing tables	25
 stage/sql/init	6
-stage/sql/Opening tables	15
+stage/sql/Opening tables	17
 stage/sql/starting	14
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	8
-stage/sql/closing tables	23
+stage/sql/closing tables	25
 stage/sql/init	6
-stage/sql/Opening tables	15
+stage/sql/Opening tables	17
 stage/sql/starting	14
 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	3
-user2	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
 user3	localhost	transaction	0
 execute dump_transactions_user;
 user	event_name	count_star
-user1	transaction	3
-user2	transaction	3
+user1	transaction	4
+user2	transaction	4
 user3	transaction	0
 execute dump_transactions_host;
 host	event_name	count_star
-localhost	transaction	6
+localhost	transaction	8
 execute dump_transactions_global;
 event_name	count_star
-transaction	6
+transaction	8
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	6
+transaction	8
 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	12
+user1	localhost	stage/sql/closing tables	13
 user1	localhost	stage/sql/init	3
-user1	localhost	stage/sql/Opening tables	8
+user1	localhost	stage/sql/Opening tables	9
 user1	localhost	stage/sql/starting	7
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/closing tables	12
 user2	localhost	stage/sql/init	3
-user2	localhost	stage/sql/Opening tables	7
+user2	localhost	stage/sql/Opening tables	8
 user2	localhost	stage/sql/starting	7
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/closing tables	12
 user3	localhost	stage/sql/init	3
-user3	localhost	stage/sql/Opening tables	7
+user3	localhost	stage/sql/Opening tables	8
 user3	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	12
+user1	stage/sql/closing tables	13
 user1	stage/sql/init	3
-user1	stage/sql/Opening tables	8
+user1	stage/sql/Opening tables	9
 user1	stage/sql/starting	7
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	11
+user2	stage/sql/closing tables	12
 user2	stage/sql/init	3
-user2	stage/sql/Opening tables	7
+user2	stage/sql/Opening tables	8
 user2	stage/sql/starting	7
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	11
+user3	stage/sql/closing tables	12
 user3	stage/sql/init	3
-user3	stage/sql/Opening tables	7
+user3	stage/sql/Opening tables	8
 user3	stage/sql/starting	7
 execute dump_stages_host;
 host	event_name	count_star
 localhost	stage/sql/checking permissions	12
-localhost	stage/sql/closing tables	34
+localhost	stage/sql/closing tables	37
 localhost	stage/sql/init	9
-localhost	stage/sql/Opening tables	22
+localhost	stage/sql/Opening tables	25
 localhost	stage/sql/starting	21
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	12
-stage/sql/closing tables	34
+stage/sql/closing tables	37
 stage/sql/init	9
-stage/sql/Opening tables	22
+stage/sql/Opening tables	25
 stage/sql/starting	21
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	12
-stage/sql/closing tables	34
+stage/sql/closing tables	37
 stage/sql/init	9
-stage/sql/Opening tables	22
+stage/sql/Opening tables	25
 stage/sql/starting	21
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
 execute dump_transactions_user;
 user	event_name	count_star
-user1	transaction	3
-user2	transaction	3
-user3	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
-localhost	transaction	9
+localhost	transaction	12
 execute dump_transactions_global;
 event_name	count_star
-transaction	9
+transaction	12
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	9
+transaction	12
 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	12
+user1	localhost	stage/sql/closing tables	13
 user1	localhost	stage/sql/init	3
-user1	localhost	stage/sql/Opening tables	8
+user1	localhost	stage/sql/Opening tables	9
 user1	localhost	stage/sql/starting	7
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/closing tables	12
 user2	localhost	stage/sql/init	3
-user2	localhost	stage/sql/Opening tables	7
+user2	localhost	stage/sql/Opening tables	8
 user2	localhost	stage/sql/starting	7
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/closing tables	12
 user3	localhost	stage/sql/init	3
-user3	localhost	stage/sql/Opening tables	7
+user3	localhost	stage/sql/Opening tables	8
 user3	localhost	stage/sql/starting	7
 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	12
+user1	stage/sql/closing tables	13
 user1	stage/sql/init	3
-user1	stage/sql/Opening tables	8
+user1	stage/sql/Opening tables	9
 user1	stage/sql/starting	7
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	11
+user2	stage/sql/closing tables	12
 user2	stage/sql/init	3
-user2	stage/sql/Opening tables	7
+user2	stage/sql/Opening tables	8
 user2	stage/sql/starting	7
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	11
+user3	stage/sql/closing tables	12
 user3	stage/sql/init	3
-user3	stage/sql/Opening tables	7
+user3	stage/sql/Opening tables	8
 user3	stage/sql/starting	7
 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	34
+localhost	stage/sql/closing tables	37
 localhost	stage/sql/init	9
-localhost	stage/sql/Opening tables	22
+localhost	stage/sql/Opening tables	25
 localhost	stage/sql/starting	21
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	12
-stage/sql/closing tables	34
+stage/sql/closing tables	37
 stage/sql/init	9
-stage/sql/Opening tables	22
+stage/sql/Opening tables	25
 stage/sql/starting	21
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	12
-stage/sql/closing tables	34
+stage/sql/closing tables	37
 stage/sql/init	9
-stage/sql/Opening tables	22
+stage/sql/Opening tables	25
 stage/sql/starting	21
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
 user4	localhost	transaction	0
 execute dump_transactions_user;
 user	event_name	count_star
-user1	transaction	3
-user2	transaction	3
-user3	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
 user4	transaction	0
 execute dump_transactions_host;
 host	event_name	count_star
-localhost	transaction	9
+localhost	transaction	12
 execute dump_transactions_global;
 event_name	count_star
-transaction	9
+transaction	12
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	9
+transaction	12
 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	12
+user1	localhost	stage/sql/closing tables	13
 user1	localhost	stage/sql/init	3
-user1	localhost	stage/sql/Opening tables	8
+user1	localhost	stage/sql/Opening tables	9
 user1	localhost	stage/sql/starting	7
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/closing tables	12
 user2	localhost	stage/sql/init	3
-user2	localhost	stage/sql/Opening tables	7
+user2	localhost	stage/sql/Opening tables	8
 user2	localhost	stage/sql/starting	7
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/closing tables	12
 user3	localhost	stage/sql/init	3
-user3	localhost	stage/sql/Opening tables	7
+user3	localhost	stage/sql/Opening tables	8
 user3	localhost	stage/sql/starting	7
 user4	localhost	stage/sql/checking permissions	4
-user4	localhost	stage/sql/closing tables	11
+user4	localhost	stage/sql/closing tables	12
 user4	localhost	stage/sql/init	3
-user4	localhost	stage/sql/Opening tables	7
+user4	localhost	stage/sql/Opening tables	8
 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	12
+user1	stage/sql/closing tables	13
 user1	stage/sql/init	3
-user1	stage/sql/Opening tables	8
+user1	stage/sql/Opening tables	9
 user1	stage/sql/starting	7
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	11
+user2	stage/sql/closing tables	12
 user2	stage/sql/init	3
-user2	stage/sql/Opening tables	7
+user2	stage/sql/Opening tables	8
 user2	stage/sql/starting	7
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	11
+user3	stage/sql/closing tables	12
 user3	stage/sql/init	3
-user3	stage/sql/Opening tables	7
+user3	stage/sql/Opening tables	8
 user3	stage/sql/starting	7
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	11
+user4	stage/sql/closing tables	12
 user4	stage/sql/init	3
-user4	stage/sql/Opening tables	7
+user4	stage/sql/Opening tables	8
 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	45
+localhost	stage/sql/closing tables	49
 localhost	stage/sql/init	12
-localhost	stage/sql/Opening tables	29
+localhost	stage/sql/Opening tables	33
 localhost	stage/sql/starting	28
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	28
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
-user4	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
+user4	localhost	transaction	4
 execute dump_transactions_user;
 user	event_name	count_star
-user1	transaction	3
-user2	transaction	3
-user3	transaction	3
-user4	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
+user4	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
-localhost	transaction	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	12
+user1	localhost	stage/sql/closing tables	13
 user1	localhost	stage/sql/init	3
-user1	localhost	stage/sql/Opening tables	8
+user1	localhost	stage/sql/Opening tables	9
 user1	localhost	stage/sql/starting	8
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/closing tables	12
 user2	localhost	stage/sql/init	3
-user2	localhost	stage/sql/Opening tables	7
+user2	localhost	stage/sql/Opening tables	8
 user2	localhost	stage/sql/starting	7
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/closing tables	12
 user3	localhost	stage/sql/init	3
-user3	localhost	stage/sql/Opening tables	7
+user3	localhost	stage/sql/Opening tables	8
 user3	localhost	stage/sql/starting	7
 user4	localhost	stage/sql/checking permissions	4
-user4	localhost	stage/sql/closing tables	11
+user4	localhost	stage/sql/closing tables	12
 user4	localhost	stage/sql/init	3
-user4	localhost	stage/sql/Opening tables	7
+user4	localhost	stage/sql/Opening tables	8
 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	12
+user1	stage/sql/closing tables	13
 user1	stage/sql/init	3
-user1	stage/sql/Opening tables	8
+user1	stage/sql/Opening tables	9
 user1	stage/sql/starting	8
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	11
+user2	stage/sql/closing tables	12
 user2	stage/sql/init	3
-user2	stage/sql/Opening tables	7
+user2	stage/sql/Opening tables	8
 user2	stage/sql/starting	7
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	11
+user3	stage/sql/closing tables	12
 user3	stage/sql/init	3
-user3	stage/sql/Opening tables	7
+user3	stage/sql/Opening tables	8
 user3	stage/sql/starting	7
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	11
+user4	stage/sql/closing tables	12
 user4	stage/sql/init	3
-user4	stage/sql/Opening tables	7
+user4	stage/sql/Opening tables	8
 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	45
+localhost	stage/sql/closing tables	49
 localhost	stage/sql/init	12
-localhost	stage/sql/Opening tables	29
+localhost	stage/sql/Opening tables	33
 localhost	stage/sql/starting	29
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	29
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	29
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
-user4	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
+user4	localhost	transaction	4
 execute dump_transactions_user;
 user	event_name	count_star
-user1	transaction	3
-user2	transaction	3
-user3	transaction	3
-user4	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
+user4	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
-localhost	transaction	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	12
+user1	localhost	stage/sql/closing tables	13
 user1	localhost	stage/sql/init	3
-user1	localhost	stage/sql/Opening tables	8
+user1	localhost	stage/sql/Opening tables	9
 user1	localhost	stage/sql/starting	8
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/closing tables	12
 user2	localhost	stage/sql/init	3
-user2	localhost	stage/sql/Opening tables	7
+user2	localhost	stage/sql/Opening tables	8
 user2	localhost	stage/sql/starting	8
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/closing tables	12
 user3	localhost	stage/sql/init	3
-user3	localhost	stage/sql/Opening tables	7
+user3	localhost	stage/sql/Opening tables	8
 user3	localhost	stage/sql/starting	7
 user4	localhost	stage/sql/checking permissions	4
-user4	localhost	stage/sql/closing tables	11
+user4	localhost	stage/sql/closing tables	12
 user4	localhost	stage/sql/init	3
-user4	localhost	stage/sql/Opening tables	7
+user4	localhost	stage/sql/Opening tables	8
 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	12
+user1	stage/sql/closing tables	13
 user1	stage/sql/init	3
-user1	stage/sql/Opening tables	8
+user1	stage/sql/Opening tables	9
 user1	stage/sql/starting	8
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	11
+user2	stage/sql/closing tables	12
 user2	stage/sql/init	3
-user2	stage/sql/Opening tables	7
+user2	stage/sql/Opening tables	8
 user2	stage/sql/starting	8
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	11
+user3	stage/sql/closing tables	12
 user3	stage/sql/init	3
-user3	stage/sql/Opening tables	7
+user3	stage/sql/Opening tables	8
 user3	stage/sql/starting	7
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	11
+user4	stage/sql/closing tables	12
 user4	stage/sql/init	3
-user4	stage/sql/Opening tables	7
+user4	stage/sql/Opening tables	8
 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	45
+localhost	stage/sql/closing tables	49
 localhost	stage/sql/init	12
-localhost	stage/sql/Opening tables	29
+localhost	stage/sql/Opening tables	33
 localhost	stage/sql/starting	30
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	30
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	30
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
-user4	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
+user4	localhost	transaction	4
 execute dump_transactions_user;
 user	event_name	count_star
-user1	transaction	3
-user2	transaction	3
-user3	transaction	3
-user4	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
+user4	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
-localhost	transaction	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	12
+user1	localhost	stage/sql/closing tables	13
 user1	localhost	stage/sql/init	3
-user1	localhost	stage/sql/Opening tables	8
+user1	localhost	stage/sql/Opening tables	9
 user1	localhost	stage/sql/starting	8
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/closing tables	12
 user2	localhost	stage/sql/init	3
-user2	localhost	stage/sql/Opening tables	7
+user2	localhost	stage/sql/Opening tables	8
 user2	localhost	stage/sql/starting	8
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/closing tables	12
 user3	localhost	stage/sql/init	3
-user3	localhost	stage/sql/Opening tables	7
+user3	localhost	stage/sql/Opening tables	8
 user3	localhost	stage/sql/starting	8
 user4	localhost	stage/sql/checking permissions	4
-user4	localhost	stage/sql/closing tables	11
+user4	localhost	stage/sql/closing tables	12
 user4	localhost	stage/sql/init	3
-user4	localhost	stage/sql/Opening tables	7
+user4	localhost	stage/sql/Opening tables	8
 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	12
+user1	stage/sql/closing tables	13
 user1	stage/sql/init	3
-user1	stage/sql/Opening tables	8
+user1	stage/sql/Opening tables	9
 user1	stage/sql/starting	8
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	11
+user2	stage/sql/closing tables	12
 user2	stage/sql/init	3
-user2	stage/sql/Opening tables	7
+user2	stage/sql/Opening tables	8
 user2	stage/sql/starting	8
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	11
+user3	stage/sql/closing tables	12
 user3	stage/sql/init	3
-user3	stage/sql/Opening tables	7
+user3	stage/sql/Opening tables	8
 user3	stage/sql/starting	8
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	11
+user4	stage/sql/closing tables	12
 user4	stage/sql/init	3
-user4	stage/sql/Opening tables	7
+user4	stage/sql/Opening tables	8
 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	45
+localhost	stage/sql/closing tables	49
 localhost	stage/sql/init	12
-localhost	stage/sql/Opening tables	29
+localhost	stage/sql/Opening tables	33
 localhost	stage/sql/starting	31
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	31
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	31
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
-user4	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
+user4	localhost	transaction	4
 execute dump_transactions_user;
 user	event_name	count_star
-user1	transaction	3
-user2	transaction	3
-user3	transaction	3
-user4	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
+user4	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
-localhost	transaction	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	12
+user1	localhost	stage/sql/closing tables	13
 user1	localhost	stage/sql/init	3
-user1	localhost	stage/sql/Opening tables	8
+user1	localhost	stage/sql/Opening tables	9
 user1	localhost	stage/sql/starting	8
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/closing tables	12
 user2	localhost	stage/sql/init	3
-user2	localhost	stage/sql/Opening tables	7
+user2	localhost	stage/sql/Opening tables	8
 user2	localhost	stage/sql/starting	8
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/closing tables	12
 user3	localhost	stage/sql/init	3
-user3	localhost	stage/sql/Opening tables	7
+user3	localhost	stage/sql/Opening tables	8
 user3	localhost	stage/sql/starting	8
 user4	localhost	stage/sql/checking permissions	4
-user4	localhost	stage/sql/closing tables	11
+user4	localhost	stage/sql/closing tables	12
 user4	localhost	stage/sql/init	3
-user4	localhost	stage/sql/Opening tables	7
+user4	localhost	stage/sql/Opening tables	8
 user4	localhost	stage/sql/starting	8
 execute dump_stages_user;
 user	event_name	count_star
 user1	stage/sql/checking permissions	4
-user1	stage/sql/closing tables	12
+user1	stage/sql/closing tables	13
 user1	stage/sql/init	3
-user1	stage/sql/Opening tables	8
+user1	stage/sql/Opening tables	9
 user1	stage/sql/starting	8
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	11
+user2	stage/sql/closing tables	12
 user2	stage/sql/init	3
-user2	stage/sql/Opening tables	7
+user2	stage/sql/Opening tables	8
 user2	stage/sql/starting	8
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	11
+user3	stage/sql/closing tables	12
 user3	stage/sql/init	3
-user3	stage/sql/Opening tables	7
+user3	stage/sql/Opening tables	8
 user3	stage/sql/starting	8
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	11
+user4	stage/sql/closing tables	12
 user4	stage/sql/init	3
-user4	stage/sql/Opening tables	7
+user4	stage/sql/Opening tables	8
 user4	stage/sql/starting	8
 execute dump_stages_host;
 host	event_name	count_star
 localhost	stage/sql/checking permissions	16
-localhost	stage/sql/closing tables	45
+localhost	stage/sql/closing tables	49
 localhost	stage/sql/init	12
-localhost	stage/sql/Opening tables	29
+localhost	stage/sql/Opening tables	33
 localhost	stage/sql/starting	32
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
-user4	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
+user4	localhost	transaction	4
 execute dump_transactions_user;
 user	event_name	count_star
-user1	transaction	3
-user2	transaction	3
-user3	transaction	3
-user4	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
+user4	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
-localhost	transaction	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	12
+user1	localhost	stage/sql/closing tables	13
 user1	localhost	stage/sql/init	3
-user1	localhost	stage/sql/Opening tables	8
+user1	localhost	stage/sql/Opening tables	9
 user1	localhost	stage/sql/starting	8
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/closing tables	12
 user2	localhost	stage/sql/init	3
-user2	localhost	stage/sql/Opening tables	7
+user2	localhost	stage/sql/Opening tables	8
 user2	localhost	stage/sql/starting	8
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/closing tables	12
 user3	localhost	stage/sql/init	3
-user3	localhost	stage/sql/Opening tables	7
+user3	localhost	stage/sql/Opening tables	8
 user3	localhost	stage/sql/starting	8
 user4	localhost	stage/sql/checking permissions	4
-user4	localhost	stage/sql/closing tables	11
+user4	localhost	stage/sql/closing tables	12
 user4	localhost	stage/sql/init	3
-user4	localhost	stage/sql/Opening tables	7
+user4	localhost	stage/sql/Opening tables	8
 user4	localhost	stage/sql/starting	8
 execute dump_stages_user;
 user	event_name	count_star
 user1	stage/sql/checking permissions	4
-user1	stage/sql/closing tables	12
+user1	stage/sql/closing tables	13
 user1	stage/sql/init	3
-user1	stage/sql/Opening tables	8
+user1	stage/sql/Opening tables	9
 user1	stage/sql/starting	8
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	11
+user2	stage/sql/closing tables	12
 user2	stage/sql/init	3
-user2	stage/sql/Opening tables	7
+user2	stage/sql/Opening tables	8
 user2	stage/sql/starting	8
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	11
+user3	stage/sql/closing tables	12
 user3	stage/sql/init	3
-user3	stage/sql/Opening tables	7
+user3	stage/sql/Opening tables	8
 user3	stage/sql/starting	8
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	11
+user4	stage/sql/closing tables	12
 user4	stage/sql/init	3
-user4	stage/sql/Opening tables	7
+user4	stage/sql/Opening tables	8
 user4	stage/sql/starting	8
 execute dump_stages_host;
 host	event_name	count_star
 localhost	stage/sql/checking permissions	16
-localhost	stage/sql/closing tables	45
+localhost	stage/sql/closing tables	49
 localhost	stage/sql/init	12
-localhost	stage/sql/Opening tables	29
+localhost	stage/sql/Opening tables	33
 localhost	stage/sql/starting	32
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
-user4	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
+user4	localhost	transaction	4
 execute dump_transactions_user;
 user	event_name	count_star
-user1	transaction	3
-user2	transaction	3
-user3	transaction	3
-user4	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
+user4	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
-localhost	transaction	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	12
+user1	localhost	stage/sql/closing tables	13
 user1	localhost	stage/sql/init	3
-user1	localhost	stage/sql/Opening tables	8
+user1	localhost	stage/sql/Opening tables	9
 user1	localhost	stage/sql/starting	8
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/closing tables	12
 user2	localhost	stage/sql/init	3
-user2	localhost	stage/sql/Opening tables	7
+user2	localhost	stage/sql/Opening tables	8
 user2	localhost	stage/sql/starting	8
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/closing tables	12
 user3	localhost	stage/sql/init	3
-user3	localhost	stage/sql/Opening tables	7
+user3	localhost	stage/sql/Opening tables	8
 user3	localhost	stage/sql/starting	8
 user4	localhost	stage/sql/checking permissions	4
-user4	localhost	stage/sql/closing tables	11
+user4	localhost	stage/sql/closing tables	12
 user4	localhost	stage/sql/init	3
-user4	localhost	stage/sql/Opening tables	7
+user4	localhost	stage/sql/Opening tables	8
 user4	localhost	stage/sql/starting	8
 execute dump_stages_user;
 user	event_name	count_star
 user1	stage/sql/checking permissions	4
-user1	stage/sql/closing tables	12
+user1	stage/sql/closing tables	13
 user1	stage/sql/init	3
-user1	stage/sql/Opening tables	8
+user1	stage/sql/Opening tables	9
 user1	stage/sql/starting	8
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	11
+user2	stage/sql/closing tables	12
 user2	stage/sql/init	3
-user2	stage/sql/Opening tables	7
+user2	stage/sql/Opening tables	8
 user2	stage/sql/starting	8
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	11
+user3	stage/sql/closing tables	12
 user3	stage/sql/init	3
-user3	stage/sql/Opening tables	7
+user3	stage/sql/Opening tables	8
 user3	stage/sql/starting	8
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	11
+user4	stage/sql/closing tables	12
 user4	stage/sql/init	3
-user4	stage/sql/Opening tables	7
+user4	stage/sql/Opening tables	8
 user4	stage/sql/starting	8
 execute dump_stages_host;
 host	event_name	count_star
 localhost	stage/sql/checking permissions	16
-localhost	stage/sql/closing tables	45
+localhost	stage/sql/closing tables	49
 localhost	stage/sql/init	12
-localhost	stage/sql/Opening tables	29
+localhost	stage/sql/Opening tables	33
 localhost	stage/sql/starting	32
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
-user4	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
+user4	localhost	transaction	4
 execute dump_transactions_user;
 user	event_name	count_star
-user1	transaction	3
-user2	transaction	3
-user3	transaction	3
-user4	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
+user4	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
-localhost	transaction	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	12
+user1	localhost	stage/sql/closing tables	13
 user1	localhost	stage/sql/init	3
-user1	localhost	stage/sql/Opening tables	8
+user1	localhost	stage/sql/Opening tables	9
 user1	localhost	stage/sql/starting	8
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/closing tables	12
 user2	localhost	stage/sql/init	3
-user2	localhost	stage/sql/Opening tables	7
+user2	localhost	stage/sql/Opening tables	8
 user2	localhost	stage/sql/starting	8
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/closing tables	12
 user3	localhost	stage/sql/init	3
-user3	localhost	stage/sql/Opening tables	7
+user3	localhost	stage/sql/Opening tables	8
 user3	localhost	stage/sql/starting	8
 user4	localhost	stage/sql/checking permissions	4
-user4	localhost	stage/sql/closing tables	11
+user4	localhost	stage/sql/closing tables	12
 user4	localhost	stage/sql/init	3
-user4	localhost	stage/sql/Opening tables	7
+user4	localhost	stage/sql/Opening tables	8
 user4	localhost	stage/sql/starting	8
 execute dump_stages_user;
 user	event_name	count_star
 user1	stage/sql/checking permissions	4
-user1	stage/sql/closing tables	12
+user1	stage/sql/closing tables	13
 user1	stage/sql/init	3
-user1	stage/sql/Opening tables	8
+user1	stage/sql/Opening tables	9
 user1	stage/sql/starting	8
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	11
+user2	stage/sql/closing tables	12
 user2	stage/sql/init	3
-user2	stage/sql/Opening tables	7
+user2	stage/sql/Opening tables	8
 user2	stage/sql/starting	8
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	11
+user3	stage/sql/closing tables	12
 user3	stage/sql/init	3
-user3	stage/sql/Opening tables	7
+user3	stage/sql/Opening tables	8
 user3	stage/sql/starting	8
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	11
+user4	stage/sql/closing tables	12
 user4	stage/sql/init	3
-user4	stage/sql/Opening tables	7
+user4	stage/sql/Opening tables	8
 user4	stage/sql/starting	8
 execute dump_stages_host;
 host	event_name	count_star
 localhost	stage/sql/checking permissions	16
-localhost	stage/sql/closing tables	45
+localhost	stage/sql/closing tables	49
 localhost	stage/sql/init	12
-localhost	stage/sql/Opening tables	29
+localhost	stage/sql/Opening tables	33
 localhost	stage/sql/starting	32
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
-user4	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
+user4	localhost	transaction	4
 execute dump_transactions_user;
 user	event_name	count_star
-user1	transaction	3
-user2	transaction	3
-user3	transaction	3
-user4	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
+user4	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
-localhost	transaction	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	12
+user1	localhost	stage/sql/closing tables	13
 user1	localhost	stage/sql/init	3
-user1	localhost	stage/sql/Opening tables	8
+user1	localhost	stage/sql/Opening tables	9
 user1	localhost	stage/sql/starting	8
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/closing tables	12
 user2	localhost	stage/sql/init	3
-user2	localhost	stage/sql/Opening tables	7
+user2	localhost	stage/sql/Opening tables	8
 user2	localhost	stage/sql/starting	8
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/closing tables	12
 user3	localhost	stage/sql/init	3
-user3	localhost	stage/sql/Opening tables	7
+user3	localhost	stage/sql/Opening tables	8
 user3	localhost	stage/sql/starting	8
 user4	localhost	stage/sql/checking permissions	4
-user4	localhost	stage/sql/closing tables	11
+user4	localhost	stage/sql/closing tables	12
 user4	localhost	stage/sql/init	3
-user4	localhost	stage/sql/Opening tables	7
+user4	localhost	stage/sql/Opening tables	8
 user4	localhost	stage/sql/starting	8
 execute dump_stages_user;
 user	event_name	count_star
 user1	stage/sql/checking permissions	4
-user1	stage/sql/closing tables	12
+user1	stage/sql/closing tables	13
 user1	stage/sql/init	3
-user1	stage/sql/Opening tables	8
+user1	stage/sql/Opening tables	9
 user1	stage/sql/starting	8
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	11
+user2	stage/sql/closing tables	12
 user2	stage/sql/init	3
-user2	stage/sql/Opening tables	7
+user2	stage/sql/Opening tables	8
 user2	stage/sql/starting	8
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	11
+user3	stage/sql/closing tables	12
 user3	stage/sql/init	3
-user3	stage/sql/Opening tables	7
+user3	stage/sql/Opening tables	8
 user3	stage/sql/starting	8
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	11
+user4	stage/sql/closing tables	12
 user4	stage/sql/init	3
-user4	stage/sql/Opening tables	7
+user4	stage/sql/Opening tables	8
 user4	stage/sql/starting	8
 execute dump_stages_host;
 host	event_name	count_star
 localhost	stage/sql/checking permissions	16
-localhost	stage/sql/closing tables	45
+localhost	stage/sql/closing tables	49
 localhost	stage/sql/init	12
-localhost	stage/sql/Opening tables	29
+localhost	stage/sql/Opening tables	33
 localhost	stage/sql/starting	32
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
-user4	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
+user4	localhost	transaction	4
 execute dump_transactions_user;
 user	event_name	count_star
-user1	transaction	3
-user2	transaction	3
-user3	transaction	3
-user4	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
+user4	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
-localhost	transaction	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	12
+user1	localhost	stage/sql/closing tables	13
 user1	localhost	stage/sql/init	3
-user1	localhost	stage/sql/Opening tables	8
+user1	localhost	stage/sql/Opening tables	9
 user1	localhost	stage/sql/starting	8
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/closing tables	12
 user2	localhost	stage/sql/init	3
-user2	localhost	stage/sql/Opening tables	7
+user2	localhost	stage/sql/Opening tables	8
 user2	localhost	stage/sql/starting	8
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/closing tables	12
 user3	localhost	stage/sql/init	3
-user3	localhost	stage/sql/Opening tables	7
+user3	localhost	stage/sql/Opening tables	8
 user3	localhost	stage/sql/starting	8
 user4	localhost	stage/sql/checking permissions	4
-user4	localhost	stage/sql/closing tables	11
+user4	localhost	stage/sql/closing tables	12
 user4	localhost	stage/sql/init	3
-user4	localhost	stage/sql/Opening tables	7
+user4	localhost	stage/sql/Opening tables	8
 user4	localhost	stage/sql/starting	8
 execute dump_stages_user;
 user	event_name	count_star
 user1	stage/sql/checking permissions	4
-user1	stage/sql/closing tables	12
+user1	stage/sql/closing tables	13
 user1	stage/sql/init	3
-user1	stage/sql/Opening tables	8
+user1	stage/sql/Opening tables	9
 user1	stage/sql/starting	8
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	11
+user2	stage/sql/closing tables	12
 user2	stage/sql/init	3
-user2	stage/sql/Opening tables	7
+user2	stage/sql/Opening tables	8
 user2	stage/sql/starting	8
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	11
+user3	stage/sql/closing tables	12
 user3	stage/sql/init	3
-user3	stage/sql/Opening tables	7
+user3	stage/sql/Opening tables	8
 user3	stage/sql/starting	8
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	11
+user4	stage/sql/closing tables	12
 user4	stage/sql/init	3
-user4	stage/sql/Opening tables	7
+user4	stage/sql/Opening tables	8
 user4	stage/sql/starting	8
 execute dump_stages_host;
 host	event_name	count_star
 localhost	stage/sql/checking permissions	16
-localhost	stage/sql/closing tables	45
+localhost	stage/sql/closing tables	49
 localhost	stage/sql/init	12
-localhost	stage/sql/Opening tables	29
+localhost	stage/sql/Opening tables	33
 localhost	stage/sql/starting	32
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
-user4	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
+user4	localhost	transaction	4
 execute dump_transactions_user;
 user	event_name	count_star
-user1	transaction	3
-user2	transaction	3
-user3	transaction	3
-user4	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
+user4	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
-localhost	transaction	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	12
+user1	localhost	stage/sql/closing tables	13
 user1	localhost	stage/sql/init	3
-user1	localhost	stage/sql/Opening tables	8
+user1	localhost	stage/sql/Opening tables	9
 user1	localhost	stage/sql/starting	8
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/closing tables	12
 user2	localhost	stage/sql/init	3
-user2	localhost	stage/sql/Opening tables	7
+user2	localhost	stage/sql/Opening tables	8
 user2	localhost	stage/sql/starting	8
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/closing tables	12
 user3	localhost	stage/sql/init	3
-user3	localhost	stage/sql/Opening tables	7
+user3	localhost	stage/sql/Opening tables	8
 user3	localhost	stage/sql/starting	8
 user4	localhost	stage/sql/checking permissions	4
-user4	localhost	stage/sql/closing tables	11
+user4	localhost	stage/sql/closing tables	12
 user4	localhost	stage/sql/init	3
-user4	localhost	stage/sql/Opening tables	7
+user4	localhost	stage/sql/Opening tables	8
 user4	localhost	stage/sql/starting	8
 execute dump_stages_user;
 user	event_name	count_star
 user1	stage/sql/checking permissions	4
-user1	stage/sql/closing tables	12
+user1	stage/sql/closing tables	13
 user1	stage/sql/init	3
-user1	stage/sql/Opening tables	8
+user1	stage/sql/Opening tables	9
 user1	stage/sql/starting	8
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	11
+user2	stage/sql/closing tables	12
 user2	stage/sql/init	3
-user2	stage/sql/Opening tables	7
+user2	stage/sql/Opening tables	8
 user2	stage/sql/starting	8
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	11
+user3	stage/sql/closing tables	12
 user3	stage/sql/init	3
-user3	stage/sql/Opening tables	7
+user3	stage/sql/Opening tables	8
 user3	stage/sql/starting	8
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	11
+user4	stage/sql/closing tables	12
 user4	stage/sql/init	3
-user4	stage/sql/Opening tables	7
+user4	stage/sql/Opening tables	8
 user4	stage/sql/starting	8
 execute dump_stages_host;
 host	event_name	count_star
 localhost	stage/sql/checking permissions	16
-localhost	stage/sql/closing tables	45
+localhost	stage/sql/closing tables	49
 localhost	stage/sql/init	12
-localhost	stage/sql/Opening tables	29
+localhost	stage/sql/Opening tables	33
 localhost	stage/sql/starting	32
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
-user4	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
+user4	localhost	transaction	4
 execute dump_transactions_user;
 user	event_name	count_star
-user1	transaction	3
-user2	transaction	3
-user3	transaction	3
-user4	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
+user4	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
-localhost	transaction	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	12
+user1	stage/sql/closing tables	13
 user1	stage/sql/init	3
-user1	stage/sql/Opening tables	8
+user1	stage/sql/Opening tables	9
 user1	stage/sql/starting	8
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	11
+user2	stage/sql/closing tables	12
 user2	stage/sql/init	3
-user2	stage/sql/Opening tables	7
+user2	stage/sql/Opening tables	8
 user2	stage/sql/starting	8
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	11
+user3	stage/sql/closing tables	12
 user3	stage/sql/init	3
-user3	stage/sql/Opening tables	7
+user3	stage/sql/Opening tables	8
 user3	stage/sql/starting	8
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	11
+user4	stage/sql/closing tables	12
 user4	stage/sql/init	3
-user4	stage/sql/Opening tables	7
+user4	stage/sql/Opening tables	8
 user4	stage/sql/starting	8
 execute dump_stages_host;
 host	event_name	count_star
 localhost	stage/sql/checking permissions	16
-localhost	stage/sql/closing tables	45
+localhost	stage/sql/closing tables	49
 localhost	stage/sql/init	12
-localhost	stage/sql/Opening tables	29
+localhost	stage/sql/Opening tables	33
 localhost	stage/sql/starting	32
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
-user4	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
+user4	localhost	transaction	4
 execute dump_transactions_user;
 user	event_name	count_star
-user1	transaction	3
-user2	transaction	3
-user3	transaction	3
-user4	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
+user4	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
-localhost	transaction	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+localhost	stage/sql/closing tables	49
 localhost	stage/sql/init	12
-localhost	stage/sql/Opening tables	29
+localhost	stage/sql/Opening tables	33
 localhost	stage/sql/starting	32
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
-user4	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
+user4	localhost	transaction	4
 execute dump_transactions_user;
 user	event_name	count_star
-user1	transaction	3
-user2	transaction	3
-user3	transaction	3
-user4	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
+user4	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
-localhost	transaction	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
-user4	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
+user4	localhost	transaction	4
 execute dump_transactions_user;
 user	event_name	count_star
-user1	transaction	3
-user2	transaction	3
-user3	transaction	3
-user4	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
+user4	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
-localhost	transaction	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
-user4	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
+user4	localhost	transaction	4
 execute dump_transactions_user;
 user	event_name	count_star
-user1	transaction	3
-user2	transaction	3
-user3	transaction	3
-user4	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
+user4	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
-localhost	transaction	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
-user4	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
+user4	localhost	transaction	4
 execute dump_transactions_user;
 user	event_name	count_star
-user1	transaction	3
-user2	transaction	3
-user3	transaction	3
-user4	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
+user4	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
-localhost	transaction	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
-user4	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
+user4	localhost	transaction	4
 execute dump_transactions_user;
 user	event_name	count_star
-user1	transaction	3
-user2	transaction	3
-user3	transaction	3
-user4	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
+user4	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
-localhost	transaction	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
-user4	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
+user4	localhost	transaction	4
 execute dump_transactions_user;
 user	event_name	count_star
-user1	transaction	3
-user2	transaction	3
-user3	transaction	3
-user4	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
+user4	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
-localhost	transaction	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
-user4	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
+user4	localhost	transaction	4
 execute dump_transactions_user;
 user	event_name	count_star
-user1	transaction	3
-user2	transaction	3
-user3	transaction	3
-user4	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
+user4	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
-localhost	transaction	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
-user4	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
+user4	localhost	transaction	4
 execute dump_transactions_user;
 user	event_name	count_star
-user1	transaction	3
-user2	transaction	3
-user3	transaction	3
-user4	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
+user4	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
-localhost	transaction	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
-user4	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
+user4	localhost	transaction	4
 execute dump_transactions_user;
 user	event_name	count_star
-user1	transaction	3
-user2	transaction	3
-user3	transaction	3
-user4	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
+user4	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
-localhost	transaction	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	transaction	3
-user3	transaction	3
-user4	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
+user4	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
-localhost	transaction	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	12
+transaction	16
 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 f53a54ecae46f..897810734d6d1 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	12
+user1	stage/sql/closing tables	13
 user1	stage/sql/init	3
-user1	stage/sql/Opening tables	8
+user1	stage/sql/Opening tables	9
 user1	stage/sql/starting	7
 execute dump_stages_host;
 host	event_name	count_star
 localhost	stage/sql/checking permissions	4
-localhost	stage/sql/closing tables	12
+localhost	stage/sql/closing tables	13
 localhost	stage/sql/init	3
-localhost	stage/sql/Opening tables	8
+localhost	stage/sql/Opening tables	9
 localhost	stage/sql/starting	7
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	4
-stage/sql/closing tables	12
+stage/sql/closing tables	13
 stage/sql/init	3
-stage/sql/Opening tables	8
+stage/sql/Opening tables	9
 stage/sql/starting	7
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	4
-stage/sql/closing tables	12
+stage/sql/closing tables	13
 stage/sql/init	3
-stage/sql/Opening tables	8
+stage/sql/Opening tables	9
 stage/sql/starting	7
 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	3
+user1	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
-localhost	transaction	3
+localhost	transaction	4
 execute dump_transactions_global;
 event_name	count_star
-transaction	3
+transaction	4
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	3
+transaction	4
 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	12
+user1	stage/sql/closing tables	13
 user1	stage/sql/init	3
-user1	stage/sql/Opening tables	8
+user1	stage/sql/Opening tables	9
 user1	stage/sql/starting	7
 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	12
+localhost	stage/sql/closing tables	13
 localhost	stage/sql/init	3
-localhost	stage/sql/Opening tables	8
+localhost	stage/sql/Opening tables	9
 localhost	stage/sql/starting	7
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	4
-stage/sql/closing tables	12
+stage/sql/closing tables	13
 stage/sql/init	3
-stage/sql/Opening tables	8
+stage/sql/Opening tables	9
 stage/sql/starting	7
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	4
-stage/sql/closing tables	12
+stage/sql/closing tables	13
 stage/sql/init	3
-stage/sql/Opening tables	8
+stage/sql/Opening tables	9
 stage/sql/starting	7
 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	3
+user1	transaction	4
 user2	transaction	0
 execute dump_transactions_host;
 host	event_name	count_star
-localhost	transaction	3
+localhost	transaction	4
 execute dump_transactions_global;
 event_name	count_star
-transaction	3
+transaction	4
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	3
+transaction	4
 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	12
+user1	stage/sql/closing tables	13
 user1	stage/sql/init	3
-user1	stage/sql/Opening tables	8
+user1	stage/sql/Opening tables	9
 user1	stage/sql/starting	7
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	11
+user2	stage/sql/closing tables	12
 user2	stage/sql/init	3
-user2	stage/sql/Opening tables	7
+user2	stage/sql/Opening tables	8
 user2	stage/sql/starting	7
 execute dump_stages_host;
 host	event_name	count_star
 localhost	stage/sql/checking permissions	8
-localhost	stage/sql/closing tables	23
+localhost	stage/sql/closing tables	25
 localhost	stage/sql/init	6
-localhost	stage/sql/Opening tables	15
+localhost	stage/sql/Opening tables	17
 localhost	stage/sql/starting	14
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	8
-stage/sql/closing tables	23
+stage/sql/closing tables	25
 stage/sql/init	6
-stage/sql/Opening tables	15
+stage/sql/Opening tables	17
 stage/sql/starting	14
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	8
-stage/sql/closing tables	23
+stage/sql/closing tables	25
 stage/sql/init	6
-stage/sql/Opening tables	15
+stage/sql/Opening tables	17
 stage/sql/starting	14
 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	3
-user2	transaction	3
+user1	transaction	4
+user2	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
-localhost	transaction	6
+localhost	transaction	8
 execute dump_transactions_global;
 event_name	count_star
-transaction	6
+transaction	8
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	6
+transaction	8
 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	12
+user1	stage/sql/closing tables	13
 user1	stage/sql/init	3
-user1	stage/sql/Opening tables	8
+user1	stage/sql/Opening tables	9
 user1	stage/sql/starting	7
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	11
+user2	stage/sql/closing tables	12
 user2	stage/sql/init	3
-user2	stage/sql/Opening tables	7
+user2	stage/sql/Opening tables	8
 user2	stage/sql/starting	7
 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	23
+localhost	stage/sql/closing tables	25
 localhost	stage/sql/init	6
-localhost	stage/sql/Opening tables	15
+localhost	stage/sql/Opening tables	17
 localhost	stage/sql/starting	14
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	8
-stage/sql/closing tables	23
+stage/sql/closing tables	25
 stage/sql/init	6
-stage/sql/Opening tables	15
+stage/sql/Opening tables	17
 stage/sql/starting	14
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	8
-stage/sql/closing tables	23
+stage/sql/closing tables	25
 stage/sql/init	6
-stage/sql/Opening tables	15
+stage/sql/Opening tables	17
 stage/sql/starting	14
 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	3
-user2	transaction	3
+user1	transaction	4
+user2	transaction	4
 user3	transaction	0
 execute dump_transactions_host;
 host	event_name	count_star
-localhost	transaction	6
+localhost	transaction	8
 execute dump_transactions_global;
 event_name	count_star
-transaction	6
+transaction	8
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	6
+transaction	8
 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	12
+user1	stage/sql/closing tables	13
 user1	stage/sql/init	3
-user1	stage/sql/Opening tables	8
+user1	stage/sql/Opening tables	9
 user1	stage/sql/starting	7
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	11
+user2	stage/sql/closing tables	12
 user2	stage/sql/init	3
-user2	stage/sql/Opening tables	7
+user2	stage/sql/Opening tables	8
 user2	stage/sql/starting	7
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	11
+user3	stage/sql/closing tables	12
 user3	stage/sql/init	3
-user3	stage/sql/Opening tables	7
+user3	stage/sql/Opening tables	8
 user3	stage/sql/starting	7
 execute dump_stages_host;
 host	event_name	count_star
 localhost	stage/sql/checking permissions	12
-localhost	stage/sql/closing tables	34
+localhost	stage/sql/closing tables	37
 localhost	stage/sql/init	9
-localhost	stage/sql/Opening tables	22
+localhost	stage/sql/Opening tables	25
 localhost	stage/sql/starting	21
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	12
-stage/sql/closing tables	34
+stage/sql/closing tables	37
 stage/sql/init	9
-stage/sql/Opening tables	22
+stage/sql/Opening tables	25
 stage/sql/starting	21
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	12
-stage/sql/closing tables	34
+stage/sql/closing tables	37
 stage/sql/init	9
-stage/sql/Opening tables	22
+stage/sql/Opening tables	25
 stage/sql/starting	21
 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	3
-user2	transaction	3
-user3	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
-localhost	transaction	9
+localhost	transaction	12
 execute dump_transactions_global;
 event_name	count_star
-transaction	9
+transaction	12
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	9
+transaction	12
 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	12
+user1	stage/sql/closing tables	13
 user1	stage/sql/init	3
-user1	stage/sql/Opening tables	8
+user1	stage/sql/Opening tables	9
 user1	stage/sql/starting	7
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	11
+user2	stage/sql/closing tables	12
 user2	stage/sql/init	3
-user2	stage/sql/Opening tables	7
+user2	stage/sql/Opening tables	8
 user2	stage/sql/starting	7
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	11
+user3	stage/sql/closing tables	12
 user3	stage/sql/init	3
-user3	stage/sql/Opening tables	7
+user3	stage/sql/Opening tables	8
 user3	stage/sql/starting	7
 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	34
+localhost	stage/sql/closing tables	37
 localhost	stage/sql/init	9
-localhost	stage/sql/Opening tables	22
+localhost	stage/sql/Opening tables	25
 localhost	stage/sql/starting	21
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	12
-stage/sql/closing tables	34
+stage/sql/closing tables	37
 stage/sql/init	9
-stage/sql/Opening tables	22
+stage/sql/Opening tables	25
 stage/sql/starting	21
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	12
-stage/sql/closing tables	34
+stage/sql/closing tables	37
 stage/sql/init	9
-stage/sql/Opening tables	22
+stage/sql/Opening tables	25
 stage/sql/starting	21
 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	3
-user2	transaction	3
-user3	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
 user4	transaction	0
 execute dump_transactions_host;
 host	event_name	count_star
-localhost	transaction	9
+localhost	transaction	12
 execute dump_transactions_global;
 event_name	count_star
-transaction	9
+transaction	12
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	9
+transaction	12
 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	12
+user1	stage/sql/closing tables	13
 user1	stage/sql/init	3
-user1	stage/sql/Opening tables	8
+user1	stage/sql/Opening tables	9
 user1	stage/sql/starting	7
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	11
+user2	stage/sql/closing tables	12
 user2	stage/sql/init	3
-user2	stage/sql/Opening tables	7
+user2	stage/sql/Opening tables	8
 user2	stage/sql/starting	7
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	11
+user3	stage/sql/closing tables	12
 user3	stage/sql/init	3
-user3	stage/sql/Opening tables	7
+user3	stage/sql/Opening tables	8
 user3	stage/sql/starting	7
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	11
+user4	stage/sql/closing tables	12
 user4	stage/sql/init	3
-user4	stage/sql/Opening tables	7
+user4	stage/sql/Opening tables	8
 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	45
+localhost	stage/sql/closing tables	49
 localhost	stage/sql/init	12
-localhost	stage/sql/Opening tables	29
+localhost	stage/sql/Opening tables	33
 localhost	stage/sql/starting	28
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	28
 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	3
-user2	transaction	3
-user3	transaction	3
-user4	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
+user4	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
-localhost	transaction	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	12
+user1	stage/sql/closing tables	13
 user1	stage/sql/init	3
-user1	stage/sql/Opening tables	8
+user1	stage/sql/Opening tables	9
 user1	stage/sql/starting	8
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	11
+user2	stage/sql/closing tables	12
 user2	stage/sql/init	3
-user2	stage/sql/Opening tables	7
+user2	stage/sql/Opening tables	8
 user2	stage/sql/starting	7
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	11
+user3	stage/sql/closing tables	12
 user3	stage/sql/init	3
-user3	stage/sql/Opening tables	7
+user3	stage/sql/Opening tables	8
 user3	stage/sql/starting	7
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	11
+user4	stage/sql/closing tables	12
 user4	stage/sql/init	3
-user4	stage/sql/Opening tables	7
+user4	stage/sql/Opening tables	8
 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	45
+localhost	stage/sql/closing tables	49
 localhost	stage/sql/init	12
-localhost	stage/sql/Opening tables	29
+localhost	stage/sql/Opening tables	33
 localhost	stage/sql/starting	29
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	29
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	29
 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	3
-user2	transaction	3
-user3	transaction	3
-user4	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
+user4	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
-localhost	transaction	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	12
+user1	stage/sql/closing tables	13
 user1	stage/sql/init	3
-user1	stage/sql/Opening tables	8
+user1	stage/sql/Opening tables	9
 user1	stage/sql/starting	8
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	11
+user2	stage/sql/closing tables	12
 user2	stage/sql/init	3
-user2	stage/sql/Opening tables	7
+user2	stage/sql/Opening tables	8
 user2	stage/sql/starting	8
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	11
+user3	stage/sql/closing tables	12
 user3	stage/sql/init	3
-user3	stage/sql/Opening tables	7
+user3	stage/sql/Opening tables	8
 user3	stage/sql/starting	7
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	11
+user4	stage/sql/closing tables	12
 user4	stage/sql/init	3
-user4	stage/sql/Opening tables	7
+user4	stage/sql/Opening tables	8
 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	45
+localhost	stage/sql/closing tables	49
 localhost	stage/sql/init	12
-localhost	stage/sql/Opening tables	29
+localhost	stage/sql/Opening tables	33
 localhost	stage/sql/starting	30
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	30
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	30
 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	3
-user2	transaction	3
-user3	transaction	3
-user4	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
+user4	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
-localhost	transaction	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	12
+user1	stage/sql/closing tables	13
 user1	stage/sql/init	3
-user1	stage/sql/Opening tables	8
+user1	stage/sql/Opening tables	9
 user1	stage/sql/starting	8
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	11
+user2	stage/sql/closing tables	12
 user2	stage/sql/init	3
-user2	stage/sql/Opening tables	7
+user2	stage/sql/Opening tables	8
 user2	stage/sql/starting	8
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	11
+user3	stage/sql/closing tables	12
 user3	stage/sql/init	3
-user3	stage/sql/Opening tables	7
+user3	stage/sql/Opening tables	8
 user3	stage/sql/starting	8
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	11
+user4	stage/sql/closing tables	12
 user4	stage/sql/init	3
-user4	stage/sql/Opening tables	7
+user4	stage/sql/Opening tables	8
 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	45
+localhost	stage/sql/closing tables	49
 localhost	stage/sql/init	12
-localhost	stage/sql/Opening tables	29
+localhost	stage/sql/Opening tables	33
 localhost	stage/sql/starting	31
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	31
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	31
 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	3
-user2	transaction	3
-user3	transaction	3
-user4	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
+user4	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
-localhost	transaction	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	12
+user1	stage/sql/closing tables	13
 user1	stage/sql/init	3
-user1	stage/sql/Opening tables	8
+user1	stage/sql/Opening tables	9
 user1	stage/sql/starting	8
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	11
+user2	stage/sql/closing tables	12
 user2	stage/sql/init	3
-user2	stage/sql/Opening tables	7
+user2	stage/sql/Opening tables	8
 user2	stage/sql/starting	8
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	11
+user3	stage/sql/closing tables	12
 user3	stage/sql/init	3
-user3	stage/sql/Opening tables	7
+user3	stage/sql/Opening tables	8
 user3	stage/sql/starting	8
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	11
+user4	stage/sql/closing tables	12
 user4	stage/sql/init	3
-user4	stage/sql/Opening tables	7
+user4	stage/sql/Opening tables	8
 user4	stage/sql/starting	8
 execute dump_stages_host;
 host	event_name	count_star
 localhost	stage/sql/checking permissions	16
-localhost	stage/sql/closing tables	45
+localhost	stage/sql/closing tables	49
 localhost	stage/sql/init	12
-localhost	stage/sql/Opening tables	29
+localhost	stage/sql/Opening tables	33
 localhost	stage/sql/starting	32
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	transaction	3
-user3	transaction	3
-user4	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
+user4	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
-localhost	transaction	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	12
+user1	stage/sql/closing tables	13
 user1	stage/sql/init	3
-user1	stage/sql/Opening tables	8
+user1	stage/sql/Opening tables	9
 user1	stage/sql/starting	8
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	11
+user2	stage/sql/closing tables	12
 user2	stage/sql/init	3
-user2	stage/sql/Opening tables	7
+user2	stage/sql/Opening tables	8
 user2	stage/sql/starting	8
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	11
+user3	stage/sql/closing tables	12
 user3	stage/sql/init	3
-user3	stage/sql/Opening tables	7
+user3	stage/sql/Opening tables	8
 user3	stage/sql/starting	8
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	11
+user4	stage/sql/closing tables	12
 user4	stage/sql/init	3
-user4	stage/sql/Opening tables	7
+user4	stage/sql/Opening tables	8
 user4	stage/sql/starting	8
 execute dump_stages_host;
 host	event_name	count_star
 localhost	stage/sql/checking permissions	16
-localhost	stage/sql/closing tables	45
+localhost	stage/sql/closing tables	49
 localhost	stage/sql/init	12
-localhost	stage/sql/Opening tables	29
+localhost	stage/sql/Opening tables	33
 localhost	stage/sql/starting	32
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	transaction	3
-user3	transaction	3
-user4	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
+user4	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
-localhost	transaction	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	12
+user1	stage/sql/closing tables	13
 user1	stage/sql/init	3
-user1	stage/sql/Opening tables	8
+user1	stage/sql/Opening tables	9
 user1	stage/sql/starting	8
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	11
+user2	stage/sql/closing tables	12
 user2	stage/sql/init	3
-user2	stage/sql/Opening tables	7
+user2	stage/sql/Opening tables	8
 user2	stage/sql/starting	8
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	11
+user3	stage/sql/closing tables	12
 user3	stage/sql/init	3
-user3	stage/sql/Opening tables	7
+user3	stage/sql/Opening tables	8
 user3	stage/sql/starting	8
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	11
+user4	stage/sql/closing tables	12
 user4	stage/sql/init	3
-user4	stage/sql/Opening tables	7
+user4	stage/sql/Opening tables	8
 user4	stage/sql/starting	8
 execute dump_stages_host;
 host	event_name	count_star
 localhost	stage/sql/checking permissions	16
-localhost	stage/sql/closing tables	45
+localhost	stage/sql/closing tables	49
 localhost	stage/sql/init	12
-localhost	stage/sql/Opening tables	29
+localhost	stage/sql/Opening tables	33
 localhost	stage/sql/starting	32
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	transaction	3
-user3	transaction	3
-user4	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
+user4	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
-localhost	transaction	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	12
+user1	stage/sql/closing tables	13
 user1	stage/sql/init	3
-user1	stage/sql/Opening tables	8
+user1	stage/sql/Opening tables	9
 user1	stage/sql/starting	8
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	11
+user2	stage/sql/closing tables	12
 user2	stage/sql/init	3
-user2	stage/sql/Opening tables	7
+user2	stage/sql/Opening tables	8
 user2	stage/sql/starting	8
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	11
+user3	stage/sql/closing tables	12
 user3	stage/sql/init	3
-user3	stage/sql/Opening tables	7
+user3	stage/sql/Opening tables	8
 user3	stage/sql/starting	8
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	11
+user4	stage/sql/closing tables	12
 user4	stage/sql/init	3
-user4	stage/sql/Opening tables	7
+user4	stage/sql/Opening tables	8
 user4	stage/sql/starting	8
 execute dump_stages_host;
 host	event_name	count_star
 localhost	stage/sql/checking permissions	16
-localhost	stage/sql/closing tables	45
+localhost	stage/sql/closing tables	49
 localhost	stage/sql/init	12
-localhost	stage/sql/Opening tables	29
+localhost	stage/sql/Opening tables	33
 localhost	stage/sql/starting	32
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	transaction	3
-user3	transaction	3
-user4	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
+user4	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
-localhost	transaction	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	12
+user1	stage/sql/closing tables	13
 user1	stage/sql/init	3
-user1	stage/sql/Opening tables	8
+user1	stage/sql/Opening tables	9
 user1	stage/sql/starting	8
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	11
+user2	stage/sql/closing tables	12
 user2	stage/sql/init	3
-user2	stage/sql/Opening tables	7
+user2	stage/sql/Opening tables	8
 user2	stage/sql/starting	8
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	11
+user3	stage/sql/closing tables	12
 user3	stage/sql/init	3
-user3	stage/sql/Opening tables	7
+user3	stage/sql/Opening tables	8
 user3	stage/sql/starting	8
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	11
+user4	stage/sql/closing tables	12
 user4	stage/sql/init	3
-user4	stage/sql/Opening tables	7
+user4	stage/sql/Opening tables	8
 user4	stage/sql/starting	8
 execute dump_stages_host;
 host	event_name	count_star
 localhost	stage/sql/checking permissions	16
-localhost	stage/sql/closing tables	45
+localhost	stage/sql/closing tables	49
 localhost	stage/sql/init	12
-localhost	stage/sql/Opening tables	29
+localhost	stage/sql/Opening tables	33
 localhost	stage/sql/starting	32
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	transaction	3
-user3	transaction	3
-user4	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
+user4	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
-localhost	transaction	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	12
+user1	stage/sql/closing tables	13
 user1	stage/sql/init	3
-user1	stage/sql/Opening tables	8
+user1	stage/sql/Opening tables	9
 user1	stage/sql/starting	8
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	11
+user2	stage/sql/closing tables	12
 user2	stage/sql/init	3
-user2	stage/sql/Opening tables	7
+user2	stage/sql/Opening tables	8
 user2	stage/sql/starting	8
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	11
+user3	stage/sql/closing tables	12
 user3	stage/sql/init	3
-user3	stage/sql/Opening tables	7
+user3	stage/sql/Opening tables	8
 user3	stage/sql/starting	8
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	11
+user4	stage/sql/closing tables	12
 user4	stage/sql/init	3
-user4	stage/sql/Opening tables	7
+user4	stage/sql/Opening tables	8
 user4	stage/sql/starting	8
 execute dump_stages_host;
 host	event_name	count_star
 localhost	stage/sql/checking permissions	16
-localhost	stage/sql/closing tables	45
+localhost	stage/sql/closing tables	49
 localhost	stage/sql/init	12
-localhost	stage/sql/Opening tables	29
+localhost	stage/sql/Opening tables	33
 localhost	stage/sql/starting	32
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	transaction	3
-user3	transaction	3
-user4	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
+user4	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
-localhost	transaction	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	12
+user1	stage/sql/closing tables	13
 user1	stage/sql/init	3
-user1	stage/sql/Opening tables	8
+user1	stage/sql/Opening tables	9
 user1	stage/sql/starting	8
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	11
+user2	stage/sql/closing tables	12
 user2	stage/sql/init	3
-user2	stage/sql/Opening tables	7
+user2	stage/sql/Opening tables	8
 user2	stage/sql/starting	8
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	11
+user3	stage/sql/closing tables	12
 user3	stage/sql/init	3
-user3	stage/sql/Opening tables	7
+user3	stage/sql/Opening tables	8
 user3	stage/sql/starting	8
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	11
+user4	stage/sql/closing tables	12
 user4	stage/sql/init	3
-user4	stage/sql/Opening tables	7
+user4	stage/sql/Opening tables	8
 user4	stage/sql/starting	8
 execute dump_stages_host;
 host	event_name	count_star
 localhost	stage/sql/checking permissions	16
-localhost	stage/sql/closing tables	45
+localhost	stage/sql/closing tables	49
 localhost	stage/sql/init	12
-localhost	stage/sql/Opening tables	29
+localhost	stage/sql/Opening tables	33
 localhost	stage/sql/starting	32
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	transaction	3
-user3	transaction	3
-user4	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
+user4	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
-localhost	transaction	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	12
+user1	stage/sql/closing tables	13
 user1	stage/sql/init	3
-user1	stage/sql/Opening tables	8
+user1	stage/sql/Opening tables	9
 user1	stage/sql/starting	8
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	11
+user2	stage/sql/closing tables	12
 user2	stage/sql/init	3
-user2	stage/sql/Opening tables	7
+user2	stage/sql/Opening tables	8
 user2	stage/sql/starting	8
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	11
+user3	stage/sql/closing tables	12
 user3	stage/sql/init	3
-user3	stage/sql/Opening tables	7
+user3	stage/sql/Opening tables	8
 user3	stage/sql/starting	8
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	11
+user4	stage/sql/closing tables	12
 user4	stage/sql/init	3
-user4	stage/sql/Opening tables	7
+user4	stage/sql/Opening tables	8
 user4	stage/sql/starting	8
 execute dump_stages_host;
 host	event_name	count_star
 localhost	stage/sql/checking permissions	16
-localhost	stage/sql/closing tables	45
+localhost	stage/sql/closing tables	49
 localhost	stage/sql/init	12
-localhost	stage/sql/Opening tables	29
+localhost	stage/sql/Opening tables	33
 localhost	stage/sql/starting	32
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	transaction	3
-user3	transaction	3
-user4	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
+user4	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
-localhost	transaction	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+localhost	stage/sql/closing tables	49
 localhost	stage/sql/init	12
-localhost	stage/sql/Opening tables	29
+localhost	stage/sql/Opening tables	33
 localhost	stage/sql/starting	32
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	transaction	3
-user3	transaction	3
-user4	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
+user4	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
-localhost	transaction	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	transaction	3
-user3	transaction	3
-user4	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
+user4	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
-localhost	transaction	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	transaction	3
-user3	transaction	3
-user4	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
+user4	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
-localhost	transaction	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	transaction	3
-user3	transaction	3
-user4	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
+user4	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
-localhost	transaction	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	transaction	3
-user3	transaction	3
-user4	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
+user4	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
-localhost	transaction	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	transaction	3
-user3	transaction	3
-user4	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
+user4	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
-localhost	transaction	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	transaction	3
-user3	transaction	3
-user4	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
+user4	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
-localhost	transaction	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	transaction	3
-user3	transaction	3
-user4	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
+user4	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
-localhost	transaction	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	transaction	3
-user3	transaction	3
-user4	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
+user4	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
-localhost	transaction	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	transaction	3
-user3	transaction	3
-user4	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
+user4	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
-localhost	transaction	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	12
+transaction	16
 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 a4510e1169475..a0251d1d5042d 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	12
+user1	stage/sql/closing tables	13
 user1	stage/sql/init	3
-user1	stage/sql/Opening tables	8
+user1	stage/sql/Opening tables	9
 user1	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	4
-stage/sql/closing tables	12
+stage/sql/closing tables	13
 stage/sql/init	3
-stage/sql/Opening tables	8
+stage/sql/Opening tables	9
 stage/sql/starting	7
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	4
-stage/sql/closing tables	12
+stage/sql/closing tables	13
 stage/sql/init	3
-stage/sql/Opening tables	8
+stage/sql/Opening tables	9
 stage/sql/starting	7
 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	3
+user1	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
 execute dump_transactions_global;
 event_name	count_star
-transaction	3
+transaction	4
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	3
+transaction	4
 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	12
+user1	stage/sql/closing tables	13
 user1	stage/sql/init	3
-user1	stage/sql/Opening tables	8
+user1	stage/sql/Opening tables	9
 user1	stage/sql/starting	7
 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	12
+stage/sql/closing tables	13
 stage/sql/init	3
-stage/sql/Opening tables	8
+stage/sql/Opening tables	9
 stage/sql/starting	7
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	4
-stage/sql/closing tables	12
+stage/sql/closing tables	13
 stage/sql/init	3
-stage/sql/Opening tables	8
+stage/sql/Opening tables	9
 stage/sql/starting	7
 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	3
+user1	transaction	4
 user2	transaction	0
 execute dump_transactions_host;
 host	event_name	count_star
 execute dump_transactions_global;
 event_name	count_star
-transaction	3
+transaction	4
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	3
+transaction	4
 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	12
+user1	stage/sql/closing tables	13
 user1	stage/sql/init	3
-user1	stage/sql/Opening tables	8
+user1	stage/sql/Opening tables	9
 user1	stage/sql/starting	7
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	11
+user2	stage/sql/closing tables	12
 user2	stage/sql/init	3
-user2	stage/sql/Opening tables	7
+user2	stage/sql/Opening tables	8
 user2	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	8
-stage/sql/closing tables	23
+stage/sql/closing tables	25
 stage/sql/init	6
-stage/sql/Opening tables	15
+stage/sql/Opening tables	17
 stage/sql/starting	14
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	8
-stage/sql/closing tables	23
+stage/sql/closing tables	25
 stage/sql/init	6
-stage/sql/Opening tables	15
+stage/sql/Opening tables	17
 stage/sql/starting	14
 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	3
-user2	transaction	3
+user1	transaction	4
+user2	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
 execute dump_transactions_global;
 event_name	count_star
-transaction	6
+transaction	8
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	6
+transaction	8
 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	12
+user1	stage/sql/closing tables	13
 user1	stage/sql/init	3
-user1	stage/sql/Opening tables	8
+user1	stage/sql/Opening tables	9
 user1	stage/sql/starting	7
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	11
+user2	stage/sql/closing tables	12
 user2	stage/sql/init	3
-user2	stage/sql/Opening tables	7
+user2	stage/sql/Opening tables	8
 user2	stage/sql/starting	7
 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	23
+stage/sql/closing tables	25
 stage/sql/init	6
-stage/sql/Opening tables	15
+stage/sql/Opening tables	17
 stage/sql/starting	14
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	8
-stage/sql/closing tables	23
+stage/sql/closing tables	25
 stage/sql/init	6
-stage/sql/Opening tables	15
+stage/sql/Opening tables	17
 stage/sql/starting	14
 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	3
-user2	transaction	3
+user1	transaction	4
+user2	transaction	4
 user3	transaction	0
 execute dump_transactions_host;
 host	event_name	count_star
 execute dump_transactions_global;
 event_name	count_star
-transaction	6
+transaction	8
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	6
+transaction	8
 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	12
+user1	stage/sql/closing tables	13
 user1	stage/sql/init	3
-user1	stage/sql/Opening tables	8
+user1	stage/sql/Opening tables	9
 user1	stage/sql/starting	7
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	11
+user2	stage/sql/closing tables	12
 user2	stage/sql/init	3
-user2	stage/sql/Opening tables	7
+user2	stage/sql/Opening tables	8
 user2	stage/sql/starting	7
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	11
+user3	stage/sql/closing tables	12
 user3	stage/sql/init	3
-user3	stage/sql/Opening tables	7
+user3	stage/sql/Opening tables	8
 user3	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	12
-stage/sql/closing tables	34
+stage/sql/closing tables	37
 stage/sql/init	9
-stage/sql/Opening tables	22
+stage/sql/Opening tables	25
 stage/sql/starting	21
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	12
-stage/sql/closing tables	34
+stage/sql/closing tables	37
 stage/sql/init	9
-stage/sql/Opening tables	22
+stage/sql/Opening tables	25
 stage/sql/starting	21
 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	3
-user2	transaction	3
-user3	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
 execute dump_transactions_global;
 event_name	count_star
-transaction	9
+transaction	12
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	9
+transaction	12
 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	12
+user1	stage/sql/closing tables	13
 user1	stage/sql/init	3
-user1	stage/sql/Opening tables	8
+user1	stage/sql/Opening tables	9
 user1	stage/sql/starting	7
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	11
+user2	stage/sql/closing tables	12
 user2	stage/sql/init	3
-user2	stage/sql/Opening tables	7
+user2	stage/sql/Opening tables	8
 user2	stage/sql/starting	7
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	11
+user3	stage/sql/closing tables	12
 user3	stage/sql/init	3
-user3	stage/sql/Opening tables	7
+user3	stage/sql/Opening tables	8
 user3	stage/sql/starting	7
 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	34
+stage/sql/closing tables	37
 stage/sql/init	9
-stage/sql/Opening tables	22
+stage/sql/Opening tables	25
 stage/sql/starting	21
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	12
-stage/sql/closing tables	34
+stage/sql/closing tables	37
 stage/sql/init	9
-stage/sql/Opening tables	22
+stage/sql/Opening tables	25
 stage/sql/starting	21
 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	3
-user2	transaction	3
-user3	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
 user4	transaction	0
 execute dump_transactions_host;
 host	event_name	count_star
 execute dump_transactions_global;
 event_name	count_star
-transaction	9
+transaction	12
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	9
+transaction	12
 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	12
+user1	stage/sql/closing tables	13
 user1	stage/sql/init	3
-user1	stage/sql/Opening tables	8
+user1	stage/sql/Opening tables	9
 user1	stage/sql/starting	7
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	11
+user2	stage/sql/closing tables	12
 user2	stage/sql/init	3
-user2	stage/sql/Opening tables	7
+user2	stage/sql/Opening tables	8
 user2	stage/sql/starting	7
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	11
+user3	stage/sql/closing tables	12
 user3	stage/sql/init	3
-user3	stage/sql/Opening tables	7
+user3	stage/sql/Opening tables	8
 user3	stage/sql/starting	7
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	11
+user4	stage/sql/closing tables	12
 user4	stage/sql/init	3
-user4	stage/sql/Opening tables	7
+user4	stage/sql/Opening tables	8
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	28
 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	3
-user2	transaction	3
-user3	transaction	3
-user4	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
+user4	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	12
+user1	stage/sql/closing tables	13
 user1	stage/sql/init	3
-user1	stage/sql/Opening tables	8
+user1	stage/sql/Opening tables	9
 user1	stage/sql/starting	8
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	11
+user2	stage/sql/closing tables	12
 user2	stage/sql/init	3
-user2	stage/sql/Opening tables	7
+user2	stage/sql/Opening tables	8
 user2	stage/sql/starting	7
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	11
+user3	stage/sql/closing tables	12
 user3	stage/sql/init	3
-user3	stage/sql/Opening tables	7
+user3	stage/sql/Opening tables	8
 user3	stage/sql/starting	7
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	11
+user4	stage/sql/closing tables	12
 user4	stage/sql/init	3
-user4	stage/sql/Opening tables	7
+user4	stage/sql/Opening tables	8
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	29
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	29
 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	3
-user2	transaction	3
-user3	transaction	3
-user4	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
+user4	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	12
+user1	stage/sql/closing tables	13
 user1	stage/sql/init	3
-user1	stage/sql/Opening tables	8
+user1	stage/sql/Opening tables	9
 user1	stage/sql/starting	8
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	11
+user2	stage/sql/closing tables	12
 user2	stage/sql/init	3
-user2	stage/sql/Opening tables	7
+user2	stage/sql/Opening tables	8
 user2	stage/sql/starting	8
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	11
+user3	stage/sql/closing tables	12
 user3	stage/sql/init	3
-user3	stage/sql/Opening tables	7
+user3	stage/sql/Opening tables	8
 user3	stage/sql/starting	7
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	11
+user4	stage/sql/closing tables	12
 user4	stage/sql/init	3
-user4	stage/sql/Opening tables	7
+user4	stage/sql/Opening tables	8
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	30
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	30
 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	3
-user2	transaction	3
-user3	transaction	3
-user4	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
+user4	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	12
+user1	stage/sql/closing tables	13
 user1	stage/sql/init	3
-user1	stage/sql/Opening tables	8
+user1	stage/sql/Opening tables	9
 user1	stage/sql/starting	8
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	11
+user2	stage/sql/closing tables	12
 user2	stage/sql/init	3
-user2	stage/sql/Opening tables	7
+user2	stage/sql/Opening tables	8
 user2	stage/sql/starting	8
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	11
+user3	stage/sql/closing tables	12
 user3	stage/sql/init	3
-user3	stage/sql/Opening tables	7
+user3	stage/sql/Opening tables	8
 user3	stage/sql/starting	8
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	11
+user4	stage/sql/closing tables	12
 user4	stage/sql/init	3
-user4	stage/sql/Opening tables	7
+user4	stage/sql/Opening tables	8
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	31
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	31
 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	3
-user2	transaction	3
-user3	transaction	3
-user4	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
+user4	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	12
+user1	stage/sql/closing tables	13
 user1	stage/sql/init	3
-user1	stage/sql/Opening tables	8
+user1	stage/sql/Opening tables	9
 user1	stage/sql/starting	8
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	11
+user2	stage/sql/closing tables	12
 user2	stage/sql/init	3
-user2	stage/sql/Opening tables	7
+user2	stage/sql/Opening tables	8
 user2	stage/sql/starting	8
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	11
+user3	stage/sql/closing tables	12
 user3	stage/sql/init	3
-user3	stage/sql/Opening tables	7
+user3	stage/sql/Opening tables	8
 user3	stage/sql/starting	8
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	11
+user4	stage/sql/closing tables	12
 user4	stage/sql/init	3
-user4	stage/sql/Opening tables	7
+user4	stage/sql/Opening tables	8
 user4	stage/sql/starting	8
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	transaction	3
-user3	transaction	3
-user4	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
+user4	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	12
+user1	stage/sql/closing tables	13
 user1	stage/sql/init	3
-user1	stage/sql/Opening tables	8
+user1	stage/sql/Opening tables	9
 user1	stage/sql/starting	8
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	11
+user2	stage/sql/closing tables	12
 user2	stage/sql/init	3
-user2	stage/sql/Opening tables	7
+user2	stage/sql/Opening tables	8
 user2	stage/sql/starting	8
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	11
+user3	stage/sql/closing tables	12
 user3	stage/sql/init	3
-user3	stage/sql/Opening tables	7
+user3	stage/sql/Opening tables	8
 user3	stage/sql/starting	8
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	11
+user4	stage/sql/closing tables	12
 user4	stage/sql/init	3
-user4	stage/sql/Opening tables	7
+user4	stage/sql/Opening tables	8
 user4	stage/sql/starting	8
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	transaction	3
-user3	transaction	3
-user4	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
+user4	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	12
+user1	stage/sql/closing tables	13
 user1	stage/sql/init	3
-user1	stage/sql/Opening tables	8
+user1	stage/sql/Opening tables	9
 user1	stage/sql/starting	8
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	11
+user2	stage/sql/closing tables	12
 user2	stage/sql/init	3
-user2	stage/sql/Opening tables	7
+user2	stage/sql/Opening tables	8
 user2	stage/sql/starting	8
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	11
+user3	stage/sql/closing tables	12
 user3	stage/sql/init	3
-user3	stage/sql/Opening tables	7
+user3	stage/sql/Opening tables	8
 user3	stage/sql/starting	8
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	11
+user4	stage/sql/closing tables	12
 user4	stage/sql/init	3
-user4	stage/sql/Opening tables	7
+user4	stage/sql/Opening tables	8
 user4	stage/sql/starting	8
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	transaction	3
-user3	transaction	3
-user4	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
+user4	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	12
+user1	stage/sql/closing tables	13
 user1	stage/sql/init	3
-user1	stage/sql/Opening tables	8
+user1	stage/sql/Opening tables	9
 user1	stage/sql/starting	8
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	11
+user2	stage/sql/closing tables	12
 user2	stage/sql/init	3
-user2	stage/sql/Opening tables	7
+user2	stage/sql/Opening tables	8
 user2	stage/sql/starting	8
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	11
+user3	stage/sql/closing tables	12
 user3	stage/sql/init	3
-user3	stage/sql/Opening tables	7
+user3	stage/sql/Opening tables	8
 user3	stage/sql/starting	8
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	11
+user4	stage/sql/closing tables	12
 user4	stage/sql/init	3
-user4	stage/sql/Opening tables	7
+user4	stage/sql/Opening tables	8
 user4	stage/sql/starting	8
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	transaction	3
-user3	transaction	3
-user4	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
+user4	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	12
+user1	stage/sql/closing tables	13
 user1	stage/sql/init	3
-user1	stage/sql/Opening tables	8
+user1	stage/sql/Opening tables	9
 user1	stage/sql/starting	8
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	11
+user2	stage/sql/closing tables	12
 user2	stage/sql/init	3
-user2	stage/sql/Opening tables	7
+user2	stage/sql/Opening tables	8
 user2	stage/sql/starting	8
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	11
+user3	stage/sql/closing tables	12
 user3	stage/sql/init	3
-user3	stage/sql/Opening tables	7
+user3	stage/sql/Opening tables	8
 user3	stage/sql/starting	8
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	11
+user4	stage/sql/closing tables	12
 user4	stage/sql/init	3
-user4	stage/sql/Opening tables	7
+user4	stage/sql/Opening tables	8
 user4	stage/sql/starting	8
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	transaction	3
-user3	transaction	3
-user4	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
+user4	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	12
+user1	stage/sql/closing tables	13
 user1	stage/sql/init	3
-user1	stage/sql/Opening tables	8
+user1	stage/sql/Opening tables	9
 user1	stage/sql/starting	8
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	11
+user2	stage/sql/closing tables	12
 user2	stage/sql/init	3
-user2	stage/sql/Opening tables	7
+user2	stage/sql/Opening tables	8
 user2	stage/sql/starting	8
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	11
+user3	stage/sql/closing tables	12
 user3	stage/sql/init	3
-user3	stage/sql/Opening tables	7
+user3	stage/sql/Opening tables	8
 user3	stage/sql/starting	8
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	11
+user4	stage/sql/closing tables	12
 user4	stage/sql/init	3
-user4	stage/sql/Opening tables	7
+user4	stage/sql/Opening tables	8
 user4	stage/sql/starting	8
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	transaction	3
-user3	transaction	3
-user4	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
+user4	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	12
+user1	stage/sql/closing tables	13
 user1	stage/sql/init	3
-user1	stage/sql/Opening tables	8
+user1	stage/sql/Opening tables	9
 user1	stage/sql/starting	8
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	11
+user2	stage/sql/closing tables	12
 user2	stage/sql/init	3
-user2	stage/sql/Opening tables	7
+user2	stage/sql/Opening tables	8
 user2	stage/sql/starting	8
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	11
+user3	stage/sql/closing tables	12
 user3	stage/sql/init	3
-user3	stage/sql/Opening tables	7
+user3	stage/sql/Opening tables	8
 user3	stage/sql/starting	8
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	11
+user4	stage/sql/closing tables	12
 user4	stage/sql/init	3
-user4	stage/sql/Opening tables	7
+user4	stage/sql/Opening tables	8
 user4	stage/sql/starting	8
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	transaction	3
-user3	transaction	3
-user4	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
+user4	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	12
+user1	stage/sql/closing tables	13
 user1	stage/sql/init	3
-user1	stage/sql/Opening tables	8
+user1	stage/sql/Opening tables	9
 user1	stage/sql/starting	8
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	11
+user2	stage/sql/closing tables	12
 user2	stage/sql/init	3
-user2	stage/sql/Opening tables	7
+user2	stage/sql/Opening tables	8
 user2	stage/sql/starting	8
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	11
+user3	stage/sql/closing tables	12
 user3	stage/sql/init	3
-user3	stage/sql/Opening tables	7
+user3	stage/sql/Opening tables	8
 user3	stage/sql/starting	8
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	11
+user4	stage/sql/closing tables	12
 user4	stage/sql/init	3
-user4	stage/sql/Opening tables	7
+user4	stage/sql/Opening tables	8
 user4	stage/sql/starting	8
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	transaction	3
-user3	transaction	3
-user4	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
+user4	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	transaction	3
-user3	transaction	3
-user4	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
+user4	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	transaction	3
-user3	transaction	3
-user4	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
+user4	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	transaction	3
-user3	transaction	3
-user4	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
+user4	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	transaction	3
-user3	transaction	3
-user4	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
+user4	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	transaction	3
-user3	transaction	3
-user4	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
+user4	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	transaction	3
-user3	transaction	3
-user4	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
+user4	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	transaction	3
-user3	transaction	3
-user4	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
+user4	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	transaction	3
-user3	transaction	3
-user4	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
+user4	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	transaction	3
-user3	transaction	3
-user4	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
+user4	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	transaction	3
-user3	transaction	3
-user4	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
+user4	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	12
+transaction	16
 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 0623f5b9459fc..59826123f6a59 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	12
+localhost	stage/sql/closing tables	13
 localhost	stage/sql/init	3
-localhost	stage/sql/Opening tables	8
+localhost	stage/sql/Opening tables	9
 localhost	stage/sql/starting	7
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	4
-stage/sql/closing tables	12
+stage/sql/closing tables	13
 stage/sql/init	3
-stage/sql/Opening tables	8
+stage/sql/Opening tables	9
 stage/sql/starting	7
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	4
-stage/sql/closing tables	12
+stage/sql/closing tables	13
 stage/sql/init	3
-stage/sql/Opening tables	8
+stage/sql/Opening tables	9
 stage/sql/starting	7
 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	3
+localhost	transaction	4
 execute dump_transactions_global;
 event_name	count_star
-transaction	3
+transaction	4
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	3
+transaction	4
 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	12
+localhost	stage/sql/closing tables	13
 localhost	stage/sql/init	3
-localhost	stage/sql/Opening tables	8
+localhost	stage/sql/Opening tables	9
 localhost	stage/sql/starting	7
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	4
-stage/sql/closing tables	12
+stage/sql/closing tables	13
 stage/sql/init	3
-stage/sql/Opening tables	8
+stage/sql/Opening tables	9
 stage/sql/starting	7
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	4
-stage/sql/closing tables	12
+stage/sql/closing tables	13
 stage/sql/init	3
-stage/sql/Opening tables	8
+stage/sql/Opening tables	9
 stage/sql/starting	7
 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	3
+localhost	transaction	4
 execute dump_transactions_global;
 event_name	count_star
-transaction	3
+transaction	4
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	3
+transaction	4
 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	23
+localhost	stage/sql/closing tables	25
 localhost	stage/sql/init	6
-localhost	stage/sql/Opening tables	15
+localhost	stage/sql/Opening tables	17
 localhost	stage/sql/starting	14
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	8
-stage/sql/closing tables	23
+stage/sql/closing tables	25
 stage/sql/init	6
-stage/sql/Opening tables	15
+stage/sql/Opening tables	17
 stage/sql/starting	14
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	8
-stage/sql/closing tables	23
+stage/sql/closing tables	25
 stage/sql/init	6
-stage/sql/Opening tables	15
+stage/sql/Opening tables	17
 stage/sql/starting	14
 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	6
+localhost	transaction	8
 execute dump_transactions_global;
 event_name	count_star
-transaction	6
+transaction	8
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	6
+transaction	8
 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	23
+localhost	stage/sql/closing tables	25
 localhost	stage/sql/init	6
-localhost	stage/sql/Opening tables	15
+localhost	stage/sql/Opening tables	17
 localhost	stage/sql/starting	14
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	8
-stage/sql/closing tables	23
+stage/sql/closing tables	25
 stage/sql/init	6
-stage/sql/Opening tables	15
+stage/sql/Opening tables	17
 stage/sql/starting	14
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	8
-stage/sql/closing tables	23
+stage/sql/closing tables	25
 stage/sql/init	6
-stage/sql/Opening tables	15
+stage/sql/Opening tables	17
 stage/sql/starting	14
 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	6
+localhost	transaction	8
 execute dump_transactions_global;
 event_name	count_star
-transaction	6
+transaction	8
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	6
+transaction	8
 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	34
+localhost	stage/sql/closing tables	37
 localhost	stage/sql/init	9
-localhost	stage/sql/Opening tables	22
+localhost	stage/sql/Opening tables	25
 localhost	stage/sql/starting	21
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	12
-stage/sql/closing tables	34
+stage/sql/closing tables	37
 stage/sql/init	9
-stage/sql/Opening tables	22
+stage/sql/Opening tables	25
 stage/sql/starting	21
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	12
-stage/sql/closing tables	34
+stage/sql/closing tables	37
 stage/sql/init	9
-stage/sql/Opening tables	22
+stage/sql/Opening tables	25
 stage/sql/starting	21
 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	9
+localhost	transaction	12
 execute dump_transactions_global;
 event_name	count_star
-transaction	9
+transaction	12
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	9
+transaction	12
 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	34
+localhost	stage/sql/closing tables	37
 localhost	stage/sql/init	9
-localhost	stage/sql/Opening tables	22
+localhost	stage/sql/Opening tables	25
 localhost	stage/sql/starting	21
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	12
-stage/sql/closing tables	34
+stage/sql/closing tables	37
 stage/sql/init	9
-stage/sql/Opening tables	22
+stage/sql/Opening tables	25
 stage/sql/starting	21
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	12
-stage/sql/closing tables	34
+stage/sql/closing tables	37
 stage/sql/init	9
-stage/sql/Opening tables	22
+stage/sql/Opening tables	25
 stage/sql/starting	21
 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	9
+localhost	transaction	12
 execute dump_transactions_global;
 event_name	count_star
-transaction	9
+transaction	12
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	9
+transaction	12
 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	45
+localhost	stage/sql/closing tables	49
 localhost	stage/sql/init	12
-localhost	stage/sql/Opening tables	29
+localhost	stage/sql/Opening tables	33
 localhost	stage/sql/starting	28
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	28
 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	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+localhost	stage/sql/closing tables	49
 localhost	stage/sql/init	12
-localhost	stage/sql/Opening tables	29
+localhost	stage/sql/Opening tables	33
 localhost	stage/sql/starting	29
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	29
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	29
 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	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+localhost	stage/sql/closing tables	49
 localhost	stage/sql/init	12
-localhost	stage/sql/Opening tables	29
+localhost	stage/sql/Opening tables	33
 localhost	stage/sql/starting	30
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	30
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	30
 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	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+localhost	stage/sql/closing tables	49
 localhost	stage/sql/init	12
-localhost	stage/sql/Opening tables	29
+localhost	stage/sql/Opening tables	33
 localhost	stage/sql/starting	31
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	31
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	31
 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	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+localhost	stage/sql/closing tables	49
 localhost	stage/sql/init	12
-localhost	stage/sql/Opening tables	29
+localhost	stage/sql/Opening tables	33
 localhost	stage/sql/starting	32
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+localhost	stage/sql/closing tables	49
 localhost	stage/sql/init	12
-localhost	stage/sql/Opening tables	29
+localhost	stage/sql/Opening tables	33
 localhost	stage/sql/starting	32
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+localhost	stage/sql/closing tables	49
 localhost	stage/sql/init	12
-localhost	stage/sql/Opening tables	29
+localhost	stage/sql/Opening tables	33
 localhost	stage/sql/starting	32
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+localhost	stage/sql/closing tables	49
 localhost	stage/sql/init	12
-localhost	stage/sql/Opening tables	29
+localhost	stage/sql/Opening tables	33
 localhost	stage/sql/starting	32
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+localhost	stage/sql/closing tables	49
 localhost	stage/sql/init	12
-localhost	stage/sql/Opening tables	29
+localhost	stage/sql/Opening tables	33
 localhost	stage/sql/starting	32
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+localhost	stage/sql/closing tables	49
 localhost	stage/sql/init	12
-localhost	stage/sql/Opening tables	29
+localhost	stage/sql/Opening tables	33
 localhost	stage/sql/starting	32
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+localhost	stage/sql/closing tables	49
 localhost	stage/sql/init	12
-localhost	stage/sql/Opening tables	29
+localhost	stage/sql/Opening tables	33
 localhost	stage/sql/starting	32
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+localhost	stage/sql/closing tables	49
 localhost	stage/sql/init	12
-localhost	stage/sql/Opening tables	29
+localhost	stage/sql/Opening tables	33
 localhost	stage/sql/starting	32
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+localhost	stage/sql/closing tables	49
 localhost	stage/sql/init	12
-localhost	stage/sql/Opening tables	29
+localhost	stage/sql/Opening tables	33
 localhost	stage/sql/starting	32
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	12
+transaction	16
 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 d4161510a57de..facd760bddf8e 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	12
+stage/sql/closing tables	13
 stage/sql/init	3
-stage/sql/Opening tables	8
+stage/sql/Opening tables	9
 stage/sql/starting	7
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	4
-stage/sql/closing tables	12
+stage/sql/closing tables	13
 stage/sql/init	3
-stage/sql/Opening tables	8
+stage/sql/Opening tables	9
 stage/sql/starting	7
 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	3
+transaction	4
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	3
+transaction	4
 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	12
+stage/sql/closing tables	13
 stage/sql/init	3
-stage/sql/Opening tables	8
+stage/sql/Opening tables	9
 stage/sql/starting	7
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	4
-stage/sql/closing tables	12
+stage/sql/closing tables	13
 stage/sql/init	3
-stage/sql/Opening tables	8
+stage/sql/Opening tables	9
 stage/sql/starting	7
 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	3
+transaction	4
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	3
+transaction	4
 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	23
+stage/sql/closing tables	25
 stage/sql/init	6
-stage/sql/Opening tables	15
+stage/sql/Opening tables	17
 stage/sql/starting	14
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	8
-stage/sql/closing tables	23
+stage/sql/closing tables	25
 stage/sql/init	6
-stage/sql/Opening tables	15
+stage/sql/Opening tables	17
 stage/sql/starting	14
 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	6
+transaction	8
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	6
+transaction	8
 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	23
+stage/sql/closing tables	25
 stage/sql/init	6
-stage/sql/Opening tables	15
+stage/sql/Opening tables	17
 stage/sql/starting	14
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	8
-stage/sql/closing tables	23
+stage/sql/closing tables	25
 stage/sql/init	6
-stage/sql/Opening tables	15
+stage/sql/Opening tables	17
 stage/sql/starting	14
 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	6
+transaction	8
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	6
+transaction	8
 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	34
+stage/sql/closing tables	37
 stage/sql/init	9
-stage/sql/Opening tables	22
+stage/sql/Opening tables	25
 stage/sql/starting	21
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	12
-stage/sql/closing tables	34
+stage/sql/closing tables	37
 stage/sql/init	9
-stage/sql/Opening tables	22
+stage/sql/Opening tables	25
 stage/sql/starting	21
 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	9
+transaction	12
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	9
+transaction	12
 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	34
+stage/sql/closing tables	37
 stage/sql/init	9
-stage/sql/Opening tables	22
+stage/sql/Opening tables	25
 stage/sql/starting	21
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	12
-stage/sql/closing tables	34
+stage/sql/closing tables	37
 stage/sql/init	9
-stage/sql/Opening tables	22
+stage/sql/Opening tables	25
 stage/sql/starting	21
 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	9
+transaction	12
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	9
+transaction	12
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	28
 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	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	29
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	29
 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	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	30
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	30
 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	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	31
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	31
 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	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	12
+transaction	16
 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 edd335e4f114f..a781c0038b899 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	12
+user1	localhost	stage/sql/closing tables	13
 user1	localhost	stage/sql/init	3
-user1	localhost	stage/sql/Opening tables	8
+user1	localhost	stage/sql/Opening tables	9
 user1	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	12
+user1	stage/sql/closing tables	13
 user1	stage/sql/init	3
-user1	stage/sql/Opening tables	8
+user1	stage/sql/Opening tables	9
 user1	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	4
-stage/sql/closing tables	12
+stage/sql/closing tables	13
 stage/sql/init	3
-stage/sql/Opening tables	8
+stage/sql/Opening tables	9
 stage/sql/starting	7
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	4
-stage/sql/closing tables	12
+stage/sql/closing tables	13
 stage/sql/init	3
-stage/sql/Opening tables	8
+stage/sql/Opening tables	9
 stage/sql/starting	7
 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	3
+user1	localhost	transaction	4
 execute dump_transactions_user;
 user	event_name	count_star
-user1	transaction	3
+user1	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
 execute dump_transactions_global;
 event_name	count_star
-transaction	3
+transaction	4
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	3
+transaction	4
 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	12
+user1	localhost	stage/sql/closing tables	13
 user1	localhost	stage/sql/init	3
-user1	localhost	stage/sql/Opening tables	8
+user1	localhost	stage/sql/Opening tables	9
 user1	localhost	stage/sql/starting	7
 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	12
+user1	stage/sql/closing tables	13
 user1	stage/sql/init	3
-user1	stage/sql/Opening tables	8
+user1	stage/sql/Opening tables	9
 user1	stage/sql/starting	7
 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	12
+stage/sql/closing tables	13
 stage/sql/init	3
-stage/sql/Opening tables	8
+stage/sql/Opening tables	9
 stage/sql/starting	7
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	4
-stage/sql/closing tables	12
+stage/sql/closing tables	13
 stage/sql/init	3
-stage/sql/Opening tables	8
+stage/sql/Opening tables	9
 stage/sql/starting	7
 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	3
+user1	localhost	transaction	4
 user2	localhost	transaction	0
 execute dump_transactions_user;
 user	event_name	count_star
-user1	transaction	3
+user1	transaction	4
 user2	transaction	0
 execute dump_transactions_host;
 host	event_name	count_star
 execute dump_transactions_global;
 event_name	count_star
-transaction	3
+transaction	4
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	3
+transaction	4
 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	12
+user1	localhost	stage/sql/closing tables	13
 user1	localhost	stage/sql/init	3
-user1	localhost	stage/sql/Opening tables	8
+user1	localhost	stage/sql/Opening tables	9
 user1	localhost	stage/sql/starting	7
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/closing tables	12
 user2	localhost	stage/sql/init	3
-user2	localhost	stage/sql/Opening tables	7
+user2	localhost	stage/sql/Opening tables	8
 user2	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	12
+user1	stage/sql/closing tables	13
 user1	stage/sql/init	3
-user1	stage/sql/Opening tables	8
+user1	stage/sql/Opening tables	9
 user1	stage/sql/starting	7
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	11
+user2	stage/sql/closing tables	12
 user2	stage/sql/init	3
-user2	stage/sql/Opening tables	7
+user2	stage/sql/Opening tables	8
 user2	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	8
-stage/sql/closing tables	23
+stage/sql/closing tables	25
 stage/sql/init	6
-stage/sql/Opening tables	15
+stage/sql/Opening tables	17
 stage/sql/starting	14
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	8
-stage/sql/closing tables	23
+stage/sql/closing tables	25
 stage/sql/init	6
-stage/sql/Opening tables	15
+stage/sql/Opening tables	17
 stage/sql/starting	14
 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	3
-user2	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
 execute dump_transactions_user;
 user	event_name	count_star
-user1	transaction	3
-user2	transaction	3
+user1	transaction	4
+user2	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
 execute dump_transactions_global;
 event_name	count_star
-transaction	6
+transaction	8
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	6
+transaction	8
 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	12
+user1	localhost	stage/sql/closing tables	13
 user1	localhost	stage/sql/init	3
-user1	localhost	stage/sql/Opening tables	8
+user1	localhost	stage/sql/Opening tables	9
 user1	localhost	stage/sql/starting	7
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/closing tables	12
 user2	localhost	stage/sql/init	3
-user2	localhost	stage/sql/Opening tables	7
+user2	localhost	stage/sql/Opening tables	8
 user2	localhost	stage/sql/starting	7
 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	12
+user1	stage/sql/closing tables	13
 user1	stage/sql/init	3
-user1	stage/sql/Opening tables	8
+user1	stage/sql/Opening tables	9
 user1	stage/sql/starting	7
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	11
+user2	stage/sql/closing tables	12
 user2	stage/sql/init	3
-user2	stage/sql/Opening tables	7
+user2	stage/sql/Opening tables	8
 user2	stage/sql/starting	7
 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	23
+stage/sql/closing tables	25
 stage/sql/init	6
-stage/sql/Opening tables	15
+stage/sql/Opening tables	17
 stage/sql/starting	14
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	8
-stage/sql/closing tables	23
+stage/sql/closing tables	25
 stage/sql/init	6
-stage/sql/Opening tables	15
+stage/sql/Opening tables	17
 stage/sql/starting	14
 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	3
-user2	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
 user3	localhost	transaction	0
 execute dump_transactions_user;
 user	event_name	count_star
-user1	transaction	3
-user2	transaction	3
+user1	transaction	4
+user2	transaction	4
 user3	transaction	0
 execute dump_transactions_host;
 host	event_name	count_star
 execute dump_transactions_global;
 event_name	count_star
-transaction	6
+transaction	8
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	6
+transaction	8
 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	12
+user1	localhost	stage/sql/closing tables	13
 user1	localhost	stage/sql/init	3
-user1	localhost	stage/sql/Opening tables	8
+user1	localhost	stage/sql/Opening tables	9
 user1	localhost	stage/sql/starting	7
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/closing tables	12
 user2	localhost	stage/sql/init	3
-user2	localhost	stage/sql/Opening tables	7
+user2	localhost	stage/sql/Opening tables	8
 user2	localhost	stage/sql/starting	7
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/closing tables	12
 user3	localhost	stage/sql/init	3
-user3	localhost	stage/sql/Opening tables	7
+user3	localhost	stage/sql/Opening tables	8
 user3	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	12
+user1	stage/sql/closing tables	13
 user1	stage/sql/init	3
-user1	stage/sql/Opening tables	8
+user1	stage/sql/Opening tables	9
 user1	stage/sql/starting	7
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	11
+user2	stage/sql/closing tables	12
 user2	stage/sql/init	3
-user2	stage/sql/Opening tables	7
+user2	stage/sql/Opening tables	8
 user2	stage/sql/starting	7
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	11
+user3	stage/sql/closing tables	12
 user3	stage/sql/init	3
-user3	stage/sql/Opening tables	7
+user3	stage/sql/Opening tables	8
 user3	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	12
-stage/sql/closing tables	34
+stage/sql/closing tables	37
 stage/sql/init	9
-stage/sql/Opening tables	22
+stage/sql/Opening tables	25
 stage/sql/starting	21
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	12
-stage/sql/closing tables	34
+stage/sql/closing tables	37
 stage/sql/init	9
-stage/sql/Opening tables	22
+stage/sql/Opening tables	25
 stage/sql/starting	21
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
 execute dump_transactions_user;
 user	event_name	count_star
-user1	transaction	3
-user2	transaction	3
-user3	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
 execute dump_transactions_global;
 event_name	count_star
-transaction	9
+transaction	12
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	9
+transaction	12
 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	12
+user1	localhost	stage/sql/closing tables	13
 user1	localhost	stage/sql/init	3
-user1	localhost	stage/sql/Opening tables	8
+user1	localhost	stage/sql/Opening tables	9
 user1	localhost	stage/sql/starting	7
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/closing tables	12
 user2	localhost	stage/sql/init	3
-user2	localhost	stage/sql/Opening tables	7
+user2	localhost	stage/sql/Opening tables	8
 user2	localhost	stage/sql/starting	7
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/closing tables	12
 user3	localhost	stage/sql/init	3
-user3	localhost	stage/sql/Opening tables	7
+user3	localhost	stage/sql/Opening tables	8
 user3	localhost	stage/sql/starting	7
 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	12
+user1	stage/sql/closing tables	13
 user1	stage/sql/init	3
-user1	stage/sql/Opening tables	8
+user1	stage/sql/Opening tables	9
 user1	stage/sql/starting	7
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	11
+user2	stage/sql/closing tables	12
 user2	stage/sql/init	3
-user2	stage/sql/Opening tables	7
+user2	stage/sql/Opening tables	8
 user2	stage/sql/starting	7
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	11
+user3	stage/sql/closing tables	12
 user3	stage/sql/init	3
-user3	stage/sql/Opening tables	7
+user3	stage/sql/Opening tables	8
 user3	stage/sql/starting	7
 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	34
+stage/sql/closing tables	37
 stage/sql/init	9
-stage/sql/Opening tables	22
+stage/sql/Opening tables	25
 stage/sql/starting	21
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	12
-stage/sql/closing tables	34
+stage/sql/closing tables	37
 stage/sql/init	9
-stage/sql/Opening tables	22
+stage/sql/Opening tables	25
 stage/sql/starting	21
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
 user4	localhost	transaction	0
 execute dump_transactions_user;
 user	event_name	count_star
-user1	transaction	3
-user2	transaction	3
-user3	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
 user4	transaction	0
 execute dump_transactions_host;
 host	event_name	count_star
 execute dump_transactions_global;
 event_name	count_star
-transaction	9
+transaction	12
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	9
+transaction	12
 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	12
+user1	localhost	stage/sql/closing tables	13
 user1	localhost	stage/sql/init	3
-user1	localhost	stage/sql/Opening tables	8
+user1	localhost	stage/sql/Opening tables	9
 user1	localhost	stage/sql/starting	7
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/closing tables	12
 user2	localhost	stage/sql/init	3
-user2	localhost	stage/sql/Opening tables	7
+user2	localhost	stage/sql/Opening tables	8
 user2	localhost	stage/sql/starting	7
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/closing tables	12
 user3	localhost	stage/sql/init	3
-user3	localhost	stage/sql/Opening tables	7
+user3	localhost	stage/sql/Opening tables	8
 user3	localhost	stage/sql/starting	7
 user4	localhost	stage/sql/checking permissions	4
-user4	localhost	stage/sql/closing tables	11
+user4	localhost	stage/sql/closing tables	12
 user4	localhost	stage/sql/init	3
-user4	localhost	stage/sql/Opening tables	7
+user4	localhost	stage/sql/Opening tables	8
 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	12
+user1	stage/sql/closing tables	13
 user1	stage/sql/init	3
-user1	stage/sql/Opening tables	8
+user1	stage/sql/Opening tables	9
 user1	stage/sql/starting	7
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	11
+user2	stage/sql/closing tables	12
 user2	stage/sql/init	3
-user2	stage/sql/Opening tables	7
+user2	stage/sql/Opening tables	8
 user2	stage/sql/starting	7
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	11
+user3	stage/sql/closing tables	12
 user3	stage/sql/init	3
-user3	stage/sql/Opening tables	7
+user3	stage/sql/Opening tables	8
 user3	stage/sql/starting	7
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	11
+user4	stage/sql/closing tables	12
 user4	stage/sql/init	3
-user4	stage/sql/Opening tables	7
+user4	stage/sql/Opening tables	8
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	28
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
-user4	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
+user4	localhost	transaction	4
 execute dump_transactions_user;
 user	event_name	count_star
-user1	transaction	3
-user2	transaction	3
-user3	transaction	3
-user4	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
+user4	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	12
+user1	localhost	stage/sql/closing tables	13
 user1	localhost	stage/sql/init	3
-user1	localhost	stage/sql/Opening tables	8
+user1	localhost	stage/sql/Opening tables	9
 user1	localhost	stage/sql/starting	8
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/closing tables	12
 user2	localhost	stage/sql/init	3
-user2	localhost	stage/sql/Opening tables	7
+user2	localhost	stage/sql/Opening tables	8
 user2	localhost	stage/sql/starting	7
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/closing tables	12
 user3	localhost	stage/sql/init	3
-user3	localhost	stage/sql/Opening tables	7
+user3	localhost	stage/sql/Opening tables	8
 user3	localhost	stage/sql/starting	7
 user4	localhost	stage/sql/checking permissions	4
-user4	localhost	stage/sql/closing tables	11
+user4	localhost	stage/sql/closing tables	12
 user4	localhost	stage/sql/init	3
-user4	localhost	stage/sql/Opening tables	7
+user4	localhost	stage/sql/Opening tables	8
 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	12
+user1	stage/sql/closing tables	13
 user1	stage/sql/init	3
-user1	stage/sql/Opening tables	8
+user1	stage/sql/Opening tables	9
 user1	stage/sql/starting	8
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	11
+user2	stage/sql/closing tables	12
 user2	stage/sql/init	3
-user2	stage/sql/Opening tables	7
+user2	stage/sql/Opening tables	8
 user2	stage/sql/starting	7
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	11
+user3	stage/sql/closing tables	12
 user3	stage/sql/init	3
-user3	stage/sql/Opening tables	7
+user3	stage/sql/Opening tables	8
 user3	stage/sql/starting	7
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	11
+user4	stage/sql/closing tables	12
 user4	stage/sql/init	3
-user4	stage/sql/Opening tables	7
+user4	stage/sql/Opening tables	8
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	29
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	29
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
-user4	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
+user4	localhost	transaction	4
 execute dump_transactions_user;
 user	event_name	count_star
-user1	transaction	3
-user2	transaction	3
-user3	transaction	3
-user4	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
+user4	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	12
+user1	localhost	stage/sql/closing tables	13
 user1	localhost	stage/sql/init	3
-user1	localhost	stage/sql/Opening tables	8
+user1	localhost	stage/sql/Opening tables	9
 user1	localhost	stage/sql/starting	8
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/closing tables	12
 user2	localhost	stage/sql/init	3
-user2	localhost	stage/sql/Opening tables	7
+user2	localhost	stage/sql/Opening tables	8
 user2	localhost	stage/sql/starting	8
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/closing tables	12
 user3	localhost	stage/sql/init	3
-user3	localhost	stage/sql/Opening tables	7
+user3	localhost	stage/sql/Opening tables	8
 user3	localhost	stage/sql/starting	7
 user4	localhost	stage/sql/checking permissions	4
-user4	localhost	stage/sql/closing tables	11
+user4	localhost	stage/sql/closing tables	12
 user4	localhost	stage/sql/init	3
-user4	localhost	stage/sql/Opening tables	7
+user4	localhost	stage/sql/Opening tables	8
 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	12
+user1	stage/sql/closing tables	13
 user1	stage/sql/init	3
-user1	stage/sql/Opening tables	8
+user1	stage/sql/Opening tables	9
 user1	stage/sql/starting	8
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	11
+user2	stage/sql/closing tables	12
 user2	stage/sql/init	3
-user2	stage/sql/Opening tables	7
+user2	stage/sql/Opening tables	8
 user2	stage/sql/starting	8
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	11
+user3	stage/sql/closing tables	12
 user3	stage/sql/init	3
-user3	stage/sql/Opening tables	7
+user3	stage/sql/Opening tables	8
 user3	stage/sql/starting	7
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	11
+user4	stage/sql/closing tables	12
 user4	stage/sql/init	3
-user4	stage/sql/Opening tables	7
+user4	stage/sql/Opening tables	8
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	30
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	30
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
-user4	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
+user4	localhost	transaction	4
 execute dump_transactions_user;
 user	event_name	count_star
-user1	transaction	3
-user2	transaction	3
-user3	transaction	3
-user4	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
+user4	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	12
+user1	localhost	stage/sql/closing tables	13
 user1	localhost	stage/sql/init	3
-user1	localhost	stage/sql/Opening tables	8
+user1	localhost	stage/sql/Opening tables	9
 user1	localhost	stage/sql/starting	8
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/closing tables	12
 user2	localhost	stage/sql/init	3
-user2	localhost	stage/sql/Opening tables	7
+user2	localhost	stage/sql/Opening tables	8
 user2	localhost	stage/sql/starting	8
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/closing tables	12
 user3	localhost	stage/sql/init	3
-user3	localhost	stage/sql/Opening tables	7
+user3	localhost	stage/sql/Opening tables	8
 user3	localhost	stage/sql/starting	8
 user4	localhost	stage/sql/checking permissions	4
-user4	localhost	stage/sql/closing tables	11
+user4	localhost	stage/sql/closing tables	12
 user4	localhost	stage/sql/init	3
-user4	localhost	stage/sql/Opening tables	7
+user4	localhost	stage/sql/Opening tables	8
 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	12
+user1	stage/sql/closing tables	13
 user1	stage/sql/init	3
-user1	stage/sql/Opening tables	8
+user1	stage/sql/Opening tables	9
 user1	stage/sql/starting	8
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	11
+user2	stage/sql/closing tables	12
 user2	stage/sql/init	3
-user2	stage/sql/Opening tables	7
+user2	stage/sql/Opening tables	8
 user2	stage/sql/starting	8
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	11
+user3	stage/sql/closing tables	12
 user3	stage/sql/init	3
-user3	stage/sql/Opening tables	7
+user3	stage/sql/Opening tables	8
 user3	stage/sql/starting	8
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	11
+user4	stage/sql/closing tables	12
 user4	stage/sql/init	3
-user4	stage/sql/Opening tables	7
+user4	stage/sql/Opening tables	8
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	31
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	31
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
-user4	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
+user4	localhost	transaction	4
 execute dump_transactions_user;
 user	event_name	count_star
-user1	transaction	3
-user2	transaction	3
-user3	transaction	3
-user4	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
+user4	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	12
+user1	localhost	stage/sql/closing tables	13
 user1	localhost	stage/sql/init	3
-user1	localhost	stage/sql/Opening tables	8
+user1	localhost	stage/sql/Opening tables	9
 user1	localhost	stage/sql/starting	8
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/closing tables	12
 user2	localhost	stage/sql/init	3
-user2	localhost	stage/sql/Opening tables	7
+user2	localhost	stage/sql/Opening tables	8
 user2	localhost	stage/sql/starting	8
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/closing tables	12
 user3	localhost	stage/sql/init	3
-user3	localhost	stage/sql/Opening tables	7
+user3	localhost	stage/sql/Opening tables	8
 user3	localhost	stage/sql/starting	8
 user4	localhost	stage/sql/checking permissions	4
-user4	localhost	stage/sql/closing tables	11
+user4	localhost	stage/sql/closing tables	12
 user4	localhost	stage/sql/init	3
-user4	localhost	stage/sql/Opening tables	7
+user4	localhost	stage/sql/Opening tables	8
 user4	localhost	stage/sql/starting	8
 execute dump_stages_user;
 user	event_name	count_star
 user1	stage/sql/checking permissions	4
-user1	stage/sql/closing tables	12
+user1	stage/sql/closing tables	13
 user1	stage/sql/init	3
-user1	stage/sql/Opening tables	8
+user1	stage/sql/Opening tables	9
 user1	stage/sql/starting	8
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	11
+user2	stage/sql/closing tables	12
 user2	stage/sql/init	3
-user2	stage/sql/Opening tables	7
+user2	stage/sql/Opening tables	8
 user2	stage/sql/starting	8
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	11
+user3	stage/sql/closing tables	12
 user3	stage/sql/init	3
-user3	stage/sql/Opening tables	7
+user3	stage/sql/Opening tables	8
 user3	stage/sql/starting	8
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	11
+user4	stage/sql/closing tables	12
 user4	stage/sql/init	3
-user4	stage/sql/Opening tables	7
+user4	stage/sql/Opening tables	8
 user4	stage/sql/starting	8
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
-user4	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
+user4	localhost	transaction	4
 execute dump_transactions_user;
 user	event_name	count_star
-user1	transaction	3
-user2	transaction	3
-user3	transaction	3
-user4	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
+user4	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	12
+user1	localhost	stage/sql/closing tables	13
 user1	localhost	stage/sql/init	3
-user1	localhost	stage/sql/Opening tables	8
+user1	localhost	stage/sql/Opening tables	9
 user1	localhost	stage/sql/starting	8
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/closing tables	12
 user2	localhost	stage/sql/init	3
-user2	localhost	stage/sql/Opening tables	7
+user2	localhost	stage/sql/Opening tables	8
 user2	localhost	stage/sql/starting	8
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/closing tables	12
 user3	localhost	stage/sql/init	3
-user3	localhost	stage/sql/Opening tables	7
+user3	localhost	stage/sql/Opening tables	8
 user3	localhost	stage/sql/starting	8
 user4	localhost	stage/sql/checking permissions	4
-user4	localhost	stage/sql/closing tables	11
+user4	localhost	stage/sql/closing tables	12
 user4	localhost	stage/sql/init	3
-user4	localhost	stage/sql/Opening tables	7
+user4	localhost	stage/sql/Opening tables	8
 user4	localhost	stage/sql/starting	8
 execute dump_stages_user;
 user	event_name	count_star
 user1	stage/sql/checking permissions	4
-user1	stage/sql/closing tables	12
+user1	stage/sql/closing tables	13
 user1	stage/sql/init	3
-user1	stage/sql/Opening tables	8
+user1	stage/sql/Opening tables	9
 user1	stage/sql/starting	8
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	11
+user2	stage/sql/closing tables	12
 user2	stage/sql/init	3
-user2	stage/sql/Opening tables	7
+user2	stage/sql/Opening tables	8
 user2	stage/sql/starting	8
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	11
+user3	stage/sql/closing tables	12
 user3	stage/sql/init	3
-user3	stage/sql/Opening tables	7
+user3	stage/sql/Opening tables	8
 user3	stage/sql/starting	8
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	11
+user4	stage/sql/closing tables	12
 user4	stage/sql/init	3
-user4	stage/sql/Opening tables	7
+user4	stage/sql/Opening tables	8
 user4	stage/sql/starting	8
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
-user4	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
+user4	localhost	transaction	4
 execute dump_transactions_user;
 user	event_name	count_star
-user1	transaction	3
-user2	transaction	3
-user3	transaction	3
-user4	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
+user4	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	12
+user1	localhost	stage/sql/closing tables	13
 user1	localhost	stage/sql/init	3
-user1	localhost	stage/sql/Opening tables	8
+user1	localhost	stage/sql/Opening tables	9
 user1	localhost	stage/sql/starting	8
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/closing tables	12
 user2	localhost	stage/sql/init	3
-user2	localhost	stage/sql/Opening tables	7
+user2	localhost	stage/sql/Opening tables	8
 user2	localhost	stage/sql/starting	8
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/closing tables	12
 user3	localhost	stage/sql/init	3
-user3	localhost	stage/sql/Opening tables	7
+user3	localhost	stage/sql/Opening tables	8
 user3	localhost	stage/sql/starting	8
 user4	localhost	stage/sql/checking permissions	4
-user4	localhost	stage/sql/closing tables	11
+user4	localhost	stage/sql/closing tables	12
 user4	localhost	stage/sql/init	3
-user4	localhost	stage/sql/Opening tables	7
+user4	localhost	stage/sql/Opening tables	8
 user4	localhost	stage/sql/starting	8
 execute dump_stages_user;
 user	event_name	count_star
 user1	stage/sql/checking permissions	4
-user1	stage/sql/closing tables	12
+user1	stage/sql/closing tables	13
 user1	stage/sql/init	3
-user1	stage/sql/Opening tables	8
+user1	stage/sql/Opening tables	9
 user1	stage/sql/starting	8
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	11
+user2	stage/sql/closing tables	12
 user2	stage/sql/init	3
-user2	stage/sql/Opening tables	7
+user2	stage/sql/Opening tables	8
 user2	stage/sql/starting	8
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	11
+user3	stage/sql/closing tables	12
 user3	stage/sql/init	3
-user3	stage/sql/Opening tables	7
+user3	stage/sql/Opening tables	8
 user3	stage/sql/starting	8
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	11
+user4	stage/sql/closing tables	12
 user4	stage/sql/init	3
-user4	stage/sql/Opening tables	7
+user4	stage/sql/Opening tables	8
 user4	stage/sql/starting	8
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
-user4	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
+user4	localhost	transaction	4
 execute dump_transactions_user;
 user	event_name	count_star
-user1	transaction	3
-user2	transaction	3
-user3	transaction	3
-user4	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
+user4	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	12
+user1	localhost	stage/sql/closing tables	13
 user1	localhost	stage/sql/init	3
-user1	localhost	stage/sql/Opening tables	8
+user1	localhost	stage/sql/Opening tables	9
 user1	localhost	stage/sql/starting	8
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/closing tables	12
 user2	localhost	stage/sql/init	3
-user2	localhost	stage/sql/Opening tables	7
+user2	localhost	stage/sql/Opening tables	8
 user2	localhost	stage/sql/starting	8
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/closing tables	12
 user3	localhost	stage/sql/init	3
-user3	localhost	stage/sql/Opening tables	7
+user3	localhost	stage/sql/Opening tables	8
 user3	localhost	stage/sql/starting	8
 user4	localhost	stage/sql/checking permissions	4
-user4	localhost	stage/sql/closing tables	11
+user4	localhost	stage/sql/closing tables	12
 user4	localhost	stage/sql/init	3
-user4	localhost	stage/sql/Opening tables	7
+user4	localhost	stage/sql/Opening tables	8
 user4	localhost	stage/sql/starting	8
 execute dump_stages_user;
 user	event_name	count_star
 user1	stage/sql/checking permissions	4
-user1	stage/sql/closing tables	12
+user1	stage/sql/closing tables	13
 user1	stage/sql/init	3
-user1	stage/sql/Opening tables	8
+user1	stage/sql/Opening tables	9
 user1	stage/sql/starting	8
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	11
+user2	stage/sql/closing tables	12
 user2	stage/sql/init	3
-user2	stage/sql/Opening tables	7
+user2	stage/sql/Opening tables	8
 user2	stage/sql/starting	8
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	11
+user3	stage/sql/closing tables	12
 user3	stage/sql/init	3
-user3	stage/sql/Opening tables	7
+user3	stage/sql/Opening tables	8
 user3	stage/sql/starting	8
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	11
+user4	stage/sql/closing tables	12
 user4	stage/sql/init	3
-user4	stage/sql/Opening tables	7
+user4	stage/sql/Opening tables	8
 user4	stage/sql/starting	8
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
-user4	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
+user4	localhost	transaction	4
 execute dump_transactions_user;
 user	event_name	count_star
-user1	transaction	3
-user2	transaction	3
-user3	transaction	3
-user4	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
+user4	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	12
+user1	localhost	stage/sql/closing tables	13
 user1	localhost	stage/sql/init	3
-user1	localhost	stage/sql/Opening tables	8
+user1	localhost	stage/sql/Opening tables	9
 user1	localhost	stage/sql/starting	8
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/closing tables	12
 user2	localhost	stage/sql/init	3
-user2	localhost	stage/sql/Opening tables	7
+user2	localhost	stage/sql/Opening tables	8
 user2	localhost	stage/sql/starting	8
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/closing tables	12
 user3	localhost	stage/sql/init	3
-user3	localhost	stage/sql/Opening tables	7
+user3	localhost	stage/sql/Opening tables	8
 user3	localhost	stage/sql/starting	8
 user4	localhost	stage/sql/checking permissions	4
-user4	localhost	stage/sql/closing tables	11
+user4	localhost	stage/sql/closing tables	12
 user4	localhost	stage/sql/init	3
-user4	localhost	stage/sql/Opening tables	7
+user4	localhost	stage/sql/Opening tables	8
 user4	localhost	stage/sql/starting	8
 execute dump_stages_user;
 user	event_name	count_star
 user1	stage/sql/checking permissions	4
-user1	stage/sql/closing tables	12
+user1	stage/sql/closing tables	13
 user1	stage/sql/init	3
-user1	stage/sql/Opening tables	8
+user1	stage/sql/Opening tables	9
 user1	stage/sql/starting	8
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	11
+user2	stage/sql/closing tables	12
 user2	stage/sql/init	3
-user2	stage/sql/Opening tables	7
+user2	stage/sql/Opening tables	8
 user2	stage/sql/starting	8
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	11
+user3	stage/sql/closing tables	12
 user3	stage/sql/init	3
-user3	stage/sql/Opening tables	7
+user3	stage/sql/Opening tables	8
 user3	stage/sql/starting	8
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	11
+user4	stage/sql/closing tables	12
 user4	stage/sql/init	3
-user4	stage/sql/Opening tables	7
+user4	stage/sql/Opening tables	8
 user4	stage/sql/starting	8
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
-user4	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
+user4	localhost	transaction	4
 execute dump_transactions_user;
 user	event_name	count_star
-user1	transaction	3
-user2	transaction	3
-user3	transaction	3
-user4	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
+user4	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	12
+user1	localhost	stage/sql/closing tables	13
 user1	localhost	stage/sql/init	3
-user1	localhost	stage/sql/Opening tables	8
+user1	localhost	stage/sql/Opening tables	9
 user1	localhost	stage/sql/starting	8
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/closing tables	12
 user2	localhost	stage/sql/init	3
-user2	localhost	stage/sql/Opening tables	7
+user2	localhost	stage/sql/Opening tables	8
 user2	localhost	stage/sql/starting	8
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/closing tables	12
 user3	localhost	stage/sql/init	3
-user3	localhost	stage/sql/Opening tables	7
+user3	localhost	stage/sql/Opening tables	8
 user3	localhost	stage/sql/starting	8
 user4	localhost	stage/sql/checking permissions	4
-user4	localhost	stage/sql/closing tables	11
+user4	localhost	stage/sql/closing tables	12
 user4	localhost	stage/sql/init	3
-user4	localhost	stage/sql/Opening tables	7
+user4	localhost	stage/sql/Opening tables	8
 user4	localhost	stage/sql/starting	8
 execute dump_stages_user;
 user	event_name	count_star
 user1	stage/sql/checking permissions	4
-user1	stage/sql/closing tables	12
+user1	stage/sql/closing tables	13
 user1	stage/sql/init	3
-user1	stage/sql/Opening tables	8
+user1	stage/sql/Opening tables	9
 user1	stage/sql/starting	8
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	11
+user2	stage/sql/closing tables	12
 user2	stage/sql/init	3
-user2	stage/sql/Opening tables	7
+user2	stage/sql/Opening tables	8
 user2	stage/sql/starting	8
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	11
+user3	stage/sql/closing tables	12
 user3	stage/sql/init	3
-user3	stage/sql/Opening tables	7
+user3	stage/sql/Opening tables	8
 user3	stage/sql/starting	8
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	11
+user4	stage/sql/closing tables	12
 user4	stage/sql/init	3
-user4	stage/sql/Opening tables	7
+user4	stage/sql/Opening tables	8
 user4	stage/sql/starting	8
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
-user4	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
+user4	localhost	transaction	4
 execute dump_transactions_user;
 user	event_name	count_star
-user1	transaction	3
-user2	transaction	3
-user3	transaction	3
-user4	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
+user4	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	12
+user1	localhost	stage/sql/closing tables	13
 user1	localhost	stage/sql/init	3
-user1	localhost	stage/sql/Opening tables	8
+user1	localhost	stage/sql/Opening tables	9
 user1	localhost	stage/sql/starting	8
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/closing tables	12
 user2	localhost	stage/sql/init	3
-user2	localhost	stage/sql/Opening tables	7
+user2	localhost	stage/sql/Opening tables	8
 user2	localhost	stage/sql/starting	8
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/closing tables	12
 user3	localhost	stage/sql/init	3
-user3	localhost	stage/sql/Opening tables	7
+user3	localhost	stage/sql/Opening tables	8
 user3	localhost	stage/sql/starting	8
 user4	localhost	stage/sql/checking permissions	4
-user4	localhost	stage/sql/closing tables	11
+user4	localhost	stage/sql/closing tables	12
 user4	localhost	stage/sql/init	3
-user4	localhost	stage/sql/Opening tables	7
+user4	localhost	stage/sql/Opening tables	8
 user4	localhost	stage/sql/starting	8
 execute dump_stages_user;
 user	event_name	count_star
 user1	stage/sql/checking permissions	4
-user1	stage/sql/closing tables	12
+user1	stage/sql/closing tables	13
 user1	stage/sql/init	3
-user1	stage/sql/Opening tables	8
+user1	stage/sql/Opening tables	9
 user1	stage/sql/starting	8
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	11
+user2	stage/sql/closing tables	12
 user2	stage/sql/init	3
-user2	stage/sql/Opening tables	7
+user2	stage/sql/Opening tables	8
 user2	stage/sql/starting	8
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	11
+user3	stage/sql/closing tables	12
 user3	stage/sql/init	3
-user3	stage/sql/Opening tables	7
+user3	stage/sql/Opening tables	8
 user3	stage/sql/starting	8
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	11
+user4	stage/sql/closing tables	12
 user4	stage/sql/init	3
-user4	stage/sql/Opening tables	7
+user4	stage/sql/Opening tables	8
 user4	stage/sql/starting	8
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
-user4	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
+user4	localhost	transaction	4
 execute dump_transactions_user;
 user	event_name	count_star
-user1	transaction	3
-user2	transaction	3
-user3	transaction	3
-user4	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
+user4	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	12
+user1	stage/sql/closing tables	13
 user1	stage/sql/init	3
-user1	stage/sql/Opening tables	8
+user1	stage/sql/Opening tables	9
 user1	stage/sql/starting	8
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	11
+user2	stage/sql/closing tables	12
 user2	stage/sql/init	3
-user2	stage/sql/Opening tables	7
+user2	stage/sql/Opening tables	8
 user2	stage/sql/starting	8
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	11
+user3	stage/sql/closing tables	12
 user3	stage/sql/init	3
-user3	stage/sql/Opening tables	7
+user3	stage/sql/Opening tables	8
 user3	stage/sql/starting	8
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	11
+user4	stage/sql/closing tables	12
 user4	stage/sql/init	3
-user4	stage/sql/Opening tables	7
+user4	stage/sql/Opening tables	8
 user4	stage/sql/starting	8
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
-user4	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
+user4	localhost	transaction	4
 execute dump_transactions_user;
 user	event_name	count_star
-user1	transaction	3
-user2	transaction	3
-user3	transaction	3
-user4	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
+user4	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
-user4	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
+user4	localhost	transaction	4
 execute dump_transactions_user;
 user	event_name	count_star
-user1	transaction	3
-user2	transaction	3
-user3	transaction	3
-user4	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
+user4	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
-user4	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
+user4	localhost	transaction	4
 execute dump_transactions_user;
 user	event_name	count_star
-user1	transaction	3
-user2	transaction	3
-user3	transaction	3
-user4	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
+user4	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
-user4	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
+user4	localhost	transaction	4
 execute dump_transactions_user;
 user	event_name	count_star
-user1	transaction	3
-user2	transaction	3
-user3	transaction	3
-user4	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
+user4	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
-user4	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
+user4	localhost	transaction	4
 execute dump_transactions_user;
 user	event_name	count_star
-user1	transaction	3
-user2	transaction	3
-user3	transaction	3
-user4	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
+user4	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
-user4	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
+user4	localhost	transaction	4
 execute dump_transactions_user;
 user	event_name	count_star
-user1	transaction	3
-user2	transaction	3
-user3	transaction	3
-user4	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
+user4	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
-user4	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
+user4	localhost	transaction	4
 execute dump_transactions_user;
 user	event_name	count_star
-user1	transaction	3
-user2	transaction	3
-user3	transaction	3
-user4	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
+user4	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
-user4	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
+user4	localhost	transaction	4
 execute dump_transactions_user;
 user	event_name	count_star
-user1	transaction	3
-user2	transaction	3
-user3	transaction	3
-user4	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
+user4	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
-user4	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
+user4	localhost	transaction	4
 execute dump_transactions_user;
 user	event_name	count_star
-user1	transaction	3
-user2	transaction	3
-user3	transaction	3
-user4	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
+user4	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
-user4	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
+user4	localhost	transaction	4
 execute dump_transactions_user;
 user	event_name	count_star
-user1	transaction	3
-user2	transaction	3
-user3	transaction	3
-user4	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
+user4	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	transaction	3
-user3	transaction	3
-user4	transaction	3
+user1	transaction	4
+user2	transaction	4
+user3	transaction	4
+user4	transaction	4
 execute dump_transactions_host;
 host	event_name	count_star
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	12
+transaction	16
 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 69bf76ea22f80..ad53af9017ff2 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	12
+user1	localhost	stage/sql/closing tables	13
 user1	localhost	stage/sql/init	3
-user1	localhost	stage/sql/Opening tables	8
+user1	localhost	stage/sql/Opening tables	9
 user1	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	4
-localhost	stage/sql/closing tables	12
+localhost	stage/sql/closing tables	13
 localhost	stage/sql/init	3
-localhost	stage/sql/Opening tables	8
+localhost	stage/sql/Opening tables	9
 localhost	stage/sql/starting	7
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	4
-stage/sql/closing tables	12
+stage/sql/closing tables	13
 stage/sql/init	3
-stage/sql/Opening tables	8
+stage/sql/Opening tables	9
 stage/sql/starting	7
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	4
-stage/sql/closing tables	12
+stage/sql/closing tables	13
 stage/sql/init	3
-stage/sql/Opening tables	8
+stage/sql/Opening tables	9
 stage/sql/starting	7
 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	3
+user1	localhost	transaction	4
 execute dump_transactions_user;
 user	event_name	count_star
 execute dump_transactions_host;
 host	event_name	count_star
-localhost	transaction	3
+localhost	transaction	4
 execute dump_transactions_global;
 event_name	count_star
-transaction	3
+transaction	4
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	3
+transaction	4
 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	12
+user1	localhost	stage/sql/closing tables	13
 user1	localhost	stage/sql/init	3
-user1	localhost	stage/sql/Opening tables	8
+user1	localhost	stage/sql/Opening tables	9
 user1	localhost	stage/sql/starting	7
 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	12
+localhost	stage/sql/closing tables	13
 localhost	stage/sql/init	3
-localhost	stage/sql/Opening tables	8
+localhost	stage/sql/Opening tables	9
 localhost	stage/sql/starting	7
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	4
-stage/sql/closing tables	12
+stage/sql/closing tables	13
 stage/sql/init	3
-stage/sql/Opening tables	8
+stage/sql/Opening tables	9
 stage/sql/starting	7
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	4
-stage/sql/closing tables	12
+stage/sql/closing tables	13
 stage/sql/init	3
-stage/sql/Opening tables	8
+stage/sql/Opening tables	9
 stage/sql/starting	7
 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	3
+user1	localhost	transaction	4
 user2	localhost	transaction	0
 execute dump_transactions_user;
 user	event_name	count_star
 execute dump_transactions_host;
 host	event_name	count_star
-localhost	transaction	3
+localhost	transaction	4
 execute dump_transactions_global;
 event_name	count_star
-transaction	3
+transaction	4
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	3
+transaction	4
 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	12
+user1	localhost	stage/sql/closing tables	13
 user1	localhost	stage/sql/init	3
-user1	localhost	stage/sql/Opening tables	8
+user1	localhost	stage/sql/Opening tables	9
 user1	localhost	stage/sql/starting	7
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/closing tables	12
 user2	localhost	stage/sql/init	3
-user2	localhost	stage/sql/Opening tables	7
+user2	localhost	stage/sql/Opening tables	8
 user2	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	8
-localhost	stage/sql/closing tables	23
+localhost	stage/sql/closing tables	25
 localhost	stage/sql/init	6
-localhost	stage/sql/Opening tables	15
+localhost	stage/sql/Opening tables	17
 localhost	stage/sql/starting	14
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	8
-stage/sql/closing tables	23
+stage/sql/closing tables	25
 stage/sql/init	6
-stage/sql/Opening tables	15
+stage/sql/Opening tables	17
 stage/sql/starting	14
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	8
-stage/sql/closing tables	23
+stage/sql/closing tables	25
 stage/sql/init	6
-stage/sql/Opening tables	15
+stage/sql/Opening tables	17
 stage/sql/starting	14
 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	3
-user2	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
 execute dump_transactions_user;
 user	event_name	count_star
 execute dump_transactions_host;
 host	event_name	count_star
-localhost	transaction	6
+localhost	transaction	8
 execute dump_transactions_global;
 event_name	count_star
-transaction	6
+transaction	8
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	6
+transaction	8
 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	12
+user1	localhost	stage/sql/closing tables	13
 user1	localhost	stage/sql/init	3
-user1	localhost	stage/sql/Opening tables	8
+user1	localhost	stage/sql/Opening tables	9
 user1	localhost	stage/sql/starting	7
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/closing tables	12
 user2	localhost	stage/sql/init	3
-user2	localhost	stage/sql/Opening tables	7
+user2	localhost	stage/sql/Opening tables	8
 user2	localhost	stage/sql/starting	7
 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	23
+localhost	stage/sql/closing tables	25
 localhost	stage/sql/init	6
-localhost	stage/sql/Opening tables	15
+localhost	stage/sql/Opening tables	17
 localhost	stage/sql/starting	14
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	8
-stage/sql/closing tables	23
+stage/sql/closing tables	25
 stage/sql/init	6
-stage/sql/Opening tables	15
+stage/sql/Opening tables	17
 stage/sql/starting	14
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	8
-stage/sql/closing tables	23
+stage/sql/closing tables	25
 stage/sql/init	6
-stage/sql/Opening tables	15
+stage/sql/Opening tables	17
 stage/sql/starting	14
 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	3
-user2	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
 user3	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	8
 execute dump_transactions_global;
 event_name	count_star
-transaction	6
+transaction	8
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	6
+transaction	8
 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	12
+user1	localhost	stage/sql/closing tables	13
 user1	localhost	stage/sql/init	3
-user1	localhost	stage/sql/Opening tables	8
+user1	localhost	stage/sql/Opening tables	9
 user1	localhost	stage/sql/starting	7
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/closing tables	12
 user2	localhost	stage/sql/init	3
-user2	localhost	stage/sql/Opening tables	7
+user2	localhost	stage/sql/Opening tables	8
 user2	localhost	stage/sql/starting	7
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/closing tables	12
 user3	localhost	stage/sql/init	3
-user3	localhost	stage/sql/Opening tables	7
+user3	localhost	stage/sql/Opening tables	8
 user3	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	12
-localhost	stage/sql/closing tables	34
+localhost	stage/sql/closing tables	37
 localhost	stage/sql/init	9
-localhost	stage/sql/Opening tables	22
+localhost	stage/sql/Opening tables	25
 localhost	stage/sql/starting	21
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	12
-stage/sql/closing tables	34
+stage/sql/closing tables	37
 stage/sql/init	9
-stage/sql/Opening tables	22
+stage/sql/Opening tables	25
 stage/sql/starting	21
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	12
-stage/sql/closing tables	34
+stage/sql/closing tables	37
 stage/sql/init	9
-stage/sql/Opening tables	22
+stage/sql/Opening tables	25
 stage/sql/starting	21
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
 execute dump_transactions_user;
 user	event_name	count_star
 execute dump_transactions_host;
 host	event_name	count_star
-localhost	transaction	9
+localhost	transaction	12
 execute dump_transactions_global;
 event_name	count_star
-transaction	9
+transaction	12
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	9
+transaction	12
 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	12
+user1	localhost	stage/sql/closing tables	13
 user1	localhost	stage/sql/init	3
-user1	localhost	stage/sql/Opening tables	8
+user1	localhost	stage/sql/Opening tables	9
 user1	localhost	stage/sql/starting	7
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/closing tables	12
 user2	localhost	stage/sql/init	3
-user2	localhost	stage/sql/Opening tables	7
+user2	localhost	stage/sql/Opening tables	8
 user2	localhost	stage/sql/starting	7
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/closing tables	12
 user3	localhost	stage/sql/init	3
-user3	localhost	stage/sql/Opening tables	7
+user3	localhost	stage/sql/Opening tables	8
 user3	localhost	stage/sql/starting	7
 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	34
+localhost	stage/sql/closing tables	37
 localhost	stage/sql/init	9
-localhost	stage/sql/Opening tables	22
+localhost	stage/sql/Opening tables	25
 localhost	stage/sql/starting	21
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	12
-stage/sql/closing tables	34
+stage/sql/closing tables	37
 stage/sql/init	9
-stage/sql/Opening tables	22
+stage/sql/Opening tables	25
 stage/sql/starting	21
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	12
-stage/sql/closing tables	34
+stage/sql/closing tables	37
 stage/sql/init	9
-stage/sql/Opening tables	22
+stage/sql/Opening tables	25
 stage/sql/starting	21
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
 user4	localhost	transaction	0
 execute dump_transactions_user;
 user	event_name	count_star
 execute dump_transactions_host;
 host	event_name	count_star
-localhost	transaction	9
+localhost	transaction	12
 execute dump_transactions_global;
 event_name	count_star
-transaction	9
+transaction	12
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	9
+transaction	12
 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	12
+user1	localhost	stage/sql/closing tables	13
 user1	localhost	stage/sql/init	3
-user1	localhost	stage/sql/Opening tables	8
+user1	localhost	stage/sql/Opening tables	9
 user1	localhost	stage/sql/starting	7
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/closing tables	12
 user2	localhost	stage/sql/init	3
-user2	localhost	stage/sql/Opening tables	7
+user2	localhost	stage/sql/Opening tables	8
 user2	localhost	stage/sql/starting	7
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/closing tables	12
 user3	localhost	stage/sql/init	3
-user3	localhost	stage/sql/Opening tables	7
+user3	localhost	stage/sql/Opening tables	8
 user3	localhost	stage/sql/starting	7
 user4	localhost	stage/sql/checking permissions	4
-user4	localhost	stage/sql/closing tables	11
+user4	localhost	stage/sql/closing tables	12
 user4	localhost	stage/sql/init	3
-user4	localhost	stage/sql/Opening tables	7
+user4	localhost	stage/sql/Opening tables	8
 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	45
+localhost	stage/sql/closing tables	49
 localhost	stage/sql/init	12
-localhost	stage/sql/Opening tables	29
+localhost	stage/sql/Opening tables	33
 localhost	stage/sql/starting	28
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	28
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
-user4	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
+user4	localhost	transaction	4
 execute dump_transactions_user;
 user	event_name	count_star
 execute dump_transactions_host;
 host	event_name	count_star
-localhost	transaction	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	12
+user1	localhost	stage/sql/closing tables	13
 user1	localhost	stage/sql/init	3
-user1	localhost	stage/sql/Opening tables	8
+user1	localhost	stage/sql/Opening tables	9
 user1	localhost	stage/sql/starting	8
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/closing tables	12
 user2	localhost	stage/sql/init	3
-user2	localhost	stage/sql/Opening tables	7
+user2	localhost	stage/sql/Opening tables	8
 user2	localhost	stage/sql/starting	7
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/closing tables	12
 user3	localhost	stage/sql/init	3
-user3	localhost	stage/sql/Opening tables	7
+user3	localhost	stage/sql/Opening tables	8
 user3	localhost	stage/sql/starting	7
 user4	localhost	stage/sql/checking permissions	4
-user4	localhost	stage/sql/closing tables	11
+user4	localhost	stage/sql/closing tables	12
 user4	localhost	stage/sql/init	3
-user4	localhost	stage/sql/Opening tables	7
+user4	localhost	stage/sql/Opening tables	8
 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	45
+localhost	stage/sql/closing tables	49
 localhost	stage/sql/init	12
-localhost	stage/sql/Opening tables	29
+localhost	stage/sql/Opening tables	33
 localhost	stage/sql/starting	29
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	29
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	29
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
-user4	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
+user4	localhost	transaction	4
 execute dump_transactions_user;
 user	event_name	count_star
 execute dump_transactions_host;
 host	event_name	count_star
-localhost	transaction	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	12
+user1	localhost	stage/sql/closing tables	13
 user1	localhost	stage/sql/init	3
-user1	localhost	stage/sql/Opening tables	8
+user1	localhost	stage/sql/Opening tables	9
 user1	localhost	stage/sql/starting	8
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/closing tables	12
 user2	localhost	stage/sql/init	3
-user2	localhost	stage/sql/Opening tables	7
+user2	localhost	stage/sql/Opening tables	8
 user2	localhost	stage/sql/starting	8
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/closing tables	12
 user3	localhost	stage/sql/init	3
-user3	localhost	stage/sql/Opening tables	7
+user3	localhost	stage/sql/Opening tables	8
 user3	localhost	stage/sql/starting	7
 user4	localhost	stage/sql/checking permissions	4
-user4	localhost	stage/sql/closing tables	11
+user4	localhost	stage/sql/closing tables	12
 user4	localhost	stage/sql/init	3
-user4	localhost	stage/sql/Opening tables	7
+user4	localhost	stage/sql/Opening tables	8
 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	45
+localhost	stage/sql/closing tables	49
 localhost	stage/sql/init	12
-localhost	stage/sql/Opening tables	29
+localhost	stage/sql/Opening tables	33
 localhost	stage/sql/starting	30
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	30
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	30
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
-user4	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
+user4	localhost	transaction	4
 execute dump_transactions_user;
 user	event_name	count_star
 execute dump_transactions_host;
 host	event_name	count_star
-localhost	transaction	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	12
+user1	localhost	stage/sql/closing tables	13
 user1	localhost	stage/sql/init	3
-user1	localhost	stage/sql/Opening tables	8
+user1	localhost	stage/sql/Opening tables	9
 user1	localhost	stage/sql/starting	8
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/closing tables	12
 user2	localhost	stage/sql/init	3
-user2	localhost	stage/sql/Opening tables	7
+user2	localhost	stage/sql/Opening tables	8
 user2	localhost	stage/sql/starting	8
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/closing tables	12
 user3	localhost	stage/sql/init	3
-user3	localhost	stage/sql/Opening tables	7
+user3	localhost	stage/sql/Opening tables	8
 user3	localhost	stage/sql/starting	8
 user4	localhost	stage/sql/checking permissions	4
-user4	localhost	stage/sql/closing tables	11
+user4	localhost	stage/sql/closing tables	12
 user4	localhost	stage/sql/init	3
-user4	localhost	stage/sql/Opening tables	7
+user4	localhost	stage/sql/Opening tables	8
 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	45
+localhost	stage/sql/closing tables	49
 localhost	stage/sql/init	12
-localhost	stage/sql/Opening tables	29
+localhost	stage/sql/Opening tables	33
 localhost	stage/sql/starting	31
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	31
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	31
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
-user4	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
+user4	localhost	transaction	4
 execute dump_transactions_user;
 user	event_name	count_star
 execute dump_transactions_host;
 host	event_name	count_star
-localhost	transaction	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	12
+user1	localhost	stage/sql/closing tables	13
 user1	localhost	stage/sql/init	3
-user1	localhost	stage/sql/Opening tables	8
+user1	localhost	stage/sql/Opening tables	9
 user1	localhost	stage/sql/starting	8
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/closing tables	12
 user2	localhost	stage/sql/init	3
-user2	localhost	stage/sql/Opening tables	7
+user2	localhost	stage/sql/Opening tables	8
 user2	localhost	stage/sql/starting	8
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/closing tables	12
 user3	localhost	stage/sql/init	3
-user3	localhost	stage/sql/Opening tables	7
+user3	localhost	stage/sql/Opening tables	8
 user3	localhost	stage/sql/starting	8
 user4	localhost	stage/sql/checking permissions	4
-user4	localhost	stage/sql/closing tables	11
+user4	localhost	stage/sql/closing tables	12
 user4	localhost	stage/sql/init	3
-user4	localhost	stage/sql/Opening tables	7
+user4	localhost	stage/sql/Opening tables	8
 user4	localhost	stage/sql/starting	8
 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	45
+localhost	stage/sql/closing tables	49
 localhost	stage/sql/init	12
-localhost	stage/sql/Opening tables	29
+localhost	stage/sql/Opening tables	33
 localhost	stage/sql/starting	32
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
-user4	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
+user4	localhost	transaction	4
 execute dump_transactions_user;
 user	event_name	count_star
 execute dump_transactions_host;
 host	event_name	count_star
-localhost	transaction	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	12
+user1	localhost	stage/sql/closing tables	13
 user1	localhost	stage/sql/init	3
-user1	localhost	stage/sql/Opening tables	8
+user1	localhost	stage/sql/Opening tables	9
 user1	localhost	stage/sql/starting	8
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/closing tables	12
 user2	localhost	stage/sql/init	3
-user2	localhost	stage/sql/Opening tables	7
+user2	localhost	stage/sql/Opening tables	8
 user2	localhost	stage/sql/starting	8
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/closing tables	12
 user3	localhost	stage/sql/init	3
-user3	localhost	stage/sql/Opening tables	7
+user3	localhost	stage/sql/Opening tables	8
 user3	localhost	stage/sql/starting	8
 user4	localhost	stage/sql/checking permissions	4
-user4	localhost	stage/sql/closing tables	11
+user4	localhost	stage/sql/closing tables	12
 user4	localhost	stage/sql/init	3
-user4	localhost	stage/sql/Opening tables	7
+user4	localhost	stage/sql/Opening tables	8
 user4	localhost	stage/sql/starting	8
 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	45
+localhost	stage/sql/closing tables	49
 localhost	stage/sql/init	12
-localhost	stage/sql/Opening tables	29
+localhost	stage/sql/Opening tables	33
 localhost	stage/sql/starting	32
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
-user4	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
+user4	localhost	transaction	4
 execute dump_transactions_user;
 user	event_name	count_star
 execute dump_transactions_host;
 host	event_name	count_star
-localhost	transaction	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	12
+user1	localhost	stage/sql/closing tables	13
 user1	localhost	stage/sql/init	3
-user1	localhost	stage/sql/Opening tables	8
+user1	localhost	stage/sql/Opening tables	9
 user1	localhost	stage/sql/starting	8
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/closing tables	12
 user2	localhost	stage/sql/init	3
-user2	localhost	stage/sql/Opening tables	7
+user2	localhost	stage/sql/Opening tables	8
 user2	localhost	stage/sql/starting	8
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/closing tables	12
 user3	localhost	stage/sql/init	3
-user3	localhost	stage/sql/Opening tables	7
+user3	localhost	stage/sql/Opening tables	8
 user3	localhost	stage/sql/starting	8
 user4	localhost	stage/sql/checking permissions	4
-user4	localhost	stage/sql/closing tables	11
+user4	localhost	stage/sql/closing tables	12
 user4	localhost	stage/sql/init	3
-user4	localhost	stage/sql/Opening tables	7
+user4	localhost	stage/sql/Opening tables	8
 user4	localhost	stage/sql/starting	8
 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	45
+localhost	stage/sql/closing tables	49
 localhost	stage/sql/init	12
-localhost	stage/sql/Opening tables	29
+localhost	stage/sql/Opening tables	33
 localhost	stage/sql/starting	32
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
-user4	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
+user4	localhost	transaction	4
 execute dump_transactions_user;
 user	event_name	count_star
 execute dump_transactions_host;
 host	event_name	count_star
-localhost	transaction	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	12
+user1	localhost	stage/sql/closing tables	13
 user1	localhost	stage/sql/init	3
-user1	localhost	stage/sql/Opening tables	8
+user1	localhost	stage/sql/Opening tables	9
 user1	localhost	stage/sql/starting	8
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/closing tables	12
 user2	localhost	stage/sql/init	3
-user2	localhost	stage/sql/Opening tables	7
+user2	localhost	stage/sql/Opening tables	8
 user2	localhost	stage/sql/starting	8
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/closing tables	12
 user3	localhost	stage/sql/init	3
-user3	localhost	stage/sql/Opening tables	7
+user3	localhost	stage/sql/Opening tables	8
 user3	localhost	stage/sql/starting	8
 user4	localhost	stage/sql/checking permissions	4
-user4	localhost	stage/sql/closing tables	11
+user4	localhost	stage/sql/closing tables	12
 user4	localhost	stage/sql/init	3
-user4	localhost	stage/sql/Opening tables	7
+user4	localhost	stage/sql/Opening tables	8
 user4	localhost	stage/sql/starting	8
 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	45
+localhost	stage/sql/closing tables	49
 localhost	stage/sql/init	12
-localhost	stage/sql/Opening tables	29
+localhost	stage/sql/Opening tables	33
 localhost	stage/sql/starting	32
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
-user4	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
+user4	localhost	transaction	4
 execute dump_transactions_user;
 user	event_name	count_star
 execute dump_transactions_host;
 host	event_name	count_star
-localhost	transaction	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	12
+user1	localhost	stage/sql/closing tables	13
 user1	localhost	stage/sql/init	3
-user1	localhost	stage/sql/Opening tables	8
+user1	localhost	stage/sql/Opening tables	9
 user1	localhost	stage/sql/starting	8
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/closing tables	12
 user2	localhost	stage/sql/init	3
-user2	localhost	stage/sql/Opening tables	7
+user2	localhost	stage/sql/Opening tables	8
 user2	localhost	stage/sql/starting	8
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/closing tables	12
 user3	localhost	stage/sql/init	3
-user3	localhost	stage/sql/Opening tables	7
+user3	localhost	stage/sql/Opening tables	8
 user3	localhost	stage/sql/starting	8
 user4	localhost	stage/sql/checking permissions	4
-user4	localhost	stage/sql/closing tables	11
+user4	localhost	stage/sql/closing tables	12
 user4	localhost	stage/sql/init	3
-user4	localhost	stage/sql/Opening tables	7
+user4	localhost	stage/sql/Opening tables	8
 user4	localhost	stage/sql/starting	8
 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	45
+localhost	stage/sql/closing tables	49
 localhost	stage/sql/init	12
-localhost	stage/sql/Opening tables	29
+localhost	stage/sql/Opening tables	33
 localhost	stage/sql/starting	32
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
-user4	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
+user4	localhost	transaction	4
 execute dump_transactions_user;
 user	event_name	count_star
 execute dump_transactions_host;
 host	event_name	count_star
-localhost	transaction	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	12
+user1	localhost	stage/sql/closing tables	13
 user1	localhost	stage/sql/init	3
-user1	localhost	stage/sql/Opening tables	8
+user1	localhost	stage/sql/Opening tables	9
 user1	localhost	stage/sql/starting	8
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/closing tables	12
 user2	localhost	stage/sql/init	3
-user2	localhost	stage/sql/Opening tables	7
+user2	localhost	stage/sql/Opening tables	8
 user2	localhost	stage/sql/starting	8
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/closing tables	12
 user3	localhost	stage/sql/init	3
-user3	localhost	stage/sql/Opening tables	7
+user3	localhost	stage/sql/Opening tables	8
 user3	localhost	stage/sql/starting	8
 user4	localhost	stage/sql/checking permissions	4
-user4	localhost	stage/sql/closing tables	11
+user4	localhost	stage/sql/closing tables	12
 user4	localhost	stage/sql/init	3
-user4	localhost	stage/sql/Opening tables	7
+user4	localhost	stage/sql/Opening tables	8
 user4	localhost	stage/sql/starting	8
 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	45
+localhost	stage/sql/closing tables	49
 localhost	stage/sql/init	12
-localhost	stage/sql/Opening tables	29
+localhost	stage/sql/Opening tables	33
 localhost	stage/sql/starting	32
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
-user4	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
+user4	localhost	transaction	4
 execute dump_transactions_user;
 user	event_name	count_star
 execute dump_transactions_host;
 host	event_name	count_star
-localhost	transaction	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	12
+user1	localhost	stage/sql/closing tables	13
 user1	localhost	stage/sql/init	3
-user1	localhost	stage/sql/Opening tables	8
+user1	localhost	stage/sql/Opening tables	9
 user1	localhost	stage/sql/starting	8
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/closing tables	12
 user2	localhost	stage/sql/init	3
-user2	localhost	stage/sql/Opening tables	7
+user2	localhost	stage/sql/Opening tables	8
 user2	localhost	stage/sql/starting	8
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/closing tables	12
 user3	localhost	stage/sql/init	3
-user3	localhost	stage/sql/Opening tables	7
+user3	localhost	stage/sql/Opening tables	8
 user3	localhost	stage/sql/starting	8
 user4	localhost	stage/sql/checking permissions	4
-user4	localhost	stage/sql/closing tables	11
+user4	localhost	stage/sql/closing tables	12
 user4	localhost	stage/sql/init	3
-user4	localhost	stage/sql/Opening tables	7
+user4	localhost	stage/sql/Opening tables	8
 user4	localhost	stage/sql/starting	8
 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	45
+localhost	stage/sql/closing tables	49
 localhost	stage/sql/init	12
-localhost	stage/sql/Opening tables	29
+localhost	stage/sql/Opening tables	33
 localhost	stage/sql/starting	32
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
-user4	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
+user4	localhost	transaction	4
 execute dump_transactions_user;
 user	event_name	count_star
 execute dump_transactions_host;
 host	event_name	count_star
-localhost	transaction	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+localhost	stage/sql/closing tables	49
 localhost	stage/sql/init	12
-localhost	stage/sql/Opening tables	29
+localhost	stage/sql/Opening tables	33
 localhost	stage/sql/starting	32
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
-user4	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
+user4	localhost	transaction	4
 execute dump_transactions_user;
 user	event_name	count_star
 execute dump_transactions_host;
 host	event_name	count_star
-localhost	transaction	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+localhost	stage/sql/closing tables	49
 localhost	stage/sql/init	12
-localhost	stage/sql/Opening tables	29
+localhost	stage/sql/Opening tables	33
 localhost	stage/sql/starting	32
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
-user4	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
+user4	localhost	transaction	4
 execute dump_transactions_user;
 user	event_name	count_star
 execute dump_transactions_host;
 host	event_name	count_star
-localhost	transaction	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
-user4	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
+user4	localhost	transaction	4
 execute dump_transactions_user;
 user	event_name	count_star
 execute dump_transactions_host;
 host	event_name	count_star
-localhost	transaction	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
-user4	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
+user4	localhost	transaction	4
 execute dump_transactions_user;
 user	event_name	count_star
 execute dump_transactions_host;
 host	event_name	count_star
-localhost	transaction	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
-user4	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
+user4	localhost	transaction	4
 execute dump_transactions_user;
 user	event_name	count_star
 execute dump_transactions_host;
 host	event_name	count_star
-localhost	transaction	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
-user4	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
+user4	localhost	transaction	4
 execute dump_transactions_user;
 user	event_name	count_star
 execute dump_transactions_host;
 host	event_name	count_star
-localhost	transaction	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
-user4	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
+user4	localhost	transaction	4
 execute dump_transactions_user;
 user	event_name	count_star
 execute dump_transactions_host;
 host	event_name	count_star
-localhost	transaction	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
-user4	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
+user4	localhost	transaction	4
 execute dump_transactions_user;
 user	event_name	count_star
 execute dump_transactions_host;
 host	event_name	count_star
-localhost	transaction	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
-user4	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
+user4	localhost	transaction	4
 execute dump_transactions_user;
 user	event_name	count_star
 execute dump_transactions_host;
 host	event_name	count_star
-localhost	transaction	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
-user4	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
+user4	localhost	transaction	4
 execute dump_transactions_user;
 user	event_name	count_star
 execute dump_transactions_host;
 host	event_name	count_star
-localhost	transaction	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	12
+localhost	transaction	16
 execute dump_transactions_global;
 event_name	count_star
-transaction	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	12
+transaction	16
 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 bd3a44bdcd16d..bb2bc9d986ab0 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	12
+user1	localhost	stage/sql/closing tables	13
 user1	localhost	stage/sql/init	3
-user1	localhost	stage/sql/Opening tables	8
+user1	localhost	stage/sql/Opening tables	9
 user1	localhost	stage/sql/starting	7
 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	12
+stage/sql/closing tables	13
 stage/sql/init	3
-stage/sql/Opening tables	8
+stage/sql/Opening tables	9
 stage/sql/starting	7
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	4
-stage/sql/closing tables	12
+stage/sql/closing tables	13
 stage/sql/init	3
-stage/sql/Opening tables	8
+stage/sql/Opening tables	9
 stage/sql/starting	7
 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	3
+user1	localhost	transaction	4
 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	3
+transaction	4
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	3
+transaction	4
 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	12
+user1	localhost	stage/sql/closing tables	13
 user1	localhost	stage/sql/init	3
-user1	localhost	stage/sql/Opening tables	8
+user1	localhost	stage/sql/Opening tables	9
 user1	localhost	stage/sql/starting	7
 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	12
+stage/sql/closing tables	13
 stage/sql/init	3
-stage/sql/Opening tables	8
+stage/sql/Opening tables	9
 stage/sql/starting	7
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	4
-stage/sql/closing tables	12
+stage/sql/closing tables	13
 stage/sql/init	3
-stage/sql/Opening tables	8
+stage/sql/Opening tables	9
 stage/sql/starting	7
 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	3
+user1	localhost	transaction	4
 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	3
+transaction	4
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	3
+transaction	4
 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	12
+user1	localhost	stage/sql/closing tables	13
 user1	localhost	stage/sql/init	3
-user1	localhost	stage/sql/Opening tables	8
+user1	localhost	stage/sql/Opening tables	9
 user1	localhost	stage/sql/starting	7
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/closing tables	12
 user2	localhost	stage/sql/init	3
-user2	localhost	stage/sql/Opening tables	7
+user2	localhost	stage/sql/Opening tables	8
 user2	localhost	stage/sql/starting	7
 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	23
+stage/sql/closing tables	25
 stage/sql/init	6
-stage/sql/Opening tables	15
+stage/sql/Opening tables	17
 stage/sql/starting	14
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	8
-stage/sql/closing tables	23
+stage/sql/closing tables	25
 stage/sql/init	6
-stage/sql/Opening tables	15
+stage/sql/Opening tables	17
 stage/sql/starting	14
 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	3
-user2	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
 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	8
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	6
+transaction	8
 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	12
+user1	localhost	stage/sql/closing tables	13
 user1	localhost	stage/sql/init	3
-user1	localhost	stage/sql/Opening tables	8
+user1	localhost	stage/sql/Opening tables	9
 user1	localhost	stage/sql/starting	7
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/closing tables	12
 user2	localhost	stage/sql/init	3
-user2	localhost	stage/sql/Opening tables	7
+user2	localhost	stage/sql/Opening tables	8
 user2	localhost	stage/sql/starting	7
 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	23
+stage/sql/closing tables	25
 stage/sql/init	6
-stage/sql/Opening tables	15
+stage/sql/Opening tables	17
 stage/sql/starting	14
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	8
-stage/sql/closing tables	23
+stage/sql/closing tables	25
 stage/sql/init	6
-stage/sql/Opening tables	15
+stage/sql/Opening tables	17
 stage/sql/starting	14
 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	3
-user2	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
 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	6
+transaction	8
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	6
+transaction	8
 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	12
+user1	localhost	stage/sql/closing tables	13
 user1	localhost	stage/sql/init	3
-user1	localhost	stage/sql/Opening tables	8
+user1	localhost	stage/sql/Opening tables	9
 user1	localhost	stage/sql/starting	7
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/closing tables	12
 user2	localhost	stage/sql/init	3
-user2	localhost	stage/sql/Opening tables	7
+user2	localhost	stage/sql/Opening tables	8
 user2	localhost	stage/sql/starting	7
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/closing tables	12
 user3	localhost	stage/sql/init	3
-user3	localhost	stage/sql/Opening tables	7
+user3	localhost	stage/sql/Opening tables	8
 user3	localhost	stage/sql/starting	7
 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	34
+stage/sql/closing tables	37
 stage/sql/init	9
-stage/sql/Opening tables	22
+stage/sql/Opening tables	25
 stage/sql/starting	21
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	12
-stage/sql/closing tables	34
+stage/sql/closing tables	37
 stage/sql/init	9
-stage/sql/Opening tables	22
+stage/sql/Opening tables	25
 stage/sql/starting	21
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
 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	9
+transaction	12
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	9
+transaction	12
 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	12
+user1	localhost	stage/sql/closing tables	13
 user1	localhost	stage/sql/init	3
-user1	localhost	stage/sql/Opening tables	8
+user1	localhost	stage/sql/Opening tables	9
 user1	localhost	stage/sql/starting	7
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/closing tables	12
 user2	localhost	stage/sql/init	3
-user2	localhost	stage/sql/Opening tables	7
+user2	localhost	stage/sql/Opening tables	8
 user2	localhost	stage/sql/starting	7
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/closing tables	12
 user3	localhost	stage/sql/init	3
-user3	localhost	stage/sql/Opening tables	7
+user3	localhost	stage/sql/Opening tables	8
 user3	localhost	stage/sql/starting	7
 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	34
+stage/sql/closing tables	37
 stage/sql/init	9
-stage/sql/Opening tables	22
+stage/sql/Opening tables	25
 stage/sql/starting	21
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	12
-stage/sql/closing tables	34
+stage/sql/closing tables	37
 stage/sql/init	9
-stage/sql/Opening tables	22
+stage/sql/Opening tables	25
 stage/sql/starting	21
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
 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	9
+transaction	12
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	9
+transaction	12
 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	12
+user1	localhost	stage/sql/closing tables	13
 user1	localhost	stage/sql/init	3
-user1	localhost	stage/sql/Opening tables	8
+user1	localhost	stage/sql/Opening tables	9
 user1	localhost	stage/sql/starting	7
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/closing tables	12
 user2	localhost	stage/sql/init	3
-user2	localhost	stage/sql/Opening tables	7
+user2	localhost	stage/sql/Opening tables	8
 user2	localhost	stage/sql/starting	7
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/closing tables	12
 user3	localhost	stage/sql/init	3
-user3	localhost	stage/sql/Opening tables	7
+user3	localhost	stage/sql/Opening tables	8
 user3	localhost	stage/sql/starting	7
 user4	localhost	stage/sql/checking permissions	4
-user4	localhost	stage/sql/closing tables	11
+user4	localhost	stage/sql/closing tables	12
 user4	localhost	stage/sql/init	3
-user4	localhost	stage/sql/Opening tables	7
+user4	localhost	stage/sql/Opening tables	8
 user4	localhost	stage/sql/starting	7
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	28
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
-user4	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
+user4	localhost	transaction	4
 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	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	12
+user1	localhost	stage/sql/closing tables	13
 user1	localhost	stage/sql/init	3
-user1	localhost	stage/sql/Opening tables	8
+user1	localhost	stage/sql/Opening tables	9
 user1	localhost	stage/sql/starting	8
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/closing tables	12
 user2	localhost	stage/sql/init	3
-user2	localhost	stage/sql/Opening tables	7
+user2	localhost	stage/sql/Opening tables	8
 user2	localhost	stage/sql/starting	7
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/closing tables	12
 user3	localhost	stage/sql/init	3
-user3	localhost	stage/sql/Opening tables	7
+user3	localhost	stage/sql/Opening tables	8
 user3	localhost	stage/sql/starting	7
 user4	localhost	stage/sql/checking permissions	4
-user4	localhost	stage/sql/closing tables	11
+user4	localhost	stage/sql/closing tables	12
 user4	localhost	stage/sql/init	3
-user4	localhost	stage/sql/Opening tables	7
+user4	localhost	stage/sql/Opening tables	8
 user4	localhost	stage/sql/starting	7
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	29
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	29
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
-user4	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
+user4	localhost	transaction	4
 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	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	12
+user1	localhost	stage/sql/closing tables	13
 user1	localhost	stage/sql/init	3
-user1	localhost	stage/sql/Opening tables	8
+user1	localhost	stage/sql/Opening tables	9
 user1	localhost	stage/sql/starting	8
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/closing tables	12
 user2	localhost	stage/sql/init	3
-user2	localhost	stage/sql/Opening tables	7
+user2	localhost	stage/sql/Opening tables	8
 user2	localhost	stage/sql/starting	8
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/closing tables	12
 user3	localhost	stage/sql/init	3
-user3	localhost	stage/sql/Opening tables	7
+user3	localhost	stage/sql/Opening tables	8
 user3	localhost	stage/sql/starting	7
 user4	localhost	stage/sql/checking permissions	4
-user4	localhost	stage/sql/closing tables	11
+user4	localhost	stage/sql/closing tables	12
 user4	localhost	stage/sql/init	3
-user4	localhost	stage/sql/Opening tables	7
+user4	localhost	stage/sql/Opening tables	8
 user4	localhost	stage/sql/starting	7
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	30
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	30
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
-user4	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
+user4	localhost	transaction	4
 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	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	12
+user1	localhost	stage/sql/closing tables	13
 user1	localhost	stage/sql/init	3
-user1	localhost	stage/sql/Opening tables	8
+user1	localhost	stage/sql/Opening tables	9
 user1	localhost	stage/sql/starting	8
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/closing tables	12
 user2	localhost	stage/sql/init	3
-user2	localhost	stage/sql/Opening tables	7
+user2	localhost	stage/sql/Opening tables	8
 user2	localhost	stage/sql/starting	8
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/closing tables	12
 user3	localhost	stage/sql/init	3
-user3	localhost	stage/sql/Opening tables	7
+user3	localhost	stage/sql/Opening tables	8
 user3	localhost	stage/sql/starting	8
 user4	localhost	stage/sql/checking permissions	4
-user4	localhost	stage/sql/closing tables	11
+user4	localhost	stage/sql/closing tables	12
 user4	localhost	stage/sql/init	3
-user4	localhost	stage/sql/Opening tables	7
+user4	localhost	stage/sql/Opening tables	8
 user4	localhost	stage/sql/starting	7
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	31
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	31
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
-user4	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
+user4	localhost	transaction	4
 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	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	12
+user1	localhost	stage/sql/closing tables	13
 user1	localhost	stage/sql/init	3
-user1	localhost	stage/sql/Opening tables	8
+user1	localhost	stage/sql/Opening tables	9
 user1	localhost	stage/sql/starting	8
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/closing tables	12
 user2	localhost	stage/sql/init	3
-user2	localhost	stage/sql/Opening tables	7
+user2	localhost	stage/sql/Opening tables	8
 user2	localhost	stage/sql/starting	8
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/closing tables	12
 user3	localhost	stage/sql/init	3
-user3	localhost	stage/sql/Opening tables	7
+user3	localhost	stage/sql/Opening tables	8
 user3	localhost	stage/sql/starting	8
 user4	localhost	stage/sql/checking permissions	4
-user4	localhost	stage/sql/closing tables	11
+user4	localhost	stage/sql/closing tables	12
 user4	localhost	stage/sql/init	3
-user4	localhost	stage/sql/Opening tables	7
+user4	localhost	stage/sql/Opening tables	8
 user4	localhost	stage/sql/starting	8
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
-user4	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
+user4	localhost	transaction	4
 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	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	12
+user1	localhost	stage/sql/closing tables	13
 user1	localhost	stage/sql/init	3
-user1	localhost	stage/sql/Opening tables	8
+user1	localhost	stage/sql/Opening tables	9
 user1	localhost	stage/sql/starting	8
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/closing tables	12
 user2	localhost	stage/sql/init	3
-user2	localhost	stage/sql/Opening tables	7
+user2	localhost	stage/sql/Opening tables	8
 user2	localhost	stage/sql/starting	8
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/closing tables	12
 user3	localhost	stage/sql/init	3
-user3	localhost	stage/sql/Opening tables	7
+user3	localhost	stage/sql/Opening tables	8
 user3	localhost	stage/sql/starting	8
 user4	localhost	stage/sql/checking permissions	4
-user4	localhost	stage/sql/closing tables	11
+user4	localhost	stage/sql/closing tables	12
 user4	localhost	stage/sql/init	3
-user4	localhost	stage/sql/Opening tables	7
+user4	localhost	stage/sql/Opening tables	8
 user4	localhost	stage/sql/starting	8
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
-user4	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
+user4	localhost	transaction	4
 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	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	12
+user1	localhost	stage/sql/closing tables	13
 user1	localhost	stage/sql/init	3
-user1	localhost	stage/sql/Opening tables	8
+user1	localhost	stage/sql/Opening tables	9
 user1	localhost	stage/sql/starting	8
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/closing tables	12
 user2	localhost	stage/sql/init	3
-user2	localhost	stage/sql/Opening tables	7
+user2	localhost	stage/sql/Opening tables	8
 user2	localhost	stage/sql/starting	8
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/closing tables	12
 user3	localhost	stage/sql/init	3
-user3	localhost	stage/sql/Opening tables	7
+user3	localhost	stage/sql/Opening tables	8
 user3	localhost	stage/sql/starting	8
 user4	localhost	stage/sql/checking permissions	4
-user4	localhost	stage/sql/closing tables	11
+user4	localhost	stage/sql/closing tables	12
 user4	localhost	stage/sql/init	3
-user4	localhost	stage/sql/Opening tables	7
+user4	localhost	stage/sql/Opening tables	8
 user4	localhost	stage/sql/starting	8
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
-user4	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
+user4	localhost	transaction	4
 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	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	12
+user1	localhost	stage/sql/closing tables	13
 user1	localhost	stage/sql/init	3
-user1	localhost	stage/sql/Opening tables	8
+user1	localhost	stage/sql/Opening tables	9
 user1	localhost	stage/sql/starting	8
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/closing tables	12
 user2	localhost	stage/sql/init	3
-user2	localhost	stage/sql/Opening tables	7
+user2	localhost	stage/sql/Opening tables	8
 user2	localhost	stage/sql/starting	8
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/closing tables	12
 user3	localhost	stage/sql/init	3
-user3	localhost	stage/sql/Opening tables	7
+user3	localhost	stage/sql/Opening tables	8
 user3	localhost	stage/sql/starting	8
 user4	localhost	stage/sql/checking permissions	4
-user4	localhost	stage/sql/closing tables	11
+user4	localhost	stage/sql/closing tables	12
 user4	localhost	stage/sql/init	3
-user4	localhost	stage/sql/Opening tables	7
+user4	localhost	stage/sql/Opening tables	8
 user4	localhost	stage/sql/starting	8
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
-user4	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
+user4	localhost	transaction	4
 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	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	12
+user1	localhost	stage/sql/closing tables	13
 user1	localhost	stage/sql/init	3
-user1	localhost	stage/sql/Opening tables	8
+user1	localhost	stage/sql/Opening tables	9
 user1	localhost	stage/sql/starting	8
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/closing tables	12
 user2	localhost	stage/sql/init	3
-user2	localhost	stage/sql/Opening tables	7
+user2	localhost	stage/sql/Opening tables	8
 user2	localhost	stage/sql/starting	8
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/closing tables	12
 user3	localhost	stage/sql/init	3
-user3	localhost	stage/sql/Opening tables	7
+user3	localhost	stage/sql/Opening tables	8
 user3	localhost	stage/sql/starting	8
 user4	localhost	stage/sql/checking permissions	4
-user4	localhost	stage/sql/closing tables	11
+user4	localhost	stage/sql/closing tables	12
 user4	localhost	stage/sql/init	3
-user4	localhost	stage/sql/Opening tables	7
+user4	localhost	stage/sql/Opening tables	8
 user4	localhost	stage/sql/starting	8
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
-user4	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
+user4	localhost	transaction	4
 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	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	12
+user1	localhost	stage/sql/closing tables	13
 user1	localhost	stage/sql/init	3
-user1	localhost	stage/sql/Opening tables	8
+user1	localhost	stage/sql/Opening tables	9
 user1	localhost	stage/sql/starting	8
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/closing tables	12
 user2	localhost	stage/sql/init	3
-user2	localhost	stage/sql/Opening tables	7
+user2	localhost	stage/sql/Opening tables	8
 user2	localhost	stage/sql/starting	8
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/closing tables	12
 user3	localhost	stage/sql/init	3
-user3	localhost	stage/sql/Opening tables	7
+user3	localhost	stage/sql/Opening tables	8
 user3	localhost	stage/sql/starting	8
 user4	localhost	stage/sql/checking permissions	4
-user4	localhost	stage/sql/closing tables	11
+user4	localhost	stage/sql/closing tables	12
 user4	localhost	stage/sql/init	3
-user4	localhost	stage/sql/Opening tables	7
+user4	localhost	stage/sql/Opening tables	8
 user4	localhost	stage/sql/starting	8
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
-user4	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
+user4	localhost	transaction	4
 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	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	12
+user1	localhost	stage/sql/closing tables	13
 user1	localhost	stage/sql/init	3
-user1	localhost	stage/sql/Opening tables	8
+user1	localhost	stage/sql/Opening tables	9
 user1	localhost	stage/sql/starting	8
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/closing tables	12
 user2	localhost	stage/sql/init	3
-user2	localhost	stage/sql/Opening tables	7
+user2	localhost	stage/sql/Opening tables	8
 user2	localhost	stage/sql/starting	8
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/closing tables	12
 user3	localhost	stage/sql/init	3
-user3	localhost	stage/sql/Opening tables	7
+user3	localhost	stage/sql/Opening tables	8
 user3	localhost	stage/sql/starting	8
 user4	localhost	stage/sql/checking permissions	4
-user4	localhost	stage/sql/closing tables	11
+user4	localhost	stage/sql/closing tables	12
 user4	localhost	stage/sql/init	3
-user4	localhost	stage/sql/Opening tables	7
+user4	localhost	stage/sql/Opening tables	8
 user4	localhost	stage/sql/starting	8
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
-user4	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
+user4	localhost	transaction	4
 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	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
-user4	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
+user4	localhost	transaction	4
 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	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
-user4	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
+user4	localhost	transaction	4
 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	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
-user4	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
+user4	localhost	transaction	4
 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	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
-user4	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
+user4	localhost	transaction	4
 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	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
-user4	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
+user4	localhost	transaction	4
 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	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
-user4	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
+user4	localhost	transaction	4
 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	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
-user4	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
+user4	localhost	transaction	4
 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	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
-user4	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
+user4	localhost	transaction	4
 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	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
-user4	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
+user4	localhost	transaction	4
 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	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	3
-user2	localhost	transaction	3
-user3	localhost	transaction	3
-user4	localhost	transaction	3
+user1	localhost	transaction	4
+user2	localhost	transaction	4
+user3	localhost	transaction	4
+user4	localhost	transaction	4
 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	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	12
+transaction	16
 execute dump_transactions_history;
 event_name	count(event_name)
-transaction	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	12
+transaction	16
 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	45
+stage/sql/closing tables	49
 stage/sql/init	12
-stage/sql/Opening tables	29
+stage/sql/Opening tables	33
 stage/sql/starting	32
 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	12
+transaction	16
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
diff --git a/mysql-test/suite/perfschema/r/transaction_nested_events.result b/mysql-test/suite/perfschema/r/transaction_nested_events.result
index 52fa3783a8bb5..f186fd1acc2ab 100644
--- a/mysql-test/suite/perfschema/r/transaction_nested_events.result
+++ b/mysql-test/suite/perfschema/r/transaction_nested_events.result
@@ -327,7 +327,7 @@ FROM performance_schema.events_transactions_current
 WHERE ((THREAD_ID = @con1_thread_id) OR (@all_threads = 1))
 ORDER BY thread_id, event_id;
 THREAD_ID	R_EVENT_ID	R_END_EVENT_ID	EVENT_NAME 	STATE      	ACCESS_MODE	ISOLATION_LEVEL 	AUTO	R_NESTING_EVENT_ID	NESTING_EVENT_TYPE
-thread_id	         10	         12	transaction	COMMITTED  	READ WRITE 	REPEATABLE READ 	NO  	                  9	STATEMENT         
+thread_id	         11	         13	transaction	COMMITTED  	READ WRITE 	REPEATABLE READ 	NO  	                  9	STATEMENT         
 #
 # EVENTS_TRANSACTIONS_HISTORY_LONG
 #
@@ -347,7 +347,8 @@ ORDER BY thread_id, event_id;
 THREAD_ID	R_EVENT_ID	R_END_EVENT_ID	EVENT_NAME 	STATE      	ACCESS_MODE	ISOLATION_LEVEL 	AUTO	R_NESTING_EVENT_ID	NESTING_EVENT_TYPE
 thread_id	          2	          2	transaction	COMMITTED  	READ WRITE 	REPEATABLE READ 	YES 	                  1	STATEMENT         
 thread_id	         10	         10	transaction	COMMITTED  	READ WRITE 	REPEATABLE READ 	NO  	                  9	STATEMENT         
-thread_id	         10	         12	transaction	COMMITTED  	READ WRITE 	REPEATABLE READ 	NO  	                  9	STATEMENT         
+thread_id	         11	         11	transaction	COMMITTED  	READ WRITE 	REPEATABLE READ 	NO  	                  9	STATEMENT         
+thread_id	         11	         13	transaction	COMMITTED  	READ WRITE 	REPEATABLE READ 	NO  	                  9	STATEMENT         
 #
 # EVENTS_STATEMENTS_HISTORY_LONG
 #
@@ -370,9 +371,9 @@ thread_id	          5	          5	statement/sql/insert          	NULL
 thread_id	          6	          6	statement/sql/insert          	NULL        	                  4	TRANSACTION       	    0	INSERT INTO t1 VALUES (311, "INSERT 311")
 thread_id	          7	          7	statement/sql/insert          	NULL        	                  4	TRANSACTION       	    0	INSERT INTO t1 VALUES (312, "INSERT 312")
 thread_id	          8	          8	statement/sql/insert          	NULL        	                  4	TRANSACTION       	    0	INSERT INTO t1 VALUES (313, "INSERT 313")
-thread_id	          9	         11	statement/sql/call_procedure  	NULL        	                  4	TRANSACTION       	    0	CALL tp_update()
-thread_id	         11	         11	statement/sp/stmt             	tp_update   	                  9	STATEMENT         	    1	UPDATE t1 SET s1 = s1 + 1
-thread_id	         12	         12	statement/sql/commit          	NULL        	               NULL	NULL              	    0	COMMIT
+thread_id	          9	         12	statement/sql/call_procedure  	NULL        	                  4	TRANSACTION       	    0	CALL tp_update()
+thread_id	         12	         12	statement/sp/stmt             	tp_update   	                  9	STATEMENT         	    1	UPDATE t1 SET s1 = s1 + 1
+thread_id	         13	         13	statement/sql/commit          	NULL        	               NULL	NULL              	    0	COMMIT
 #
 ### Combined statement and transaction event history ordered by event id
 #
@@ -406,11 +407,12 @@ thread_id	          5	          5	statement/sql/insert     	                  4
 thread_id	          6	          6	statement/sql/insert     	                  4	TRANSACTION       	INSERT INTO t1 VALUES (311, "INSERT 311")
 thread_id	          7	          7	statement/sql/insert     	                  4	TRANSACTION       	INSERT INTO t1 VALUES (312, "INSERT 312")
 thread_id	          8	          8	statement/sql/insert     	                  4	TRANSACTION       	INSERT INTO t1 VALUES (313, "INSERT 313")
-thread_id	          9	         11	statement/sql/call_proced	                  4	TRANSACTION       	CALL tp_update()
+thread_id	          9	         12	statement/sql/call_proced	                  4	TRANSACTION       	CALL tp_update()
 thread_id	         10	         10	transaction              	                  9	STATEMENT         	<transaction started>
-thread_id	         10	         12	transaction              	                  9	STATEMENT         	<transaction started>
-thread_id	         11	         11	statement/sp/stmt        	                  9	STATEMENT         	UPDATE t1 SET s1 = s1 + 1
-thread_id	         12	         12	statement/sql/commit     	               NULL	NULL              	COMMIT
+thread_id	         11	         11	transaction              	                  9	STATEMENT         	<transaction started>
+thread_id	         11	         13	transaction              	                  9	STATEMENT         	<transaction started>
+thread_id	         12	         12	statement/sp/stmt        	                  9	STATEMENT         	UPDATE t1 SET s1 = s1 + 1
+thread_id	         13	         13	statement/sql/commit     	               NULL	NULL              	COMMIT
 #
 ### Clear statement and transaction history
 # CALL test.clear_history();
@@ -468,7 +470,7 @@ FROM performance_schema.events_transactions_current
 WHERE ((THREAD_ID = @con1_thread_id) OR (@all_threads = 1))
 ORDER BY thread_id, event_id;
 THREAD_ID	R_EVENT_ID	R_END_EVENT_ID	EVENT_NAME 	STATE      	ACCESS_MODE	ISOLATION_LEVEL 	AUTO	R_NESTING_EVENT_ID	NESTING_EVENT_TYPE
-thread_id	          6	         11	transaction	COMMITTED  	READ WRITE 	REPEATABLE READ 	NO  	                  5	STATEMENT         
+thread_id	          7	         12	transaction	COMMITTED  	READ WRITE 	REPEATABLE READ 	NO  	                  6	STATEMENT         
 #
 # EVENTS_TRANSACTIONS_HISTORY_LONG
 #
@@ -488,7 +490,8 @@ ORDER BY thread_id, event_id;
 THREAD_ID	R_EVENT_ID	R_END_EVENT_ID	EVENT_NAME 	STATE      	ACCESS_MODE	ISOLATION_LEVEL 	AUTO	R_NESTING_EVENT_ID	NESTING_EVENT_TYPE
 thread_id	          2	          2	transaction	COMMITTED  	READ WRITE 	REPEATABLE READ 	YES 	                  1	STATEMENT         
 thread_id	          4	          4	transaction	COMMITTED  	READ WRITE 	REPEATABLE READ 	YES 	                  3	STATEMENT         
-thread_id	          6	         11	transaction	COMMITTED  	READ WRITE 	REPEATABLE READ 	NO  	                  5	STATEMENT         
+thread_id	          5	          5	transaction	COMMITTED  	READ WRITE 	REPEATABLE READ 	YES 	                  3	STATEMENT         
+thread_id	          7	         12	transaction	COMMITTED  	READ WRITE 	REPEATABLE READ 	NO  	                  6	STATEMENT         
 #
 # EVENTS_STATEMENTS_HISTORY_LONG
 #
@@ -506,13 +509,13 @@ WHERE ((THREAD_ID = @con1_thread_id) OR (@all_threads = 1))
 ORDER BY thread_id, event_id;
 THREAD_ID	R_EVENT_ID	R_END_EVENT_ID	EVENT_NAME                    	OBJECT_NAME 	R_NESTING_EVENT_ID	NESTING_EVENT_TYPE	LEVEL	SQL_TEXT
 thread_id	          1	          2	statement/sql/create_procedure	NULL        	               NULL	NULL              	    0	CREATE PROCEDURE tp_start() START TRANSACTION
-thread_id	          3	          6	statement/sql/call_procedure  	NULL        	               NULL	NULL              	    0	CALL tp_start()
-thread_id	          5	          6	statement/sp/stmt             	tp_start    	                  3	STATEMENT         	    1	START TRANSACTION
-thread_id	          7	          7	statement/sql/insert          	NULL        	                  6	TRANSACTION       	    0	INSERT INTO t1 VALUES (320, "INSERT 320"),(321, "INSERT 321")
-thread_id	          8	          8	statement/sql/insert          	NULL        	                  6	TRANSACTION       	    0	INSERT INTO t1 VALUES (322, "INSERT 322"),(323, "INSERT 323")
-thread_id	          9	          9	statement/sql/update          	NULL        	                  6	TRANSACTION       	    0	UPDATE t1 SET s1 = s1 + 1 WHERE s1 > 320
-thread_id	         10	         10	statement/sql/select          	NULL        	                  6	TRANSACTION       	    0	SELECT * FROM t1 ORDER BY s1
-thread_id	         11	         11	statement/sql/commit          	NULL        	                  6	TRANSACTION       	    0	COMMIT
+thread_id	          3	          7	statement/sql/call_procedure  	NULL        	               NULL	NULL              	    0	CALL tp_start()
+thread_id	          6	          7	statement/sp/stmt             	tp_start    	                  3	STATEMENT         	    1	START TRANSACTION
+thread_id	          8	          8	statement/sql/insert          	NULL        	                  7	TRANSACTION       	    0	INSERT INTO t1 VALUES (320, "INSERT 320"),(321, "INSERT 321")
+thread_id	          9	          9	statement/sql/insert          	NULL        	                  7	TRANSACTION       	    0	INSERT INTO t1 VALUES (322, "INSERT 322"),(323, "INSERT 323")
+thread_id	         10	         10	statement/sql/update          	NULL        	                  7	TRANSACTION       	    0	UPDATE t1 SET s1 = s1 + 1 WHERE s1 > 320
+thread_id	         11	         11	statement/sql/select          	NULL        	                  7	TRANSACTION       	    0	SELECT * FROM t1 ORDER BY s1
+thread_id	         12	         12	statement/sql/commit          	NULL        	                  7	TRANSACTION       	    0	COMMIT
 #
 ### Combined statement and transaction event history ordered by event id
 #
@@ -541,15 +544,16 @@ ORDER BY thread_id, r_event_id;
 THREAD_ID	R_EVENT_ID	R_END_EVENT_ID	EVENT_NAME               	R_NESTING_EVENT_ID	NESTING_EVENT_TYPE	SQL_TXT
 thread_id	          1	          2	statement/sql/create_proc	               NULL	NULL              	CREATE PROCEDURE tp_start() START TRANSACTION
 thread_id	          2	          2	transaction              	                  1	STATEMENT         	<transaction started>
-thread_id	          3	          6	statement/sql/call_proced	               NULL	NULL              	CALL tp_start()
+thread_id	          3	          7	statement/sql/call_proced	               NULL	NULL              	CALL tp_start()
 thread_id	          4	          4	transaction              	                  3	STATEMENT         	<transaction started>
-thread_id	          5	          6	statement/sp/stmt        	                  3	STATEMENT         	START TRANSACTION
-thread_id	          6	         11	transaction              	                  5	STATEMENT         	<transaction started>
-thread_id	          7	          7	statement/sql/insert     	                  6	TRANSACTION       	INSERT INTO t1 VALUES (320, "INSERT 320"),(321, "INSERT 321")
-thread_id	          8	          8	statement/sql/insert     	                  6	TRANSACTION       	INSERT INTO t1 VALUES (322, "INSERT 322"),(323, "INSERT 323")
-thread_id	          9	          9	statement/sql/update     	                  6	TRANSACTION       	UPDATE t1 SET s1 = s1 + 1 WHERE s1 > 320
-thread_id	         10	         10	statement/sql/select     	                  6	TRANSACTION       	SELECT * FROM t1 ORDER BY s1
-thread_id	         11	         11	statement/sql/commit     	                  6	TRANSACTION       	COMMIT
+thread_id	          5	          5	transaction              	                  3	STATEMENT         	<transaction started>
+thread_id	          6	          7	statement/sp/stmt        	                  3	STATEMENT         	START TRANSACTION
+thread_id	          7	         12	transaction              	                  6	STATEMENT         	<transaction started>
+thread_id	          8	          8	statement/sql/insert     	                  7	TRANSACTION       	INSERT INTO t1 VALUES (320, "INSERT 320"),(321, "INSERT 321")
+thread_id	          9	          9	statement/sql/insert     	                  7	TRANSACTION       	INSERT INTO t1 VALUES (322, "INSERT 322"),(323, "INSERT 323")
+thread_id	         10	         10	statement/sql/update     	                  7	TRANSACTION       	UPDATE t1 SET s1 = s1 + 1 WHERE s1 > 320
+thread_id	         11	         11	statement/sql/select     	                  7	TRANSACTION       	SELECT * FROM t1 ORDER BY s1
+thread_id	         12	         12	statement/sql/commit     	                  7	TRANSACTION       	COMMIT
 #
 ### Clear statement and transaction history
 # CALL test.clear_history();
@@ -617,7 +621,7 @@ FROM performance_schema.events_transactions_current
 WHERE ((THREAD_ID = @con1_thread_id) OR (@all_threads = 1))
 ORDER BY thread_id, event_id;
 THREAD_ID	R_EVENT_ID	R_END_EVENT_ID	EVENT_NAME 	STATE      	ACCESS_MODE	ISOLATION_LEVEL 	AUTO	R_NESTING_EVENT_ID	NESTING_EVENT_TYPE
-thread_id	         22	         22	transaction	COMMITTED  	READ WRITE 	REPEATABLE READ 	YES 	                 21	STATEMENT         
+thread_id	         24	         24	transaction	COMMITTED  	READ WRITE 	REPEATABLE READ 	YES 	                 23	STATEMENT         
 #
 # EVENTS_TRANSACTIONS_HISTORY_LONG
 #
@@ -638,11 +642,13 @@ THREAD_ID	R_EVENT_ID	R_END_EVENT_ID	EVENT_NAME 	STATE      	ACCESS_MODE	ISOLATIO
 thread_id	          2	          2	transaction	COMMITTED  	READ WRITE 	REPEATABLE READ 	YES 	                  1	STATEMENT         
 thread_id	          4	          4	transaction	COMMITTED  	READ WRITE 	REPEATABLE READ 	YES 	                  3	STATEMENT         
 thread_id	         11	         11	transaction	COMMITTED  	READ WRITE 	REPEATABLE READ 	NO  	                 10	STATEMENT         
-thread_id	         11	         12	transaction	COMMITTED  	READ WRITE 	REPEATABLE READ 	NO  	                 10	STATEMENT         
-thread_id	         14	         14	transaction	COMMITTED  	READ WRITE 	REPEATABLE READ 	YES 	                 13	STATEMENT         
-thread_id	         19	         19	transaction	COMMITTED  	READ WRITE 	REPEATABLE READ 	NO  	                 18	STATEMENT         
-thread_id	         19	         20	transaction	ROLLED BACK	READ WRITE 	REPEATABLE READ 	NO  	                 18	STATEMENT         
-thread_id	         22	         22	transaction	COMMITTED  	READ WRITE 	REPEATABLE READ 	YES 	                 21	STATEMENT         
+thread_id	         12	         12	transaction	COMMITTED  	READ WRITE 	REPEATABLE READ 	NO  	                 10	STATEMENT         
+thread_id	         12	         13	transaction	COMMITTED  	READ WRITE 	REPEATABLE READ 	NO  	                 10	STATEMENT         
+thread_id	         15	         15	transaction	COMMITTED  	READ WRITE 	REPEATABLE READ 	YES 	                 14	STATEMENT         
+thread_id	         20	         20	transaction	COMMITTED  	READ WRITE 	REPEATABLE READ 	NO  	                 19	STATEMENT         
+thread_id	         21	         21	transaction	COMMITTED  	READ WRITE 	REPEATABLE READ 	NO  	                 19	STATEMENT         
+thread_id	         21	         22	transaction	ROLLED BACK	READ WRITE 	REPEATABLE READ 	NO  	                 19	STATEMENT         
+thread_id	         24	         24	transaction	COMMITTED  	READ WRITE 	REPEATABLE READ 	YES 	                 23	STATEMENT         
 #
 # EVENTS_STATEMENTS_HISTORY_LONG
 #
@@ -665,14 +671,14 @@ thread_id	          5	          6	statement/sql/begin           	NULL
 thread_id	          7	          7	statement/sql/insert          	NULL        	                  6	TRANSACTION       	    0	INSERT INTO t1 VALUES (330, "INSERT 330"),(331, "INSERT 331")
 thread_id	          8	          8	statement/sql/insert          	NULL        	                  6	TRANSACTION       	    0	INSERT INTO t1 VALUES (332, "INSERT 332"),(333, "INSERT 333")
 thread_id	          9	          9	statement/sql/delete          	NULL        	                  6	TRANSACTION       	    0	DELETE FROM t1 WHERE s1 > 331
-thread_id	         10	         12	statement/sql/call_procedure  	NULL        	                  6	TRANSACTION       	    0	CALL tp_commit()
-thread_id	         12	         12	statement/sp/stmt             	tp_commit   	                 10	STATEMENT         	    1	COMMIT
-thread_id	         13	         14	statement/sql/select          	NULL        	               NULL	NULL              	    0	SELECT * FROM t1 ORDER BY s1
-thread_id	         15	         16	statement/sql/begin           	NULL        	               NULL	NULL              	    0	START TRANSACTION
-thread_id	         17	         17	statement/sql/update          	NULL        	                 16	TRANSACTION       	    0	UPDATE t1 SET s1 = s1*2 WHERE s1 > 331
-thread_id	         18	         20	statement/sql/call_procedure  	NULL        	                 16	TRANSACTION       	    0	CALL tp_rollback()
-thread_id	         20	         20	statement/sp/stmt             	tp_rollback 	                 18	STATEMENT         	    1	ROLLBACK
-thread_id	         21	         22	statement/sql/select          	NULL        	               NULL	NULL              	    0	SELECT * FROM t1 ORDER BY s1
+thread_id	         10	         13	statement/sql/call_procedure  	NULL        	                  6	TRANSACTION       	    0	CALL tp_commit()
+thread_id	         13	         13	statement/sp/stmt             	tp_commit   	                 10	STATEMENT         	    1	COMMIT
+thread_id	         14	         15	statement/sql/select          	NULL        	               NULL	NULL              	    0	SELECT * FROM t1 ORDER BY s1
+thread_id	         16	         17	statement/sql/begin           	NULL        	               NULL	NULL              	    0	START TRANSACTION
+thread_id	         18	         18	statement/sql/update          	NULL        	                 17	TRANSACTION       	    0	UPDATE t1 SET s1 = s1*2 WHERE s1 > 331
+thread_id	         19	         22	statement/sql/call_procedure  	NULL        	                 17	TRANSACTION       	    0	CALL tp_rollback()
+thread_id	         22	         22	statement/sp/stmt             	tp_rollback 	                 19	STATEMENT         	    1	ROLLBACK
+thread_id	         23	         24	statement/sql/select          	NULL        	               NULL	NULL              	    0	SELECT * FROM t1 ORDER BY s1
 #
 ### Combined statement and transaction event history ordered by event id
 #
@@ -707,20 +713,22 @@ thread_id	          5	          6	statement/sql/begin      	               NULL
 thread_id	          7	          7	statement/sql/insert     	                  6	TRANSACTION       	INSERT INTO t1 VALUES (330, "INSERT 330"),(331, "INSERT 331")
 thread_id	          8	          8	statement/sql/insert     	                  6	TRANSACTION       	INSERT INTO t1 VALUES (332, "INSERT 332"),(333, "INSERT 333")
 thread_id	          9	          9	statement/sql/delete     	                  6	TRANSACTION       	DELETE FROM t1 WHERE s1 > 331
-thread_id	         10	         12	statement/sql/call_proced	                  6	TRANSACTION       	CALL tp_commit()
+thread_id	         10	         13	statement/sql/call_proced	                  6	TRANSACTION       	CALL tp_commit()
 thread_id	         11	         11	transaction              	                 10	STATEMENT         	<transaction started>
-thread_id	         11	         12	transaction              	                 10	STATEMENT         	<transaction started>
-thread_id	         12	         12	statement/sp/stmt        	                 10	STATEMENT         	COMMIT
-thread_id	         13	         14	statement/sql/select     	               NULL	NULL              	SELECT * FROM t1 ORDER BY s1
-thread_id	         14	         14	transaction              	                 13	STATEMENT         	<transaction started>
-thread_id	         15	         16	statement/sql/begin      	               NULL	NULL              	START TRANSACTION
-thread_id	         17	         17	statement/sql/update     	                 16	TRANSACTION       	UPDATE t1 SET s1 = s1*2 WHERE s1 > 331
-thread_id	         18	         20	statement/sql/call_proced	                 16	TRANSACTION       	CALL tp_rollback()
-thread_id	         19	         19	transaction              	                 18	STATEMENT         	<transaction started>
-thread_id	         19	         20	transaction              	                 18	STATEMENT         	<transaction started>
-thread_id	         20	         20	statement/sp/stmt        	                 18	STATEMENT         	ROLLBACK
-thread_id	         21	         22	statement/sql/select     	               NULL	NULL              	SELECT * FROM t1 ORDER BY s1
-thread_id	         22	         22	transaction              	                 21	STATEMENT         	<transaction started>
+thread_id	         12	         12	transaction              	                 10	STATEMENT         	<transaction started>
+thread_id	         12	         13	transaction              	                 10	STATEMENT         	<transaction started>
+thread_id	         13	         13	statement/sp/stmt        	                 10	STATEMENT         	COMMIT
+thread_id	         14	         15	statement/sql/select     	               NULL	NULL              	SELECT * FROM t1 ORDER BY s1
+thread_id	         15	         15	transaction              	                 14	STATEMENT         	<transaction started>
+thread_id	         16	         17	statement/sql/begin      	               NULL	NULL              	START TRANSACTION
+thread_id	         18	         18	statement/sql/update     	                 17	TRANSACTION       	UPDATE t1 SET s1 = s1*2 WHERE s1 > 331
+thread_id	         19	         22	statement/sql/call_proced	                 17	TRANSACTION       	CALL tp_rollback()
+thread_id	         20	         20	transaction              	                 19	STATEMENT         	<transaction started>
+thread_id	         21	         21	transaction              	                 19	STATEMENT         	<transaction started>
+thread_id	         21	         22	transaction              	                 19	STATEMENT         	<transaction started>
+thread_id	         22	         22	statement/sp/stmt        	                 19	STATEMENT         	ROLLBACK
+thread_id	         23	         24	statement/sql/select     	               NULL	NULL              	SELECT * FROM t1 ORDER BY s1
+thread_id	         24	         24	transaction              	                 23	STATEMENT         	<transaction started>
 #
 ### Clear statement and transaction history
 # CALL test.clear_history();
@@ -799,7 +807,7 @@ FROM performance_schema.events_transactions_current
 WHERE ((THREAD_ID = @con1_thread_id) OR (@all_threads = 1))
 ORDER BY thread_id, event_id;
 THREAD_ID	R_EVENT_ID	R_END_EVENT_ID	EVENT_NAME 	STATE      	ACCESS_MODE	ISOLATION_LEVEL 	AUTO	R_NESTING_EVENT_ID	NESTING_EVENT_TYPE
-thread_id	         14	         14	transaction	COMMITTED  	READ WRITE 	REPEATABLE READ 	YES 	                 13	STATEMENT         
+thread_id	         15	         15	transaction	COMMITTED  	READ WRITE 	REPEATABLE READ 	YES 	                 14	STATEMENT         
 #
 # EVENTS_TRANSACTIONS_HISTORY_LONG
 #
@@ -818,8 +826,9 @@ WHERE ((THREAD_ID = @con1_thread_id) OR (@all_threads = 1))
 ORDER BY thread_id, event_id;
 THREAD_ID	R_EVENT_ID	R_END_EVENT_ID	EVENT_NAME 	STATE      	ACCESS_MODE	ISOLATION_LEVEL 	AUTO	R_NESTING_EVENT_ID	NESTING_EVENT_TYPE
 thread_id	          9	          9	transaction	COMMITTED  	READ WRITE 	REPEATABLE READ 	NO  	                  8	STATEMENT         
-thread_id	          9	         12	transaction	COMMITTED  	READ WRITE 	REPEATABLE READ 	NO  	                  8	STATEMENT         
-thread_id	         14	         14	transaction	COMMITTED  	READ WRITE 	REPEATABLE READ 	YES 	                 13	STATEMENT         
+thread_id	         10	         10	transaction	COMMITTED  	READ WRITE 	REPEATABLE READ 	NO  	                  8	STATEMENT         
+thread_id	         10	         13	transaction	COMMITTED  	READ WRITE 	REPEATABLE READ 	NO  	                  8	STATEMENT         
+thread_id	         15	         15	transaction	COMMITTED  	READ WRITE 	REPEATABLE READ 	YES 	                 14	STATEMENT         
 #
 # EVENTS_STATEMENTS_HISTORY_LONG
 #
@@ -842,11 +851,11 @@ thread_id	          4	          4	statement/sql/insert          	NULL
 thread_id	          5	          5	statement/sql/insert          	NULL        	                  2	TRANSACTION       	    0	INSERT INTO t1 VALUES (412, "INSERT 412")
 thread_id	          6	          6	statement/sql/delete          	NULL        	                  2	TRANSACTION       	    0	DELETE FROM t1 WHERE s1 > 410
 thread_id	          7	          7	statement/sql/select          	NULL        	                  2	TRANSACTION       	    0	SELECT * FROM t1 ORDER BY s1
-thread_id	          8	         11	statement/sql/select          	NULL        	                  2	TRANSACTION       	    0	SELECT fn_add(413, 414)
-thread_id	         10	         10	statement/sp/stmt             	fn_add      	                  8	STATEMENT         	    1	INSERT INTO t1 VALUES (x, "INSERT x"),(y, "INSERT y")
-thread_id	         11	         11	statement/sp/freturn          	fn_add      	                  8	STATEMENT         	    1	NULL
-thread_id	         12	         12	statement/sql/commit          	NULL        	               NULL	NULL              	    0	COMMIT
-thread_id	         13	         14	statement/sql/select          	NULL        	               NULL	NULL              	    0	SELECT * FROM t1 ORDER BY s1
+thread_id	          8	         12	statement/sql/select          	NULL        	                  2	TRANSACTION       	    0	SELECT fn_add(413, 414)
+thread_id	         11	         11	statement/sp/stmt             	fn_add      	                  8	STATEMENT         	    1	INSERT INTO t1 VALUES (x, "INSERT x"),(y, "INSERT y")
+thread_id	         12	         12	statement/sp/freturn          	fn_add      	                  8	STATEMENT         	    1	NULL
+thread_id	         13	         13	statement/sql/commit          	NULL        	               NULL	NULL              	    0	COMMIT
+thread_id	         14	         15	statement/sql/select          	NULL        	               NULL	NULL              	    0	SELECT * FROM t1 ORDER BY s1
 #
 ### Combined statement and transaction event history ordered by event id
 #
@@ -879,14 +888,15 @@ thread_id	          4	          4	statement/sql/insert     	                  2
 thread_id	          5	          5	statement/sql/insert     	                  2	TRANSACTION       	INSERT INTO t1 VALUES (412, "INSERT 412")
 thread_id	          6	          6	statement/sql/delete     	                  2	TRANSACTION       	DELETE FROM t1 WHERE s1 > 410
 thread_id	          7	          7	statement/sql/select     	                  2	TRANSACTION       	SELECT * FROM t1 ORDER BY s1
-thread_id	          8	         11	statement/sql/select     	                  2	TRANSACTION       	SELECT fn_add(413, 414)
+thread_id	          8	         12	statement/sql/select     	                  2	TRANSACTION       	SELECT fn_add(413, 414)
 thread_id	          9	          9	transaction              	                  8	STATEMENT         	<transaction started>
-thread_id	          9	         12	transaction              	                  8	STATEMENT         	<transaction started>
-thread_id	         10	         10	statement/sp/stmt        	                  8	STATEMENT         	INSERT INTO t1 VALUES (x, "INSERT x"),(y, "INSERT y")
-thread_id	         11	         11	statement/sp/freturn     	                  8	STATEMENT         	NULL
-thread_id	         12	         12	statement/sql/commit     	               NULL	NULL              	COMMIT
-thread_id	         13	         14	statement/sql/select     	               NULL	NULL              	SELECT * FROM t1 ORDER BY s1
-thread_id	         14	         14	transaction              	                 13	STATEMENT         	<transaction started>
+thread_id	         10	         10	transaction              	                  8	STATEMENT         	<transaction started>
+thread_id	         10	         13	transaction              	                  8	STATEMENT         	<transaction started>
+thread_id	         11	         11	statement/sp/stmt        	                  8	STATEMENT         	INSERT INTO t1 VALUES (x, "INSERT x"),(y, "INSERT y")
+thread_id	         12	         12	statement/sp/freturn     	                  8	STATEMENT         	NULL
+thread_id	         13	         13	statement/sql/commit     	               NULL	NULL              	COMMIT
+thread_id	         14	         15	statement/sql/select     	               NULL	NULL              	SELECT * FROM t1 ORDER BY s1
+thread_id	         15	         15	transaction              	                 14	STATEMENT         	<transaction started>
 #
 ### Clear statement and transaction history
 # CALL test.clear_history();
@@ -1045,7 +1055,7 @@ ERROR 42000: FUNCTION db.fn_err1 does not exist
 connection default;
 SELECT COUNT(*) FROM performance_schema.events_transactions_history;
 COUNT(*)
-1
+2
 connection con1;
 #
 CREATE FUNCTION fn_err2() RETURNS VARCHAR(10) BEGIN COMMIT; RETURN 'invalid' ; END|
@@ -1062,7 +1072,7 @@ ERROR 42000: FUNCTION db.fn_err2 does not exist
 connection default;
 SELECT COUNT(*) FROM performance_schema.events_transactions_history;
 COUNT(*)
-2
+4
 #
 ## Clear transaction and statement tables
 CALL test.clear_history();
diff --git a/mysql-test/suite/plugins/r/audit_null.result b/mysql-test/suite/plugins/r/audit_null.result
index debd6634586a9..f3206941b588c 100644
--- a/mysql-test/suite/plugins/r/audit_null.result
+++ b/mysql-test/suite/plugins/r/audit_null.result
@@ -21,7 +21,7 @@ concat("test1", x)
 test1-12
 show status like 'audit_null%';
 Variable_name	Value
-Audit_null_called	22
+Audit_null_called	23
 Audit_null_general_error	1
 Audit_null_general_log	7
 Audit_null_general_result	5
@@ -70,6 +70,7 @@ root[root] @ localhost []	>> create procedure au1(x char(16)) select concat("tes
 root[root] @ localhost []	mysql.proc : write
 root[root] @ localhost []	>> call au1("-12")
 root[root] @ localhost []	mysql.proc : read
+root[root] @ localhost []	mysql.proc : read
 root[root] @ localhost []	>> select concat("test1",  NAME_CONST('x',_utf8mb4'-12' COLLATE 'utf8mb4_uca1400_ai_ci'))
 root[root] @ localhost []	>> show status like 'audit_null%'
 root[root] @ localhost []	>> create table t1 (a int)
diff --git a/mysql-test/suite/sys_vars/r/path_basic.result b/mysql-test/suite/sys_vars/r/path_basic.result
new file mode 100644
index 0000000000000..467fb635c21a6
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/path_basic.result
@@ -0,0 +1,537 @@
+SET NAMES utf8;
+SELECT @@session.path;
+@@session.path
+
+SELECT @@global.path;
+@@global.path
+
+SET @@global.path= '.,sys';
+SET @@session.path= DEFAULT;
+SET @start_global_value = @@global.path;
+SELECT @start_global_value;
+@start_global_value
+`.`,`sys`
+SET @start_session_value = @@session.path;
+SELECT @start_session_value;
+@start_session_value
+`.`,`sys`
+'#'
+'#--- Test Variable access and assignment with and without @@ ---#'
+'#'
+SELECT path;
+ERROR 42S22: Unknown column 'path' in 'SELECT'
+SELECT session.path;
+ERROR 42S02: Unknown table 'session' in SELECT
+SELECT session path;
+ERROR 42S22: Unknown column 'session' in 'SELECT'
+SELECT @@session path;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'path' at line 1
+SELECT global.path;
+ERROR 42S02: Unknown table 'global' in SELECT
+SELECT global path;
+ERROR 42S22: Unknown column 'global' in 'SELECT'
+SELECT @@global path;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'path' at line 1
+SELECT @@path;
+@@path
+`.`,`sys`
+SELECT @@session.path;
+@@session.path
+`.`,`sys`
+SELECT @@global.path;
+@@global.path
+`.`,`sys`
+SET @@session.path='aaa';
+SELECT @@session.path;
+@@session.path
+`aaa`
+SET session path='bbb';
+SELECT @@session.path;
+@@session.path
+`bbb`
+SET @@global.path='ccc';
+SELECT @@global.path;
+@@global.path
+`ccc`
+SET global path='ddd';
+SELECT @@global.path;
+@@global.path
+`ddd`
+'#'
+'#--- Check the DEFAULT value of path ---#'
+'#'
+SET @@global.path = 'aaa';
+SET @@global.path = DEFAULT;
+SELECT @@global.path;
+@@global.path
+
+SET @@global.path= '.,sys';
+SET @@session.path = 'abc';
+SET @@session.path = DEFAULT;
+SELECT @@session.path;
+@@session.path
+`.`,`sys`
+SET @@path = 'def';
+SET @@path = DEFAULT;
+SELECT @@path;
+@@path
+`.`,`sys`
+'#'
+'#--- Change the value of path to a valid value ---#'
+'#'
+SET PATH= '.';
+SELECT @@path;
+@@path
+`.`
+SET PATH= '  a   ';
+SELECT @@path;
+@@path
+`a`
+SET PATH= '`c`';
+SELECT @@path;
+@@path
+`c`
+SET sql_mode=ORACLE;
+SET PATH= '"d"';
+SELECT @@path;
+@@path
+`d`
+SET sql_mode=DEFAULT;
+SET PATH= ',e';
+SELECT @@path;
+@@path
+`e`
+SET PATH= ',,f';
+SELECT @@path;
+@@path
+`f`
+SET PATH= ',,,g';
+SELECT @@path;
+@@path
+`g`
+SET PATH= 'h,';
+SELECT @@path;
+@@path
+`h`
+SET PATH= 'i,,';
+SELECT @@path;
+@@path
+`i`
+SET PATH= 'j,,,';
+SELECT @@path;
+@@path
+`j`
+SET PATH= 'a,b';
+SELECT @@path;
+@@path
+`a`,`b`
+SET PATH= 'b,cd';
+SELECT @@path;
+@@path
+`b`,`cd`
+SET PATH= 'bc,d';
+SELECT @@path;
+@@path
+`bc`,`d`
+SET PATH= 'b,,e';
+SELECT @@path;
+@@path
+`b`,`e`
+SET PATH= 'bc,,e';
+SELECT @@path;
+@@path
+`bc`,`e`
+SET PATH= 'b,,ef';
+SELECT @@path;
+@@path
+`b`,`ef`
+SET PATH= 'aaa';
+SELECT @@path;
+@@path
+`aaa`
+SET PATH= '`abc`';
+SELECT @@path;
+@@path
+`abc`
+SET sql_mode=ORACLE;
+SET PATH= '"bbb"';
+SELECT @@path;
+@@path
+`bbb`
+SET sql_mode=DEFAULT;
+SET PATH= 'ccc,';
+SELECT @@path;
+@@path
+`ccc`
+SET PATH= 'ddd,,';
+SELECT @@path;
+@@path
+`ddd`
+SET PATH= 'eee,,,';
+SELECT @@path;
+@@path
+`eee`
+SET PATH= ',ccc';
+SELECT @@path;
+@@path
+`ccc`
+SET PATH= ',,ddd';
+SELECT @@path;
+@@path
+`ddd`
+SET PATH= ',,,eee';
+SELECT @@path;
+@@path
+`eee`
+SET PATH= ',aaa,';
+SELECT @@path;
+@@path
+`aaa`
+SET PATH= ',bbb,,';
+SELECT @@path;
+@@path
+`bbb`
+SET PATH= ',,ccc,';
+SELECT @@path;
+@@path
+`ccc`
+SET PATH= 'z,aaa';
+SELECT @@path;
+@@path
+`z`,`aaa`
+SET PATH= 'aaa,z';
+SELECT @@path;
+@@path
+`aaa`,`z`
+SET PATH= '`z`,aaa';
+SELECT @@path;
+@@path
+`z`,`aaa`
+SET PATH= 'aaa,`z`';
+SELECT @@path;
+@@path
+`aaa`,`z`
+SET PATH= '  hello   ';
+SELECT @@path;
+@@path
+`hello`
+SET PATH= 'aaa,bbb';
+SELECT @@path;
+@@path
+`aaa`,`bbb`
+SET PATH= '   bbb,ccc  ';
+SELECT @@path;
+@@path
+`bbb`,`ccc`
+SET PATH= '`ccc`,ddd';
+SELECT @@path;
+@@path
+`ccc`,`ddd`
+SET PATH= 'ddd,`eee`';
+SELECT @@path;
+@@path
+`ddd`,`eee`
+SET PATH= '`eee`,`fff`';
+SELECT @@path;
+@@path
+`eee`,`fff`
+SET PATH= '    `fff`,`ggg`    ';
+SELECT @@path;
+@@path
+`fff`,`ggg`
+SET sql_mode=ORACLE;
+SET PATH= '"bbb"';
+SELECT @@path;
+@@path
+`bbb`
+SET PATH= '"ggg",hhh';
+SELECT @@path;
+@@path
+`ggg`,`hhh`
+SET PATH= 'hhh,`iii`,jjj,"kkk",lll';
+SELECT @@path;
+@@path
+`hhh`,`iii`,`jjj`,`kkk`,`lll`
+SET PATH= 'test,sys,ccc,ddd,eee,fff,ggg,hhh';
+SELECT @@path;
+@@path
+`test`,`sys`,`ccc`,`ddd`,`eee`,`fff`,`ggg`,`hhh`
+SET PATH= ',,,test,,,sys,,,';
+SELECT @@path;
+@@path
+`test`,`sys`
+SET PATH= '  ,,,aaa,,,bbb,,,  ';
+SELECT @@path;
+@@path
+`aaa`,`bbb`
+SET PATH= 'hello,world,deadpool,wolverine,aaa,ccc';
+SELECT @@path;
+@@path
+`hello`,`world`,`deadpool`,`wolverine`,`aaa`,`ccc`
+SET PATH= '`a,b`,c';
+SELECT @@path;
+@@path
+`a,b`,`c`
+SET PATH= 'ß';
+SELECT @@path;
+@@path
+`ß`
+SET PATH= '`Œ`';
+SELECT @@path;
+@@path
+`Œ`
+SET PATH= '"Ɣ"';
+SELECT @@path;
+@@path
+`Ɣ`
+SET PATH= ',ß';
+SELECT @@path;
+@@path
+`ß`
+SET PATH= ',,Œ';
+SELECT @@path;
+@@path
+`Œ`
+SET PATH= ',,,Ɣ';
+SELECT @@path;
+@@path
+`Ɣ`
+SET PATH= 'ß,';
+SELECT @@path;
+@@path
+`ß`
+SET PATH= 'Œ,,';
+SELECT @@path;
+@@path
+`Œ`
+SET PATH= 'Ɣ,,,';
+SELECT @@path;
+@@path
+`Ɣ`
+SET PATH= ',ß,';
+SELECT @@path;
+@@path
+`ß`
+SET PATH= 'a,ß';
+SELECT @@path;
+@@path
+`a`,`ß`
+SET PATH= 'ß,c';
+SELECT @@path;
+@@path
+`ß`,`c`
+SET PATH= 'ã,ß';
+SELECT @@path;
+@@path
+`ã`,`ß`
+SET PATH= ',Œ,Ɣ,';
+SELECT @@path;
+@@path
+`Œ`,`Ɣ`
+SET PATH= ',ã,ß';
+SELECT @@path;
+@@path
+`ã`,`ß`
+SET PATH= 'Œ,Ɣ,';
+SELECT @@path;
+@@path
+`Œ`,`Ɣ`
+SET PATH= 'aß';
+SELECT @@path;
+@@path
+`aß`
+SET PATH= 'ßc';
+SELECT @@path;
+@@path
+`ßc`
+SET PATH= 'ßĉ';
+SELECT @@path;
+@@path
+`ßĉ`
+SET PATH= 'abc';
+SELECT @@path;
+@@path
+`abc`
+SET PATH= 'ãbc';
+SELECT @@path;
+@@path
+`ãbc`
+SET PATH= 'ãßc';
+SELECT @@path;
+@@path
+`ãßc`
+SET PATH= 'ãßĉ';
+SELECT @@path;
+@@path
+`ãßĉ`
+SET PATH= 'aßc';
+SELECT @@path;
+@@path
+`aßc`
+SET PATH= 'aßĉ';
+SELECT @@path;
+@@path
+`aßĉ`
+SET PATH= 'abĉ';
+SELECT @@path;
+@@path
+`abĉ`
+SET PATH= 'ãbĉ';
+SELECT @@path;
+@@path
+`ãbĉ`
+SET PATH= 'ãßĉ,';
+SELECT @@path;
+@@path
+`ãßĉ`
+SET PATH= 'a,ãßĉ';
+SELECT @@path;
+@@path
+`a`,`ãßĉ`
+SET PATH= 'ãßĉ,d';
+SELECT @@path;
+@@path
+`ãßĉ`,`d`
+SET PATH= ',ãßĉ,';
+SELECT @@path;
+@@path
+`ãßĉ`
+SET PATH= 'a,ãßĉ,d';
+SELECT @@path;
+@@path
+`a`,`ãßĉ`,`d`
+SET PATH= 'a,ãßĉ,Œ';
+SELECT @@path;
+@@path
+`a`,`ãßĉ`,`Œ`
+SET PATH= 'Ɣ,ãßĉ,d';
+SELECT @@path;
+@@path
+`Ɣ`,`ãßĉ`,`d`
+SET PATH= 'Ɣ,ãßĉ,Œ';
+SELECT @@path;
+@@path
+`Ɣ`,`ãßĉ`,`Œ`
+'#'
+'#--- Change the value of path to an invalid value ---#'
+'#'
+SET sql_mode=DEFAULT;
+SET @@session.path = @start_session_value;
+SELECT @@session.path;
+@@session.path
+`.`,`sys`
+SET @@global.path = @start_global_value;
+SELECT @@global.path;
+@@global.path
+`.`,`sys`
+SET PATH= '`';
+ERROR HY000: Invalid schema list specification
+SET PATH= '"';
+ERROR HY000: Invalid schema list specification
+SET PATH= '`a';
+ERROR HY000: Invalid schema list specification
+SET PATH= '"a';
+ERROR HY000: Invalid schema list specification
+SET PATH= 'a`';
+ERROR HY000: Invalid schema list specification
+SET PATH= 'a"';
+ERROR HY000: Invalid schema list specification
+SET PATH= '"d"';
+ERROR HY000: Invalid schema list specification
+SET PATH= '`aaa';
+ERROR HY000: Invalid schema list specification
+SET PATH= 'aaa`';
+ERROR HY000: Invalid schema list specification
+SET PATH= '"aaa';
+ERROR HY000: Invalid schema list specification
+SET PATH= 'aaa"';
+ERROR HY000: Invalid schema list specification
+SET PATH= '`aaa"';
+ERROR HY000: Invalid schema list specification
+SET PATH= '"aaa`';
+ERROR HY000: Invalid schema list specification
+SET PATH= '"ggg,hhh';
+ERROR HY000: Invalid schema list specification
+SET PATH= 'ggg",hhh';
+ERROR HY000: Invalid schema list specification
+SET PATH= '"ggg",hhh';
+ERROR HY000: Invalid schema list specification
+SET PATH= 'hhh,`iii`,jjj,"kkk",lll';
+ERROR HY000: Invalid schema list specification
+SET PATH= 'hello,world,deadpool,wolverine,aaa,deadpool,ccc';
+ERROR HY000: Invalid schema list specification
+SET PATH= '`,Ɣ';
+ERROR HY000: Invalid schema list specification
+SET PATH= '",Ɣ';
+ERROR HY000: Invalid schema list specification
+SET PATH= 'Ɣ,`';
+ERROR HY000: Invalid schema list specification
+SET PATH= 'Ɣ,"';
+ERROR HY000: Invalid schema list specification
+SET PATH= '`Œ';
+ERROR HY000: Invalid schema list specification
+SET PATH= '"c';
+ERROR HY000: Invalid schema list specification
+SET PATH= 'Œ`';
+ERROR HY000: Invalid schema list specification
+SET PATH= 'Œ"';
+ERROR HY000: Invalid schema list specification
+SET PATH= '`Œ"';
+ERROR HY000: Invalid schema list specification
+SET PATH= '"Œ`';
+ERROR HY000: Invalid schema list specification
+SET PATH= '"Ɣ"';
+ERROR HY000: Invalid schema list specification
+SELECT @@path;
+@@path
+`.`,`sys`
+#
+#--- Set path to empty string ---#
+#
+SET PATH= ' ';
+SET PATH= '    ';
+SET PATH= ',';
+SET PATH= '``';
+SET sql_mode=ANSI_QUOTES;
+SET PATH= '""';
+SET sql_mode=DEFAULT;
+'#'
+'#--- Test preparable statement ---#'
+'#'
+PREPARE stmt FROM 'SELECT \'I know what you did last summer\'';
+SET PATH= 'hello,world,mcdonald';
+SELECT @@path;
+@@path
+`hello`,`world`,`mcdonald`
+EXECUTE stmt;
+I know what you did last summer
+I know what you did last summer
+DEALLOCATE PREPARE stmt;
+SET GLOBAL PATH=DEFAULT;
+SET @@path=DEFAULT;
+#
+# path max limit (16 schemas)
+#
+SET PATH= 'a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p';
+SELECT @@path;
+@@path
+`a`,`b`,`c`,`d`,`e`,`f`,`g`,`h`,`i`,`j`,`k`,`l`,`m`,`n`,`o`,`p`
+SET PATH= 'a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q';
+ERROR 42000: Variable 'path' can't be set to the value of 'a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q'
+SELECT @@path;
+@@path
+`a`,`b`,`c`,`d`,`e`,`f`,`g`,`h`,`i`,`j`,`k`,`l`,`m`,`n`,`o`,`p`
+#
+# CURRENT_PATH
+#
+SET PATH= 'a,b';
+SELECT CURRENT_PATH();
+CURRENT_PATH()
+`a`,`b`
+SELECT CURRENT_PATH;
+CURRENT_PATH
+`a`,`b`
+SET PATH= DEFAULT;
+SELECT CURRENT_PATH;
+CURRENT_PATH
+
diff --git a/mysql-test/suite/sys_vars/r/path_priv.result b/mysql-test/suite/sys_vars/r/path_priv.result
new file mode 100644
index 0000000000000..204a84c628ca2
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/path_priv.result
@@ -0,0 +1,18 @@
+#
+# MDEV-34391: Check privilige for setting global path
+#
+CREATE USER priv_test;
+connect  conn1,localhost,priv_test,,;
+connection conn1;
+SET @@global.path= 'sys';
+ERROR 42000: Access denied; you need (at least one of) the SUPER privilege(s) for this operation
+SET @@path= 'sys';
+connection default;
+disconnect conn1;
+GRANT SUPER ON *.* TO priv_test;
+connect  conn1,localhost,priv_test,,;
+connection conn1;
+SET @@global.path= 'sys';
+connection default;
+DROP USER priv_test;
+SET @@global.path= DEFAULT;
diff --git a/mysql-test/suite/sys_vars/r/stored_program_cache_func,ps.rdiff b/mysql-test/suite/sys_vars/r/stored_program_cache_func,ps.rdiff
index f07e82c34724e..71d422c0acf17 100644
--- a/mysql-test/suite/sys_vars/r/stored_program_cache_func,ps.rdiff
+++ b/mysql-test/suite/sys_vars/r/stored_program_cache_func,ps.rdiff
@@ -4,15 +4,15 @@
  1
  show status like 'handler_read_key';
  Variable_name	Value
--Handler_read_key	2
-+Handler_read_key	3
+-Handler_read_key	4
++Handler_read_key	5
  call p1;
  1
  1
  show status like 'handler_read_key';
  Variable_name	Value
--Handler_read_key	3
-+Handler_read_key	5
+-Handler_read_key	6
++Handler_read_key	8
  drop procedure p1;
  set global stored_program_cache=default;
  create procedure pr(i int) begin
diff --git a/mysql-test/suite/sys_vars/r/stored_program_cache_func.result b/mysql-test/suite/sys_vars/r/stored_program_cache_func.result
index 13b15ea76bf1d..ea77ccffc4914 100644
--- a/mysql-test/suite/sys_vars/r/stored_program_cache_func.result
+++ b/mysql-test/suite/sys_vars/r/stored_program_cache_func.result
@@ -8,26 +8,26 @@ call p1;
 1
 show status like 'handler_read_key';
 Variable_name	Value
-Handler_read_key	1
+Handler_read_key	2
 call p1;
 1
 1
 show status like 'handler_read_key';
 Variable_name	Value
-Handler_read_key	1
+Handler_read_key	2
 set global stored_program_cache=0;
 call p1;
 1
 1
 show status like 'handler_read_key';
 Variable_name	Value
-Handler_read_key	2
+Handler_read_key	4
 call p1;
 1
 1
 show status like 'handler_read_key';
 Variable_name	Value
-Handler_read_key	3
+Handler_read_key	6
 drop procedure p1;
 set global stored_program_cache=default;
 create procedure pr(i int) begin
diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result b/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result
index 5a2046bb7cd5e..16f126e9cd66c 100644
--- a/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result
+++ b/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result
@@ -2692,6 +2692,16 @@ NUMERIC_BLOCK_SIZE	NULL
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	REQUIRED
+VARIABLE_NAME	PATH
+VARIABLE_SCOPE	SESSION
+VARIABLE_TYPE	VARCHAR
+VARIABLE_COMMENT	SET PATH statement
+NUMERIC_MIN_VALUE	NULL
+NUMERIC_MAX_VALUE	NULL
+NUMERIC_BLOCK_SIZE	NULL
+ENUM_VALUE_LIST	NULL
+READ_ONLY	NO
+COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	PERFORMANCE_SCHEMA
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	BOOLEAN
diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result
index 165c2bf9991fa..9a5646180a595 100644
--- a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result
+++ b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result
@@ -2902,6 +2902,16 @@ NUMERIC_BLOCK_SIZE	NULL
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	REQUIRED
+VARIABLE_NAME	PATH
+VARIABLE_SCOPE	SESSION
+VARIABLE_TYPE	VARCHAR
+VARIABLE_COMMENT	SET PATH statement
+NUMERIC_MIN_VALUE	NULL
+NUMERIC_MAX_VALUE	NULL
+NUMERIC_BLOCK_SIZE	NULL
+ENUM_VALUE_LIST	NULL
+READ_ONLY	NO
+COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	PERFORMANCE_SCHEMA
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	BOOLEAN
diff --git a/mysql-test/suite/sys_vars/t/path_basic.test b/mysql-test/suite/sys_vars/t/path_basic.test
new file mode 100644
index 0000000000000..73d4d3d75dd4e
--- /dev/null
+++ b/mysql-test/suite/sys_vars/t/path_basic.test
@@ -0,0 +1,367 @@
+--source include/load_sysvars.inc
+
+SET NAMES utf8;
+
+#############################################################
+#                 Show initial value                        #
+#############################################################
+SELECT @@session.path;
+SELECT @@global.path;
+
+#############################################################
+#                 Set paths to non-empty                    #
+#############################################################
+SET @@global.path= '.,sys';
+SET @@session.path= DEFAULT;
+
+#############################################################
+#                 Save initial value                        #
+#############################################################
+SET @start_global_value = @@global.path;
+SELECT @start_global_value;
+SET @start_session_value = @@session.path;
+SELECT @start_session_value;
+
+--echo '#'
+--echo '#--- Test Variable access and assignment with and without @@ ---#'
+--echo '#'
+###############################################################################
+#       Test Variable access and assignment with and without @@               #
+###############################################################################
+--Error ER_BAD_FIELD_ERROR
+SELECT path;
+--Error ER_UNKNOWN_TABLE
+SELECT session.path;
+--Error ER_BAD_FIELD_ERROR
+SELECT session path;
+--Error ER_PARSE_ERROR
+SELECT @@session path;
+--Error ER_UNKNOWN_TABLE
+SELECT global.path;
+--Error ER_BAD_FIELD_ERROR
+SELECT global path;
+--Error ER_PARSE_ERROR
+SELECT @@global path;
+SELECT @@path;
+SELECT @@session.path;
+SELECT @@global.path;
+SET @@session.path='aaa';
+SELECT @@session.path;
+SET session path='bbb';
+SELECT @@session.path;
+SET @@global.path='ccc';
+SELECT @@global.path;
+SET global path='ddd';
+SELECT @@global.path;
+
+--echo '#'
+--echo '#--- Check the DEFAULT value of path ---#'
+--echo '#'
+###########################################################################
+#                     Check the DEFAULT value of path                     #
+###########################################################################
+SET @@global.path = 'aaa';
+SET @@global.path = DEFAULT;
+SELECT @@global.path;
+SET @@global.path= '.,sys';
+SET @@session.path = 'abc';
+SET @@session.path = DEFAULT;
+SELECT @@session.path;
+SET @@path = 'def';
+SET @@path = DEFAULT;
+SELECT @@path;
+
+--echo '#'
+--echo '#--- Change the value of path to a valid value ---#'
+--echo '#'
+###########################################################################
+#                Change the value of path to a valid value                #
+###########################################################################
+SET PATH= '.';
+SELECT @@path;
+SET PATH= '  a   ';
+SELECT @@path;
+SET PATH= '`c`';
+SELECT @@path;
+SET sql_mode=ORACLE;
+SET PATH= '"d"';
+SELECT @@path;
+SET sql_mode=DEFAULT;
+SET PATH= ',e';
+SELECT @@path;
+SET PATH= ',,f';
+SELECT @@path;
+SET PATH= ',,,g';
+SELECT @@path;
+SET PATH= 'h,';
+SELECT @@path;
+SET PATH= 'i,,';
+SELECT @@path;
+SET PATH= 'j,,,';
+SELECT @@path;
+SET PATH= 'a,b';
+SELECT @@path;
+SET PATH= 'b,cd';
+SELECT @@path;
+SET PATH= 'bc,d';
+SELECT @@path;
+SET PATH= 'b,,e';
+SELECT @@path;
+SET PATH= 'bc,,e';
+SELECT @@path;
+SET PATH= 'b,,ef';
+SELECT @@path;
+SET PATH= 'aaa';
+SELECT @@path;
+SET PATH= '`abc`';
+SELECT @@path;
+SET sql_mode=ORACLE;
+SET PATH= '"bbb"';
+SELECT @@path;
+SET sql_mode=DEFAULT;
+SET PATH= 'ccc,';
+SELECT @@path;
+SET PATH= 'ddd,,';
+SELECT @@path;
+SET PATH= 'eee,,,';
+SELECT @@path;
+SET PATH= ',ccc';
+SELECT @@path;
+SET PATH= ',,ddd';
+SELECT @@path;
+SET PATH= ',,,eee';
+SELECT @@path;
+SET PATH= ',aaa,';
+SELECT @@path;
+SET PATH= ',bbb,,';
+SELECT @@path;
+SET PATH= ',,ccc,';
+SELECT @@path;
+SET PATH= 'z,aaa';
+SELECT @@path;
+SET PATH= 'aaa,z';
+SELECT @@path;
+SET PATH= '`z`,aaa';
+SELECT @@path;
+SET PATH= 'aaa,`z`';
+SELECT @@path;
+SET PATH= '  hello   ';
+SELECT @@path;
+SET PATH= 'aaa,bbb';
+SELECT @@path;
+SET PATH= '   bbb,ccc  ';
+SELECT @@path;
+SET PATH= '`ccc`,ddd';
+SELECT @@path;
+SET PATH= 'ddd,`eee`';
+SELECT @@path;
+SET PATH= '`eee`,`fff`';
+SELECT @@path;
+SET PATH= '    `fff`,`ggg`    ';
+SELECT @@path;
+SET sql_mode=ORACLE;
+SET PATH= '"bbb"';
+SELECT @@path;
+SET PATH= '"ggg",hhh';
+SELECT @@path;
+SET PATH= 'hhh,`iii`,jjj,"kkk",lll';
+SELECT @@path;
+SET PATH= 'test,sys,ccc,ddd,eee,fff,ggg,hhh';
+SELECT @@path;
+SET PATH= ',,,test,,,sys,,,';
+SELECT @@path;
+SET PATH= '  ,,,aaa,,,bbb,,,  ';
+SELECT @@path;
+SET PATH= 'hello,world,deadpool,wolverine,aaa,ccc';
+SELECT @@path;
+SET PATH= '`a,b`,c';
+SELECT @@path;
+SET PATH= 'ß';
+SELECT @@path;
+SET PATH= '`Œ`';
+SELECT @@path;
+SET PATH= '"Ɣ"';
+SELECT @@path;
+SET PATH= ',ß';
+SELECT @@path;
+SET PATH= ',,Œ';
+SELECT @@path;
+SET PATH= ',,,Ɣ';
+SELECT @@path;
+SET PATH= 'ß,';
+SELECT @@path;
+SET PATH= 'Œ,,';
+SELECT @@path;
+SET PATH= 'Ɣ,,,';
+SELECT @@path;
+SET PATH= ',ß,';
+SELECT @@path;
+SET PATH= 'a,ß';
+SELECT @@path;
+SET PATH= 'ß,c';
+SELECT @@path;
+SET PATH= 'ã,ß';
+SELECT @@path;
+SET PATH= ',Œ,Ɣ,';
+SELECT @@path;
+SET PATH= ',ã,ß';
+SELECT @@path;
+SET PATH= 'Œ,Ɣ,';
+SELECT @@path;
+SET PATH= 'aß';
+SELECT @@path;
+SET PATH= 'ßc';
+SELECT @@path;
+SET PATH= 'ßĉ';
+SELECT @@path;
+SET PATH= 'abc';
+SELECT @@path;
+SET PATH= 'ãbc';
+SELECT @@path;
+SET PATH= 'ãßc';
+SELECT @@path;
+SET PATH= 'ãßĉ';
+SELECT @@path;
+SET PATH= 'aßc';
+SELECT @@path;
+SET PATH= 'aßĉ';
+SELECT @@path;
+SET PATH= 'abĉ';
+SELECT @@path;
+SET PATH= 'ãbĉ';
+SELECT @@path;
+SET PATH= 'ãßĉ,';
+SELECT @@path;
+SET PATH= 'a,ãßĉ';
+SELECT @@path;
+SET PATH= 'ãßĉ,d';
+SELECT @@path;
+SET PATH= ',ãßĉ,';
+SELECT @@path;
+SET PATH= 'a,ãßĉ,d';
+SELECT @@path;
+SET PATH= 'a,ãßĉ,Œ';
+SELECT @@path;
+SET PATH= 'Ɣ,ãßĉ,d';
+SELECT @@path;
+SET PATH= 'Ɣ,ãßĉ,Œ';
+SELECT @@path;
+
+--echo '#'
+--echo '#--- Change the value of path to an invalid value ---#'
+--echo '#'
+###########################################################################
+#              Change the value of path to an invalid value               #
+###########################################################################
+SET sql_mode=DEFAULT;
+SET @@session.path = @start_session_value;
+SELECT @@session.path;
+SET @@global.path = @start_global_value;
+SELECT @@global.path;
+--Error ER_INVALID_SCHEMA_NAME_LIST_SPEC
+SET PATH= '`';
+--Error ER_INVALID_SCHEMA_NAME_LIST_SPEC
+SET PATH= '"';
+--Error ER_INVALID_SCHEMA_NAME_LIST_SPEC
+SET PATH= '`a';
+--Error ER_INVALID_SCHEMA_NAME_LIST_SPEC
+SET PATH= '"a';
+--Error ER_INVALID_SCHEMA_NAME_LIST_SPEC
+SET PATH= 'a`';
+--Error ER_INVALID_SCHEMA_NAME_LIST_SPEC
+SET PATH= 'a"';
+--Error ER_INVALID_SCHEMA_NAME_LIST_SPEC
+SET PATH= '"d"';
+--Error ER_INVALID_SCHEMA_NAME_LIST_SPEC
+SET PATH= '`aaa';
+--Error ER_INVALID_SCHEMA_NAME_LIST_SPEC
+SET PATH= 'aaa`';
+--Error ER_INVALID_SCHEMA_NAME_LIST_SPEC
+SET PATH= '"aaa';
+--Error ER_INVALID_SCHEMA_NAME_LIST_SPEC
+SET PATH= 'aaa"';
+--Error ER_INVALID_SCHEMA_NAME_LIST_SPEC
+SET PATH= '`aaa"';
+--Error ER_INVALID_SCHEMA_NAME_LIST_SPEC
+SET PATH= '"aaa`';
+--Error ER_INVALID_SCHEMA_NAME_LIST_SPEC
+SET PATH= '"ggg,hhh';
+--Error ER_INVALID_SCHEMA_NAME_LIST_SPEC
+SET PATH= 'ggg",hhh';
+--Error ER_INVALID_SCHEMA_NAME_LIST_SPEC
+SET PATH= '"ggg",hhh';
+--Error ER_INVALID_SCHEMA_NAME_LIST_SPEC
+SET PATH= 'hhh,`iii`,jjj,"kkk",lll';
+--Error ER_INVALID_SCHEMA_NAME_LIST_SPEC
+SET PATH= 'hello,world,deadpool,wolverine,aaa,deadpool,ccc';
+--Error ER_INVALID_SCHEMA_NAME_LIST_SPEC
+SET PATH= '`,Ɣ';
+--Error ER_INVALID_SCHEMA_NAME_LIST_SPEC
+SET PATH= '",Ɣ';
+--Error ER_INVALID_SCHEMA_NAME_LIST_SPEC
+SET PATH= 'Ɣ,`';
+--Error ER_INVALID_SCHEMA_NAME_LIST_SPEC
+SET PATH= 'Ɣ,"';
+--Error ER_INVALID_SCHEMA_NAME_LIST_SPEC
+SET PATH= '`Œ';
+--Error ER_INVALID_SCHEMA_NAME_LIST_SPEC
+SET PATH= '"c';
+--Error ER_INVALID_SCHEMA_NAME_LIST_SPEC
+SET PATH= 'Œ`';
+--Error ER_INVALID_SCHEMA_NAME_LIST_SPEC
+SET PATH= 'Œ"';
+--Error ER_INVALID_SCHEMA_NAME_LIST_SPEC
+SET PATH= '`Œ"';
+--Error ER_INVALID_SCHEMA_NAME_LIST_SPEC
+SET PATH= '"Œ`';
+--Error ER_INVALID_SCHEMA_NAME_LIST_SPEC
+SET PATH= '"Ɣ"';
+SELECT @@path;
+
+--echo #
+--echo #--- Set path to empty string ---#
+--echo #
+SET PATH= ' ';
+SET PATH= '    ';
+SET PATH= ',';
+SET PATH= '``';
+
+SET sql_mode=ANSI_QUOTES;
+SET PATH= '""';
+SET sql_mode=DEFAULT;
+
+--echo '#'
+--echo '#--- Test preparable statement ---#'
+--echo '#'
+###########################################################################
+#                       Test preparable statement                         #
+###########################################################################
+PREPARE stmt FROM 'SELECT \'I know what you did last summer\'';
+
+SET PATH= 'hello,world,mcdonald';
+SELECT @@path;
+
+EXECUTE stmt;
+DEALLOCATE PREPARE stmt;
+
+SET GLOBAL PATH=DEFAULT;
+SET @@path=DEFAULT;
+
+--echo #
+--echo # path max limit (16 schemas)
+--echo #
+SET PATH= 'a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p';
+SELECT @@path;
+--error ER_WRONG_VALUE_FOR_VAR
+SET PATH= 'a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q';
+SELECT @@path;
+
+--echo #
+--echo # CURRENT_PATH
+--echo #
+SET PATH= 'a,b';
+SELECT CURRENT_PATH();
+SELECT CURRENT_PATH;
+
+SET PATH= DEFAULT;
+SELECT CURRENT_PATH;
diff --git a/mysql-test/suite/sys_vars/t/path_priv.test b/mysql-test/suite/sys_vars/t/path_priv.test
new file mode 100644
index 0000000000000..f0e3de7dfeb54
--- /dev/null
+++ b/mysql-test/suite/sys_vars/t/path_priv.test
@@ -0,0 +1,26 @@
+--source include/not_embedded.inc
+
+--echo #
+--echo # MDEV-34391: Check privilige for setting global path
+--echo #
+CREATE USER priv_test;
+connect (conn1,localhost,priv_test,,);
+connection conn1;
+
+--error ER_SPECIFIC_ACCESS_DENIED_ERROR
+SET @@global.path= 'sys';
+SET @@path= 'sys';
+
+connection default;
+disconnect conn1;
+
+GRANT SUPER ON *.* TO priv_test;
+connect (conn1,localhost,priv_test,,);
+connection conn1;
+
+SET @@global.path= 'sys';
+
+connection default;
+
+DROP USER priv_test;
+SET @@global.path= DEFAULT;
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt
index b4604e5f2498a..98a1bf7545990 100644
--- a/sql/CMakeLists.txt
+++ b/sql/CMakeLists.txt
@@ -122,6 +122,7 @@ SET (SQL_SOURCE
                ../sql-common/pack.c parse_file.cc password.c procedure.cc
                protocol.cc records.cc repl_failsafe.cc rpl_filter.cc
                session_tracker.cc
+               sql_path.cc
                set_var.cc
                slave.cc sp.cc sp_cache.cc sp_head.cc sp_pcontext.cc
                sp_rcontext.cc spatial.cc sql_acl.cc sql_analyse.cc sql_base.cc
diff --git a/sql/handler.cc b/sql/handler.cc
index 2e092926bafad..eaa9d1b79edfb 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -3853,7 +3853,8 @@ int handler::ha_index_read_map(uchar *buf, const uchar *key,
 
 int handler::ha_index_read_idx_map(uchar *buf, uint index, const uchar *key,
                                           key_part_map keypart_map,
-                                          enum ha_rkey_function find_flag)
+                                          enum ha_rkey_function find_flag,
+                                          bool update)
 {
   int result;
   DBUG_ASSERT(inited==NONE);
@@ -3862,7 +3863,7 @@ int handler::ha_index_read_idx_map(uchar *buf, uint index, const uchar *key,
   DBUG_ASSERT(end_range == NULL);
   TABLE_IO_WAIT(tracker, PSI_TABLE_FETCH_ROW, index, result,
     { result= index_read_idx_map(buf, index, key, keypart_map, find_flag); })
-  increment_statistics(&SSV::ha_read_key_count);
+  increment_statistics(&SSV::ha_read_key_count, update);
   if (!result)
   {
     rows_stats.key_read_hit++;
diff --git a/sql/handler.h b/sql/handler.h
index 82a86572fa682..18d8e1323d488 100644
--- a/sql/handler.h
+++ b/sql/handler.h
@@ -4276,7 +4276,8 @@ class handler :public Sql_alloc
                         enum ha_rkey_function find_flag);
   int ha_index_read_idx_map(uchar * buf, uint index, const uchar * key,
                             key_part_map keypart_map,
-                            enum ha_rkey_function find_flag);
+                            enum ha_rkey_function find_flag,
+                            bool update= true);
   int ha_index_next(uchar * buf);
   int ha_index_prev(uchar * buf);
   int ha_index_first(uchar * buf);
@@ -5203,7 +5204,7 @@ class handler :public Sql_alloc
     Increment statistics. As a side effect increase accessed_rows_and_keys
     and checks if lex->limit_rows_examined_cnt is reached
   */
-  inline void increment_statistics(ulong SSV::*offset) const;
+  inline void increment_statistics(ulong SSV::*offset, bool update=true) const;
   /* Same as increment_statistics but doesn't increase accessed_rows_and_keys */
   inline void fast_increment_statistics(ulong SSV::*offset) const;
   inline void decrement_statistics(ulong SSV::*offset) const;
diff --git a/sql/item_create.cc b/sql/item_create.cc
index 4ce151a12941d..a3bd113ac1243 100644
--- a/sql/item_create.cc
+++ b/sql/item_create.cc
@@ -38,6 +38,7 @@
 #include "sql_type_geom.h"
 #include "item_vectorfunc.h"
 #include <mysql/plugin_function.h>
+#include "sql_path.h"
 
 
 extern "C" const uchar *get_native_fct_hash_key(const void *buff,
@@ -2838,27 +2839,44 @@ Item*
 Create_qfunc::create_func(THD *thd, const LEX_CSTRING *name,
                           List<Item> *item_list)
 {
+  Lex_ident_db_normalized db;
+
   if (unlikely(! thd->db.str && ! thd->lex->sphead))
   {
     /*
-      The proper error message should be in the lines of:
-        Can't resolve <name>() to a function call,
-        because this function:
-        - is not a native function,
-        - is not a user defined function,
-        - can not match a qualified (read: stored) function
-          since no database is selected.
-      Reusing ER_SP_DOES_NOT_EXIST have a message consistent with
-      the case when a default database exist, see Create_sp_func::create().
+      Attempt to resolve the db name from the path pariable
     */
-    my_error(ER_SP_DOES_NOT_EXIST, MYF(0),
-             "FUNCTION", name->str);
-    return NULL;
+    if (thd->variables.path.find_db_unqualified(thd, *name,
+                                                &sp_handler_function,
+                                                &db, NULL))
+      return NULL;
+
+    if (!db.str)
+    {
+      /*
+        The proper error message should be in the lines of:
+          Can't resolve <name>() to a function call,
+          because this function:
+          - is not a native function,
+          - is not a user defined function,
+          - can not match a qualified (read: stored) function
+            since no database is selected.
+        Reusing ER_SP_DOES_NOT_EXIST have a message consistent with
+        the case when a default database exist, see Create_sp_func::create().
+      */
+      my_error(ER_SP_DOES_NOT_EXIST, MYF(0),
+               "FUNCTION", name->str);
+      return NULL;
+    }
   }
 
-  Lex_ident_db_normalized db= thd->lex->copy_db_normalized();
   if (!db.str)
-    return NULL; /*No db or EOM, error was already sent */
+  {
+    db= thd->lex->copy_db_normalized(false);
+
+    if (!db.str)
+      return NULL; /*No db or EOM, error was already sent */
+  }
 
   return create_with_db(thd, db, Lex_ident_routine(*name), false, item_list);
 }
@@ -3010,8 +3028,8 @@ Create_sp_func::create_with_db(THD *thd,
     arg_count= item_list->elements;
 
   qname= new (thd->mem_root) sp_name(db, name, use_explicit_name);
-  if (unlikely(sph->sp_resolve_package_routine(thd, thd->lex->sphead,
-                                               qname, &sph, &pkgname)))
+  if (unlikely(sph->sp_resolve_package_routine_sql_path(thd, thd->lex->sphead,
+                                                        qname, &sph, &pkgname)))
     return NULL;
   sph->add_used_routine(lex, thd, qname);
   if (pkgname.m_name.length)
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc
index 0d16245c052aa..b23d7c453b9d6 100644
--- a/sql/item_strfunc.cc
+++ b/sql/item_strfunc.cc
@@ -6331,3 +6331,21 @@ longlong Item_func_wsrep_sync_wait_upto::val_int()
 }
 
 #endif /* WITH_WSREP */
+
+
+String *Item_func_current_path::val_str(String *str)
+{
+  DBUG_ASSERT(fixed());
+  THD *thd= current_thd;
+  
+  auto length= thd->variables.path.text_format_nbytes_needed();
+  if (str->realloc(length))
+    return NULL;
+    
+  length= thd->variables.path.print(&(*str)[0], str->alloced_length());
+  str->length(length);
+
+  null_value= 0;
+  return str;
+}
+
diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h
index 27751210a8a60..c1dd551abe815 100644
--- a/sql/item_strfunc.h
+++ b/sql/item_strfunc.h
@@ -1281,6 +1281,35 @@ class Item_func_current_user :public Item_func_user
   }
 };
 
+
+class Item_func_current_path :public Item_func_sysconst
+{
+public:
+  Item_func_current_path(THD *thd): Item_func_sysconst(thd) {}
+  String *val_str(String *) override;
+  bool fix_length_and_dec(THD *thd) override
+  {
+    max_length=32767;
+    set_maybe_null();
+    return FALSE;
+  }
+  LEX_CSTRING func_name_cstring() const override
+  {
+    static LEX_CSTRING name= {STRING_WITH_LEN("current_path") };
+    return name;
+  }
+  const Lex_ident_routine fully_qualified_func_name() const override
+  { return Lex_ident_routine("current_path()"_LEX_CSTRING); }
+  bool check_vcol_func_processor(void *arg) override
+  {
+    return mark_unsupported_function(fully_qualified_func_name().str, arg,
+                                     VCOL_SESSION_FUNC);
+  }
+  Item *do_get_copy(THD *thd) const override
+  { return get_item_copy<Item_func_current_path>(thd, this); }
+};
+
+
 class Item_func_session_user :public Item_func_user
 {
 public:
diff --git a/sql/lex.h b/sql/lex.h
index d420430545f29..00f1a99988b7b 100644
--- a/sql/lex.h
+++ b/sql/lex.h
@@ -157,6 +157,7 @@ SYMBOL symbols[] = {
   { "CUBE",		SYM(CUBE_SYM)},
   { "CURRENT",          SYM(CURRENT_SYM)},
   { "CURRENT_DATE",	SYM(CURDATE)},
+  { "CURRENT_PATH",	SYM(CURRENT_PATH)},
   { "CURRENT_POS",      SYM(CURRENT_POS_SYM)},
   { "CURRENT_ROLE",	SYM(CURRENT_ROLE)},
   { "CURRENT_TIME",	SYM(CURTIME)},
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 89d9cc646c8ca..32c06aab81be3 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -4398,6 +4398,8 @@ static int init_common_variables()
     make_default_log_name(&opt_logname, ".log", false);
   if (!opt_slow_logname || !*opt_slow_logname)
     make_default_log_name(&opt_slow_logname, "-slow.log", false);
+  
+  global_system_variables.path.init();
 
 #if defined(ENABLED_DEBUG_SYNC)
   /* Initialize the debug sync facility. See debug_sync.cc. */
diff --git a/sql/set_var.cc b/sql/set_var.cc
index 6359eb9ab3fc1..7c4b44f5bcabb 100644
--- a/sql/set_var.cc
+++ b/sql/set_var.cc
@@ -113,6 +113,8 @@ void sys_var_end()
 
   for (sys_var *var=all_sys_vars.first; var; var= var->next)
     var->cleanup();
+  
+  global_system_variables.path.free();
 
   DBUG_VOID_RETURN;
 }
diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt
index adb7227ed8282..e5e8ebc34704f 100644
--- a/sql/share/errmsg-utf8.txt
+++ b/sql/share/errmsg-utf8.txt
@@ -12294,3 +12294,5 @@ ER_VEC_DISTANCE_TYPE
         eng "Cannot determine distance type for VEC_DISTANCE, index is not found"
 ER_SIGNAL_SKIP_ROW_FROM_TRIGGER
         eng "The row is skipped by a trigger implementation"
+ER_INVALID_SCHEMA_NAME_LIST_SPEC
+        eng "Invalid schema list specification"
diff --git a/sql/sp.cc b/sql/sp.cc
index 8a81e19e3eec3..8e41b8327be85 100644
--- a/sql/sp.cc
+++ b/sql/sp.cc
@@ -553,6 +553,8 @@ static TABLE *open_proc_table_for_update(THD *thd)
   @param thd    Thread context
   @param name   Name of routine
   @param table  TABLE object for open mysql.proc table.
+  @param update A flag for handler::ha_index_read_idx_map
+                to update internal data
 
   @retval
     SP_OK             Routine found
@@ -563,7 +565,7 @@ static TABLE *open_proc_table_for_update(THD *thd)
 int
 Sp_handler::db_find_routine_aux(THD *thd,
                                 const Database_qualified_name *name,
-                                TABLE *table) const
+                                TABLE *table, bool update) const
 {
   uchar key[MAX_KEY_LENGTH];	// db, name, optional key length type
   DBUG_ENTER("db_find_routine_aux");
@@ -588,7 +590,8 @@ Sp_handler::db_find_routine_aux(THD *thd,
 
   if (table->file->ha_index_read_idx_map(table->record[0], 0, key,
                                          HA_WHOLE_KEY,
-                                         HA_READ_KEY_EXACT))
+                                         HA_READ_KEY_EXACT,
+                                         update))
     DBUG_RETURN(SP_KEY_NOT_FOUND);
 
   DBUG_RETURN(SP_OK);
@@ -2238,6 +2241,75 @@ Sp_handler::sp_find_routine(THD *thd, const Database_qualified_name *name,
 }
 
 
+/**
+  Determine the existence of a routine.
+  Note: ONLY for unqualified routines
+
+  @param thd          thread context
+  @param name         name of routine
+
+  @retval
+    Non-0  routine does not exist
+  @retval
+    0      routine exists
+*/
+
+int
+Sp_handler::sp_find_routine_quick(THD *thd,
+                                  const Database_qualified_name *name) const
+{
+  DBUG_ENTER("Sp_handler::sp_find_routine_quick");
+  DBUG_PRINT("enter", ("name:  %.*s.%.*s  type: %s",
+                       (int) name->m_db.length, name->m_db.str,
+                       (int) name->m_name.length, name->m_name.str,
+                       type_str()));
+
+  Parser_state *oldps= thd->m_parser_state;
+  thd->m_parser_state= NULL;
+
+  sp_cache **cp= get_cache(thd);
+  sp_head *sp;
+
+  if ((sp= sp_cache_lookup(cp, name)))
+  {
+    thd->m_parser_state= oldps;
+    DBUG_RETURN(SP_OK);
+  }
+
+  TABLE *table;
+  int ret;
+  THD::used_t saved_time_zone_used= thd->used & THD::TIME_ZONE_USED;
+
+  start_new_trans new_trans(thd);
+
+  if (!(table= open_proc_table_for_read(thd)))
+  {
+    ret= SP_OPEN_TABLE_FAILED;
+    goto done;
+  }
+
+  if ((ret= db_find_routine_aux(thd, name, table, false)) != SP_OK)
+    goto done;
+
+  thd->commit_whole_transaction_and_close_tables();
+  new_trans.restore_old_transaction();
+
+  thd->m_parser_state= oldps;
+
+  DBUG_RETURN(ret);
+
+done:
+  thd->used= (thd->used & ~THD::TIME_ZONE_USED) | saved_time_zone_used;
+  if (table)
+    thd->commit_whole_transaction_and_close_tables();
+  new_trans.restore_old_transaction();
+
+  thd->m_parser_state= oldps;
+
+  DBUG_RETURN(ret);
+}
+
+
 /**
   Find a package routine.
   See sp_cache_routine() for more information on parameters and return value.
@@ -2493,6 +2565,38 @@ is_package_public_routine(THD *thd,
 }
 
 
+/**
+  Check if a routine has a declaration in the CREATE PACKAGE statement
+  and that its implementation exists in the PACKAGE BODY.
+
+    @param thd      current thd
+    @param db       the database name
+    @param package  the package name
+    @param name     the routine name
+    @param type     the routine type
+    @retval         true,  if both routine declaration and implementation exist
+    @retval         false, either routine declaration or implementation does not exist
+*/
+
+static bool
+is_package_public_routine_with_body(THD *thd,
+                                    const Lex_ident_db &db,
+                                    const LEX_CSTRING &package,
+                                    const LEX_CSTRING &routine,
+                                    enum_sp_type type)
+{
+  if (!is_package_public_routine(thd, db, package, routine, type))
+    return false;
+
+  sp_head *sp= NULL;
+  Database_qualified_name tmp(db, package);
+  bool ret= sp_handler_package_body.
+              sp_cache_routine_reentrant(thd, &tmp, &sp);
+  sp_package *spec= (!ret && sp) ? sp->get_package() : NULL;
+  return spec && spec->m_routine_implementations.find(routine, type);
+}
+
+
 /**
   Check if a routine has a declaration in the CREATE PACKAGE statement
   by looking up in sp_package_spec_cache.
@@ -2694,6 +2798,104 @@ Sp_handler::sp_resolve_package_routine(THD *thd,
 }
 
 
+/**
+  Detect cases when a package routine (rather than a standalone routine)
+  is called, and rewrite sp_name accordingly.
+  Note that this function is extends from the function,
+  Sp_handler::sp_resolve_package_routine()
+
+  @param thd              Current thd
+  @param caller           The caller routine (or NULL if outside of a routine)
+  @param [IN/OUT] name    The called routine name
+  @param [OUT]    pkgname If the routine is found to be a package routine,
+                          pkgname is populated with the package name.
+                          Otherwise, it's not touched.
+  @retval         false   on success
+  @retval         true    on error (e.g. EOM, could not read CREATE PACKAGE)
+*/
+
+bool
+Sp_handler::sp_resolve_package_routine_sql_path(THD *thd,
+                                       sp_head *caller,
+                                       sp_name *name,
+                                       const Sp_handler **pkg_routine_handler,
+                                       Database_qualified_name *pkgname) const
+{
+  bool ret= false;
+  sp_name *qname= NULL;
+
+  if (!thd->db.length)
+  {
+    if (name->m_explicit_name)
+      ret= thd->variables.path.find_db_qualified(thd, name,
+                                                 pkg_routine_handler, pkgname);
+    else
+    {
+      if ((*pkg_routine_handler)->sp_find_routine_quick(thd, name))
+      {
+        ret= thd->variables.path.find_db_unqualified(thd, name->m_name,
+                                                      *pkg_routine_handler,
+                                                      NULL, &qname);
+        if (!ret && qname)
+          *name= *qname;
+      }
+    }
+
+    return ret;
+  }
+
+  if (name->m_explicit_name)
+  {
+    ret= sp_resolve_package_routine_explicit(thd, caller, name,
+                                             pkg_routine_handler, pkgname);
+
+    if (!ret && !pkgname->m_name.length)
+    {
+      if ((*pkg_routine_handler)->sp_find_qualified_routine(thd, name->m_db,
+                                                            name))
+        ret= thd->variables.path.find_db_qualified(thd, name,
+                                                   pkg_routine_handler,
+                                                   pkgname);
+    }
+  }
+  else
+  {
+    ret= sp_resolve_package_routine_implicit(thd, caller, name,
+                                             pkg_routine_handler, pkgname);
+
+    if (!ret && !pkgname->m_name.length)
+    {
+      if ((*pkg_routine_handler)->sp_find_routine_quick(thd, name))
+      {
+        ret= thd->variables.path.find_db_unqualified(thd, name->m_name,
+                                                     *pkg_routine_handler,
+                                                     NULL, &qname);
+        if (!ret && qname)
+          *name= *qname;
+      }
+    }
+  }
+
+  return ret;
+}
+
+
+/**
+  Wrapper function for function is_package_public_routine_with_body()
+
+  @retval         true,  either routine declaration or implementation does not exist
+  @retval         false, if both routine declaration and implementation exist
+*/
+
+bool Sp_handler::sp_find_qualified_routine(THD *thd,
+                                           const Lex_ident_db &tmpdb,
+                                           sp_name *name) const
+{
+  return !(is_package_public_routine_with_body(thd, tmpdb, name->m_db,
+                                               name->m_name, type()));
+}
+
+
 /**
   Add routine which is explicitly used by statement to the set of stored
   routines used by this statement.
diff --git a/sql/sp.h b/sql/sp.h
index aca60165f729c..0c1a6b67e3672 100644
--- a/sql/sp.h
+++ b/sql/sp.h
@@ -76,7 +76,7 @@ class Sp_handler
                                            const;
 protected:
   int db_find_routine_aux(THD *thd, const Database_qualified_name *name,
-                          TABLE *table) const;
+                          TABLE *table, bool update= true) const;
   int db_find_routine(THD *thd, const Database_qualified_name *name,
                       sp_head **sphp) const;
   int db_find_and_cache_routine(THD *thd,
@@ -195,9 +195,20 @@ class Sp_handler
                                   sp_name *name,
                                   const Sp_handler **pkg_routine_handler,
                                   Database_qualified_name *pkgname) const;
+  bool sp_resolve_package_routine_sql_path(
+                                  THD *thd,
+                                  sp_head *caller,
+                                  sp_name *name,
+                                  const Sp_handler **pkg_routine_handler,
+                                  Database_qualified_name *pkgname) const;
   virtual sp_head *sp_find_routine(THD *thd,
                                    const Database_qualified_name *name,
                                    bool cache_only) const;
+  int sp_find_routine_quick(THD *thd,
+                            const Database_qualified_name *name) const;
+  bool sp_find_qualified_routine(THD *thd,
+                                 const Lex_ident_db &tmpdb,
+                                 sp_name *name) const;
   virtual int sp_cache_routine(THD *thd, const Database_qualified_name *name,
                                sp_head **sp) const;
 
diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index 5b39e5931c44d..e60a3cebcdb9a 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -776,7 +776,7 @@ THD::THD(my_thread_id id, bool is_wsrep_applier)
    wsrep_wfc()
 #endif /*WITH_WSREP */
 {
-  bzero(&variables, sizeof(variables));
+  bzero((void *)&variables, sizeof(variables));
 
   /*
     We set THR_THD to temporally point to this THD to register all the
@@ -1862,6 +1862,7 @@ THD::~THD()
 #if defined(ENABLED_DEBUG_SYNC)
   debug_sync_end_thread(this);
 #endif
+  variables.path.free();
   /* Ensure everything is freed */
   status_var.local_memory_used-= sizeof(THD);
 
diff --git a/sql/sql_class.h b/sql/sql_class.h
index 208e4ba10e6d8..e6f5e604bb219 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -50,6 +50,7 @@
 #include <mysql/psi/mysql_table.h>
 #include <mysql_com_server.h>
 #include "session_tracker.h"
+#include "sql_path.h"
 #include "backup.h"
 #include "xa.h"
 #include "ddl_log.h"                            /* DDL_LOG_STATE */
@@ -922,6 +923,7 @@ typedef struct system_variables
   my_bool binlog_alter_two_phase;
 
   Charset_collation_map_st character_set_collations;
+  Sql_path path;
 } SV;
 
 /**
@@ -5097,7 +5099,7 @@ class THD: public THD_count, /* this must be first */
   /** Set the current database, without copying */
   void reset_db(const LEX_CSTRING *new_db);
 
-  bool check_if_current_db_is_set_with_error() const
+  bool check_if_current_db_is_set_with_error(bool raise_err= true) const
   {
     if (db.str == NULL)
     {
@@ -5109,8 +5111,10 @@ class THD: public THD_count, /* this must be first */
         to resolve all CTE names as we don't need this message to be thrown
         for any CTE references.
       */
-      if (!lex->with_cte_resolution)
+
+      if (likely(raise_err) && !lex->with_cte_resolution)
         my_message(ER_NO_DB_ERROR, ER(ER_NO_DB_ERROR), MYF(0));
+
       return TRUE;
     }
     return false;
@@ -5142,9 +5146,9 @@ class THD: public THD_count, /* this must be first */
     For other lower_case_table_names values the name is already in
     its normalized case, so it's copied as is.
   */
-  Lex_ident_db_normalized copy_db_normalized()
+  Lex_ident_db_normalized copy_db_normalized(bool raise_err= true)
   {
-    if (check_if_current_db_is_set_with_error())
+    if (check_if_current_db_is_set_with_error(raise_err))
       return Lex_ident_db_normalized();
     LEX_CSTRING ident= make_ident_opt_casedn(db, lower_case_table_names == 2);
     /*
@@ -7952,10 +7956,11 @@ inline Item *and_conds(THD *thd, Item *a, Item *b)
 }
 
 /* inline handler methods that need to know TABLE and THD structures */
-inline void handler::increment_statistics(ulong SSV::*offset) const
+inline void handler::increment_statistics(ulong SSV::*offset, bool update) const
 {
   status_var_increment(table->in_use->status_var.*offset);
-  table->in_use->check_limit_rows_examined();
+  if (update)
+    table->in_use->check_limit_rows_examined();
 }
 
 inline void handler::fast_increment_statistics(ulong SSV::*offset) const
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc
index 5bf41c2b86381..33d0db222a674 100644
--- a/sql/sql_lex.cc
+++ b/sql/sql_lex.cc
@@ -41,6 +41,7 @@
 #ifdef WITH_WSREP
 #include "mysql/service_wsrep.h"
 #endif
+#include "sql_path.h"
 
 void LEX::parse_error(uint err_number)
 {
@@ -4331,7 +4332,7 @@ bool LEX::copy_db_to(LEX_CSTRING *to)
 }
 
 
-Lex_ident_db_normalized LEX::copy_db_normalized()
+Lex_ident_db_normalized LEX::copy_db_normalized(bool raise_err)
 {
   if (sphead && sphead->m_name.str)
   {
@@ -4339,7 +4340,7 @@ Lex_ident_db_normalized LEX::copy_db_normalized()
     DBUG_ASSERT(sphead->m_db.length);
     return thd->to_ident_db_normalized_with_error(sphead->m_db);
   }
-  return thd->copy_db_normalized();
+  return thd->copy_db_normalized(raise_err);
 }
 
 
@@ -7614,6 +7615,37 @@ sp_name *LEX::make_sp_name(THD *thd, const Lex_ident_sys_st &name1,
 }
 
 
+sp_name *LEX::make_sp_name_sql_path(THD *thd, const Lex_ident_sys_st &name)
+{
+  if (unlikely(Lex_ident_routine::check_name_with_error(name)))
+    return NULL;
+
+  Lex_ident_db_normalized db;
+  sp_name *res= NULL;
+
+  db= copy_db_normalized(false);
+  if (!db.str)
+  {
+    if (thd->variables.path.find_db_unqualified(thd, name,
+                                                &sp_handler_procedure, NULL,
+                                                &res))
+      return NULL;
+
+    if (!res)
+    {
+      if (!thd->lex->with_cte_resolution)
+        my_message(ER_NO_DB_ERROR, ER(ER_NO_DB_ERROR), MYF(0));
+
+      return NULL;
+    }
+  }
+  else
+    res= new (thd->mem_root) sp_name(db, name, false);
+
+  return res;
+}
+
+
 sp_lex_local *LEX::package_routine_start(THD *thd,
                                          const Sp_handler *sph,
                                          const Lex_ident_sys_st &name)
@@ -9521,8 +9553,8 @@ bool LEX::call_statement_start(THD *thd, sp_name *name)
   const Sp_handler *sph= &sp_handler_procedure;
   sql_command= SQLCOM_CALL;
   value_list.empty();
-  if (unlikely(sph->sp_resolve_package_routine(thd, thd->lex->sphead,
-                                               name, &sph, &pkgname)))
+  if (unlikely(sph->sp_resolve_package_routine_sql_path(thd, thd->lex->sphead,
+                                                        name, &sph, &pkgname)))
     return true;
   if (unlikely(!(m_sql_cmd= new (thd->mem_root) Sql_cmd_call(name, sph))))
     return true;
@@ -9535,7 +9567,7 @@ bool LEX::call_statement_start(THD *thd, sp_name *name)
 
 bool LEX::call_statement_start(THD *thd, const Lex_ident_sys_st *name)
 {
-  sp_name *spname= make_sp_name(thd, *name);
+  sp_name *spname= make_sp_name_sql_path(thd, *name);
   return unlikely(!spname) || call_statement_start(thd, spname);
 }
 
diff --git a/sql/sql_lex.h b/sql/sql_lex.h
index 47dfdc048ad7f..ec81260b6d323 100644
--- a/sql/sql_lex.h
+++ b/sql/sql_lex.h
@@ -3712,7 +3712,7 @@ struct LEX: public Query_tables_list
   }
 
   bool copy_db_to(LEX_CSTRING *to);
-  Lex_ident_db_normalized copy_db_normalized();
+  Lex_ident_db_normalized copy_db_normalized(bool raise_err= true);
 
   void inc_select_stack_outer_barrier()
   {
@@ -3820,6 +3820,7 @@ struct LEX: public Query_tables_list
   sp_name *make_sp_name(THD *thd, const Lex_ident_sys_st &name);
   sp_name *make_sp_name(THD *thd, const Lex_ident_sys_st &name1,
                                   const Lex_ident_sys_st &name2);
+  sp_name *make_sp_name_sql_path(THD *thd, const Lex_ident_sys_st &name);
   sp_name *make_sp_name_package_routine(THD *thd,
                                         const Lex_ident_sys_st &name);
   sp_lex_local *package_routine_start(THD *thd,
diff --git a/sql/sql_path.cc b/sql/sql_path.cc
new file mode 100644
index 0000000000000..0ccaf8d3da9ef
--- /dev/null
+++ b/sql/sql_path.cc
@@ -0,0 +1,412 @@
+#include "sql_plugin.h"
+#include "sql_class.h"    // class THD
+#include "sp_head.h"      // class sp_name
+#include "lex_ident.h"
+#include "sql_db.h"
+#include "sql_path.h"
+
+static constexpr LEX_CSTRING cur_schema= {STRING_WITH_LEN(".")};
+
+Sql_path::Sql_path() :
+  m_schemas(m_schemas_array,
+            sizeof(m_schemas_array) / sizeof(m_schemas_array[0])),
+  m_count(0),
+  m_buffer(nullptr),
+  m_buffer_length(0)
+{
+}
+
+
+bool Sql_path::find_db_unqualified(THD *thd, const LEX_CSTRING &name,
+                                   const Sp_handler *sph,
+                                   Lex_ident_db_normalized *dbn_out,
+                                   sp_name **spname_out) const
+{
+  for (size_t i= 0; i < m_count; i++)
+  {
+    LEX_CSTRING schema= m_schemas[i];
+
+    /*
+      Resolve the schema name to the current database if required.
+    */
+    if (schema.length == cur_schema.length &&
+                        !memcmp(schema.str, cur_schema.str, cur_schema.length))
+      schema= thd->db;
+
+    if (!schema.str)
+      continue;
+
+    if (likely(!check_db_dir_existence(schema.str)))
+    {
+      const Lex_ident_db_normalized dbn=
+        thd->to_ident_db_normalized_with_error(schema);
+      if (dbn.str)
+      {
+        sp_name *spname= new (thd->mem_root) sp_name(dbn, name, false);
+        if (unlikely(!spname))
+          return true;
+
+        if (!sph->sp_find_routine_quick(thd, spname))
+        {
+          // found
+          if (dbn_out)
+            *dbn_out= dbn;
+          if (spname_out)
+            *spname_out= spname;
+
+          break;
+        }
+      }
+    }
+  }
+
+  return false;
+}
+
+
+bool Sql_path::find_db_qualified(THD *thd,
+                                 sp_name *name,
+                                 const Sp_handler **sph,
+                                 Database_qualified_name *pkgname) const
+{
+  for (size_t i= 0; i < m_count; i++)
+  {
+    LEX_CSTRING schema= m_schemas[i];
+    /*
+      Resolve the schema name to the current database if required.
+    */
+    if (schema.length == cur_schema.length &&
+        !memcmp(schema.str, cur_schema.str, cur_schema.length))
+      schema= thd->db;
+
+    if (unlikely(!schema.str))
+      continue;
+    
+    if (likely(!check_db_dir_existence(schema.str)))
+    {
+      const Lex_ident_db_normalized dbn=
+        thd->to_ident_db_normalized_with_error(schema);
+      if (dbn.str)
+      {
+        if (!((*sph)->sp_find_qualified_routine(thd, dbn, name)))
+        {
+          pkgname->m_db= dbn;
+          pkgname->m_name= Lex_ident_routine(name->m_db);
+          *sph= (*sph)->package_routine_handler();
+          return name->make_package_routine_name(thd->mem_root, dbn,
+                                                 name->m_db, name->m_name);
+        }
+      }
+    }
+  }
+
+  return false;
+}
+
+
+Schema *Sql_path::find_first_internal_schema() const
+{
+  for (size_t i= 0; i < m_count; i++)
+  {
+    if (Schema *schema= Schema::find_by_name(m_schemas[i]))
+      return schema;
+  }
+
+  return nullptr;
+}
+
+
+void Sql_path::free()
+{
+  m_count= 0;
+
+  if (m_buffer)
+  {
+    my_free(m_buffer);
+    m_buffer= nullptr;
+    m_buffer_length= 0;
+  }
+}
+
+
+bool Sql_path::init()
+{
+  init_array();
+  free();
+
+  return false;
+}
+
+
+bool Sql_path::add_schema(const char *schema_str, size_t schema_len)
+{
+  DBUG_ASSERT(schema_str);
+
+  if (unlikely(m_count >= m_schemas.size()))
+    return true;
+  
+  /*
+    Disallow duplicate schema names. The intent here is to avoid
+    ambiguity in the order of schema resolution when the path
+    contains duplicate schema names.
+  */
+  for (size_t i= 0; i < m_count; i++)
+  {
+    if (unlikely(m_schemas[i].length == schema_len &&
+        !memcmp(m_schemas[i].str, schema_str, schema_len)))
+    {
+      my_error(ER_INVALID_SCHEMA_NAME_LIST_SPEC, MYF(0));
+      return true;
+    }
+  }
+
+  m_schemas[m_count++]= {schema_str, schema_len};
+  return false;
+}
+
+
+void Sql_path::set(const Sql_path &rhs, uint version_increment)
+{
+  init_array();
+  free();
+
+  if (rhs.m_buffer)
+  {
+    /*
+      Create a copy of buffer. All schema names will be readjusted
+      to point to the new buffer.
+    */
+    m_buffer= my_strndup(key_memory_Sys_var_charptr_value,
+                        rhs.m_buffer, rhs.m_buffer_length,
+                        MYF(MY_WME));
+    if (!m_buffer)
+      return;
+    m_buffer_length= rhs.m_buffer_length;
+  }
+
+  for (size_t i= 0; i < rhs.m_count; i++)
+  {
+    if (add_schema(rhs.m_schemas[i].str - rhs.m_buffer + m_buffer,
+                   rhs.m_schemas[i].length))
+      break;
+  }
+}
+
+
+void Sql_path::set(Sql_path &&rhs, uint version_increment)
+{
+  init_array();
+  free();
+
+  m_buffer= rhs.m_buffer;
+  m_buffer_length= rhs.m_buffer_length;
+  m_count= rhs.m_count;
+
+  memcpy(m_schemas_array, rhs.m_schemas_array,
+         sizeof(m_schemas_array[0]) * m_count);
+
+  rhs.m_buffer= nullptr;
+  rhs.m_buffer_length= 0;
+  rhs.m_count= 0;
+}
+
+
+bool Sql_path::from_text(THD *thd, CHARSET_INFO *cs, const LEX_CSTRING &text)
+{
+  free();
+
+  m_buffer= my_strndup(key_memory_Sys_var_charptr_value,
+                       text.str, text.length,
+                       MYF(MY_WME));
+  if (unlikely(!m_buffer))
+    return true;
+  m_buffer_length= text.length;
+
+  enum class tokenize_state
+  {
+    START,
+    QUOTED_TOKEN_DOUBLE,
+    QUOTED_TOKEN_BACKTICK,
+    UNQUOTED_TOKEN,
+    END
+  } state= tokenize_state::START;
+  
+  char *curr= m_buffer;
+  const char *end= curr + text.length;
+  auto token_start= curr;
+  auto token_end= curr;
+  auto last_non_space= curr;
+  const bool ansi_quotes= thd ?
+    thd->variables.sql_mode & MODE_ANSI_QUOTES : false;
+   
+  while (curr != end)
+  {
+    auto len = my_ismbchar(cs, curr, end - 1);
+    if (len)
+    {
+      if (state == tokenize_state::START)
+      {
+        state= tokenize_state::UNQUOTED_TOKEN;
+        token_start= curr;
+      }
+
+      curr += len;
+      last_non_space= curr - 1;
+      if (curr < end)
+        continue;
+    }
+    else if (unlikely(!ansi_quotes && *curr == '"' &&
+             state != tokenize_state::QUOTED_TOKEN_BACKTICK))
+    {
+      /*
+        ANSI_QUOTES is not set, only allow double quotes within backticks.
+      */
+      my_error(ER_INVALID_SCHEMA_NAME_LIST_SPEC, MYF(0));
+      return true;
+    }
+
+    switch (state)
+    {
+      case tokenize_state::START:
+        if (*curr == '`' || (ansi_quotes && *curr == '"'))
+        {
+          state= *curr == '`' ? tokenize_state::QUOTED_TOKEN_BACKTICK :
+                                tokenize_state::QUOTED_TOKEN_DOUBLE;
+          token_start= ++curr;
+        }
+        else if (*curr == ',' || my_isspace(cs, (uchar) *curr))
+        {
+          curr++;
+        }
+        else
+        {
+          state= tokenize_state::UNQUOTED_TOKEN;
+          last_non_space= token_start= curr++;
+        }
+        break;
+      case tokenize_state::QUOTED_TOKEN_DOUBLE:
+      case tokenize_state::QUOTED_TOKEN_BACKTICK:
+        if ((state == tokenize_state::QUOTED_TOKEN_BACKTICK && *curr == '`') ||
+            (state == tokenize_state::QUOTED_TOKEN_DOUBLE && *curr == '"'))
+        {
+          state= tokenize_state::END;
+          token_end= last_non_space + 1;
+          curr++;
+        }
+        else
+        {
+          if (!my_isspace(cs, (uchar) *curr))
+            last_non_space= curr;
+          curr++;
+        }
+        break;
+      case tokenize_state::UNQUOTED_TOKEN:
+        if (*curr == ',')
+        {
+          state= tokenize_state::END;
+          token_end= last_non_space + 1;
+          curr++;
+        }
+        else if (unlikely(*curr == '`' || *curr == '"'))
+        {
+          my_error(ER_INVALID_SCHEMA_NAME_LIST_SPEC, MYF(0));
+          return true;
+        }
+        else
+        {
+          if (!my_isspace(cs, (uchar) *curr))
+            last_non_space= curr;
+          curr++;
+        }
+        break;
+      case tokenize_state::END:
+        break;
+    }
+
+    if (state == tokenize_state::END)
+    {
+      if (token_end > token_start)
+      {
+        if (unlikely(add_schema(token_start,
+                                (size_t)(token_end - token_start))))
+          return true;
+        
+        /*
+          check_db_dir_existence requires a null-terminated string.
+          since we own the buffer, we can safely null-terminate it.
+        */
+        *token_end= '\0';
+      }
+
+      state= tokenize_state::START;
+    }
+  }
+
+  if (state == tokenize_state::UNQUOTED_TOKEN)
+  {
+    token_end= last_non_space + 1;
+    auto len= (size_t)(token_end - token_start);
+
+    if (len && add_schema(token_start, len))
+      return true;
+    *token_end= '\0';
+  }
+  else if (unlikely(state == tokenize_state::QUOTED_TOKEN_BACKTICK ||
+                    state == tokenize_state::QUOTED_TOKEN_DOUBLE))
+  {
+    /*
+      Unclosed quoted string.
+    */
+    my_error(ER_INVALID_SCHEMA_NAME_LIST_SPEC, MYF(0));
+    return true;
+  }
+
+  return false;
+}
+
+
+size_t Sql_path::text_format_nbytes_needed() const
+{
+  size_t nbytes= 0;
+
+  for (size_t i= 0; i < m_count; i++)
+    nbytes+= m_schemas[i].length + 2 + 1;
+
+  if (nbytes)
+    nbytes--;
+
+  return nbytes + 1;
+}
+
+
+size_t Sql_path::print(char *dst, size_t nbytes_available) const
+{
+  size_t nbytes= 0;
+
+  for (size_t i= 0; i < m_count; i++)
+  {
+    const LEX_CSTRING &schema= m_schemas[i];
+    size_t len= schema.length;
+    if (nbytes + len + 3 > nbytes_available)
+      break;
+
+    *dst++= '`';
+    memcpy(dst, schema.str, len);
+    dst+= len;
+    *dst++= '`';
+    *dst++= ',';
+    nbytes+= len + 3;
+  }
+
+  if (nbytes)
+  {
+    nbytes--;
+    dst--;
+  }
+
+  if (nbytes < nbytes_available)
+    *dst= '\0';
+    
+  return nbytes;
+}
+
diff --git a/sql/sql_path.h b/sql/sql_path.h
new file mode 100644
index 0000000000000..7d0f97af28de2
--- /dev/null
+++ b/sql/sql_path.h
@@ -0,0 +1,145 @@
+#ifndef SQL_PATH_INCLUDED
+#define SQL_PATH_INCLUDED
+
+#include "mysqld.h"
+#include "sql_array.h"
+#include "sql_list.h"
+
+
+/* forward declarations */
+class Database_qualified_name;
+
+
+struct Sql_path
+{
+private:
+  LEX_CSTRING m_schemas_array[16];
+  Bounds_checked_array<LEX_CSTRING> m_schemas;
+  uint m_count;
+  char *m_buffer;
+  size_t m_buffer_length;
+
+public:
+  Sql_path();
+  Sql_path& operator=(const Sql_path &rhs)
+  {
+    set(rhs, 1);
+    return *this;
+  }
+  Sql_path& operator=(Sql_path &&rhs)
+  {
+    set(std::move(rhs), 1);
+    return *this;
+  }
+  Sql_path(const Sql_path&) = delete;
+
+  void init_array()
+  {
+    m_schemas.reset(m_schemas_array,
+                    sizeof(m_schemas_array) / sizeof(m_schemas_array[0]));
+  }
+
+  bool find_db_unqualified(THD *thd, const LEX_CSTRING &name,
+                           const Sp_handler *sph,
+                           Lex_ident_db_normalized *dbn_out,
+                           sp_name **spname_out) const;
+  bool find_db_qualified(THD *thd,
+                         sp_name *name,
+                         const Sp_handler **sph,
+                         Database_qualified_name *pkgname) const;
+
+  /*
+    Find the first schema in the path that is an internal schema.
+    
+    We are only interested in any one internal schema, since all internal
+    schemas contain the same functions and procedures (but mapped to different
+    Create_funcs).
+
+    @return The first internal schema found, or nullptr if none was found
+  */
+  Schema *find_first_internal_schema() const;
+  /*
+    Initialize the path variable with default values
+  */
+  bool init();
+  /*
+    Free the memory allocated by the path variable
+  */
+  void free();
+  /*
+    Set the variable to the value of rhs, making a copy of the buffer
+
+    @param rhs              The path variable to copy from
+    @param version_increment (not used)
+  */
+  void set(const Sql_path &rhs, uint version_increment);
+  /*
+    Set the variable to the value of rhs, moving the buffer
+
+    @param rhs              The path variable to move from
+    @param version_increment (not used)
+  */
+  void set(Sql_path &&rhs, uint version_increment);
+
+  /*
+    Parse a string and set the path variable to the parsed value
+
+    @param thd              The thread handle
+    @param cs               The character set of the string
+    @param str              The string to parse
+  */
+  bool from_text(THD *thd, CHARSET_INFO *cs, const LEX_CSTRING &str);
+  /*
+    Get the number of bytes needed to print the path variable
+
+    @return The number of bytes needed
+  */
+  size_t text_format_nbytes_needed() const;
+  /*
+    Print the path variable to a string
+
+    @param dst              The destination buffer
+    @param nbytes_available The number of bytes available in the buffer
+
+    @return The number of bytes written
+  */
+  size_t print(char *dst, size_t nbytes_available) const;
+
+private:
+  /*
+    Add a schema to the path variable
+
+    @param schema_str       The schema name
+    @param schema_len       The length of the schema name
+
+    @return                 true if the schema could not be added
+  */
+  bool add_schema(const char *schema_str, size_t schema_len);
+};
+
+class Sql_path_save
+{
+protected:
+  Sql_path m_old_path;
+  Sql_path &m_path;
+public:
+  Sql_path_save(Sql_path &path) : m_path(path)
+  {
+    m_old_path= std::move(path);
+  }
+  ~Sql_path_save()
+  {
+    m_path= std::move(m_old_path);
+  }
+};
+
+class Sql_path_save_and_clear: public Sql_path_save
+{
+public:
+  Sql_path_save_and_clear(Sql_path &path) : Sql_path_save(path)
+  {
+    path.init();
+  }
+};
+
+#endif /* SQL_PATH_INCLUDED */
diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc
index 3f2099aef264c..3a303ab276d6d 100644
--- a/sql/sql_plugin.cc
+++ b/sql/sql_plugin.cc
@@ -3380,6 +3380,8 @@ void plugin_thdvar_cleanup(THD *thd)
   thd->variables.default_master_connection.str= 0;
   thd->variables.default_master_connection.length= 0;
 
+  thd->variables.path.free();
+
   mysql_mutex_lock(&LOCK_plugin);
 
   unlock_variables(thd, &thd->variables);
diff --git a/sql/sql_schema.cc b/sql/sql_schema.cc
index 776f7bcc4d75f..a33602013257b 100644
--- a/sql/sql_schema.cc
+++ b/sql/sql_schema.cc
@@ -87,6 +87,9 @@ Schema *Schema::find_by_name(const LEX_CSTRING &name)
 
 Schema *Schema::find_implied(THD *thd)
 {
+  if (Schema *from_path= thd->variables.path.find_first_internal_schema())
+    return from_path;
+
   if (thd->variables.sql_mode & MODE_ORACLE)
     return &oracle_schema;
   if (thd->variables.sql_mode & MODE_MAXDB)
diff --git a/sql/sql_view.cc b/sql/sql_view.cc
index 52c229b448638..8f1f37107d2a9 100644
--- a/sql/sql_view.cc
+++ b/sql/sql_view.cc
@@ -1018,6 +1018,7 @@ static int mysql_register_view(THD *thd, DDL_LOG_STATE *ddl_log_state,
   backup_file_name[0]= 0;
   {
     Sql_mode_save_for_frm_handling sql_mode_save(thd);
+    Sql_path_save_and_clear sql_path_save(thd->variables.path);
 
     lex->unit.print(&view_query, enum_query_type(QT_FOR_FRM |
                                                  QT_VIEW_INTERNAL |
@@ -1503,6 +1504,7 @@ bool mysql_make_view(THD *thd, TABLE_SHARE *share, TABLE_LIST *table,
     lex->stmt_lex= old_lex;
 
     Sql_mode_save_for_frm_handling sql_mode_save(thd);
+    Sql_path_save_and_clear sql_path_save(thd->variables.path);
     /* Parse the query. */
 
     parse_status= parse_sql(thd, & parser_state, table->view_creation_ctx);
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index 6a231c32c5998..3a4fda73b23ad 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -485,6 +485,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, size_t *yystacksize);
 %token  <kwd> CROSS                         /* SQL-2003-R */
 %token  <kwd> CUME_DIST_SYM
 %token  <kwd> CURDATE                       /* MYSQL-FUNC */
+%token  <kwd> CURRENT_PATH                  /* SQL-2003-R */
 %token  <kwd> CURRENT_ROLE                  /* SQL-2003-R */
 %token  <kwd> CURRENT_USER                  /* SQL-2003-R */
 %token  <kwd> CURSOR_SYM                    /* SQL-2003-R */
@@ -10387,6 +10388,14 @@ function_call_keyword:
             if (unlikely($$ == NULL))
               MYSQL_YYABORT;
           }
+        | CURRENT_PATH optional_braces
+          {
+            $$= new (thd->mem_root) Item_func_current_path(thd);
+            if (unlikely($$ == NULL))
+              MYSQL_YYABORT;
+            Lex->set_stmt_unsafe(LEX::BINLOG_STMT_UNSAFE_SYSTEM_FUNCTION);
+            Lex->safe_to_cache_query= 0;
+          }
         | CURRENT_USER optional_braces
           {
             $$= new (thd->mem_root) Item_func_current_user(thd,
@@ -10816,14 +10825,6 @@ function_call_conflict:
             if (unlikely($$ == NULL))
               MYSQL_YYABORT;
           }
-        | PASSWORD_SYM '(' expr ')'
-          {
-            Item* i1;
-            i1= new (thd->mem_root) Item_func_password(thd, $3);
-            if (unlikely(i1 == NULL))
-              MYSQL_YYABORT;
-            $$= i1;
-          }
         | REPEAT_SYM '(' expr ',' expr ')'
           {
             $$= new (thd->mem_root) Item_func_repeat(thd, $3, $5);
@@ -15934,6 +15935,7 @@ IDENT_sys:
 ident_cli_func:
           IDENT
         | IDENT_QUOTED
+        | keyword_set_special_case       { $$= $1; }
         | keyword_func_sp_var_and_label  { $$= $1; }
         | keyword_func_sp_var_not_label  { $$= $1; }
         ;
@@ -16293,6 +16295,7 @@ keyword_set_special_case:
           NAMES_SYM
         | ROLE_SYM
         | PASSWORD_SYM
+        | PATH_SYM
         ;
 
 keyword_sysvar_type:
@@ -16538,7 +16541,6 @@ keyword_func_sp_var_and_label:
         | PARTIAL
         | PARTITIONING_SYM
         | PARTITIONS_SYM
-        | PATH_SYM
         | PERSISTENT_SYM
         | PHASE_SYM
         | PLUGIN_SYM
@@ -16734,6 +16736,7 @@ reserved_keyword_udt_not_param_type:
         | CROSS
         | CUME_DIST_SYM
         | CURDATE
+        | CURRENT_PATH
         | CURRENT_USER
         | CURRENT_ROLE
         | CURTIME
@@ -17378,6 +17381,20 @@ option_value_no_option_type:
                                                            yychar == YYEMPTY)))
               MYSQL_YYABORT;
           }
+        | PATH_SYM equal
+          {
+            if (sp_create_assignment_lex(thd, $1.pos()))
+              MYSQL_YYABORT;
+          }
+          set_expr_or_default
+          {
+            Lex_ident_sys tmp(thd, &$1);
+
+            if (unlikely(!tmp.str) ||
+                unlikely(Lex->set_variable(&tmp, $4.expr, $4.expr_str)) ||
+                unlikely(sp_create_assignment_instr(thd, yychar == YYEMPTY)))
+              MYSQL_YYABORT;
+          }
         ;
 
 transaction_characteristics:
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc
index 9c892bb7d6c26..9148971ffb767 100644
--- a/sql/sys_vars.cc
+++ b/sql/sys_vars.cc
@@ -7478,3 +7478,8 @@ static Sys_var_ulonglong Sys_binlog_large_commit_threshold(
   // Allow a smaller minimum value for debug builds to help with testing
   VALID_RANGE(IF_DBUG(100, 10240) * 1024, ULLONG_MAX),
   DEFAULT(128 * 1024 * 1024), BLOCK_SIZE(1));
+
+static Sys_var_path Sys_path(
+        "path", "SET PATH statement",
+        SESSION_VAR(path), CMD_LINE(REQUIRED_ARG),
+        NOT_IN_BINLOG);
diff --git a/sql/sys_vars.inl b/sql/sys_vars.inl
index fee715983d1b5..5fd4bdd6de9bc 100644
--- a/sql/sys_vars.inl
+++ b/sql/sys_vars.inl
@@ -33,6 +33,7 @@
 #include "debug_sync.h"
 #include "sql_acl.h"    // check_global_access()
 #include "optimizer_defaults.h"   // create_optimizer_costs
+#include "sp_cache.h"
 
 /*
   a set of mostly trivial (as in f(X)=X) defines below to make system variable
@@ -3063,3 +3064,120 @@ private:
                                  character_set_collations);
   }
 };
+
+
+class Sys_var_path: public sys_var
+{
+public:
+  Sys_var_path(const char *name_arg, const char *comment,
+               int flag_args, ptrdiff_t off, size_t size,
+               CMD_LINE getopt,
+               enum binlog_status_enum binlog_status_arg)
+   :sys_var(&all_sys_vars, name_arg, comment,
+            flag_args, off, getopt.id, getopt.arg_type,
+            SHOW_CHAR,
+            DEFAULT(0), nullptr, binlog_status_arg,
+            nullptr, nullptr, nullptr)
+  {
+    option.var_type|= GET_STR;
+  }
+
+private:
+
+  static bool st_from_item(THD *thd, Sql_path *path,
+                           Item *item)
+  {
+    String *value, buffer;
+    if (!(value= item->val_str_ascii(&buffer)))
+      return true;
+    return path->from_text(thd, value->charset(), value->to_lex_cstring());
+  }
+
+  static const uchar *make_value_ptr(THD *thd,
+                                     const Sql_path &path)
+  {
+    size_t nbytes= path.text_format_nbytes_needed();
+    char *buf= thd->alloc(nbytes + 1);
+    size_t length= path.print(buf, nbytes);
+    buf[length]= '\0';
+    return (uchar *) buf;
+  }
+
+private:
+  bool do_check(THD *thd, set_var *var) override
+  {
+    Sql_path *path= new (thd->alloc<Sql_path>(1)) Sql_path();
+    if (!path || st_from_item(thd, path, var->value))
+    {
+      path->free();
+      return true;
+    }
+
+    var->save_result.ptr= path;
+    return false;
+  }
+
+  void session_save_default(THD *thd, set_var *var) override
+  {
+    thd->variables.path.set(global_system_variables.path, 1);
+  }
+
+  void global_save_default(THD *thd, set_var *var) override
+  {
+    global_system_variables.path.init();
+  }
+
+  bool session_update(THD *thd, set_var *var) override
+  {
+    if (thd->spcont)
+    {
+      /*
+        Because we invalidate the sp caches, we can't set the session path
+        in a stored function.
+      */
+      my_error(ER_VARIABLE_NOT_SETTABLE_IN_SF_OR_TRIGGER, MYF(0), name.str);
+      if (var->save_result.ptr)
+        ((Sql_path*) var->save_result.ptr)->free();
+      
+      return true;
+    }
+
+    if (!var->value)
+    {
+      session_save_default(thd, var);
+      return false;
+    }
+    thd->variables.path.set(std::move(*(Sql_path*) var->save_result.ptr), 1);
+    
+    /*
+      Invalidate the sp caches, as the path has changed and the caches
+      may contain entries that needs to be resolved again
+    */
+    sp_cache_invalidate();
+    return false;
+  }
+
+  bool global_update(THD *thd, set_var *var) override
+  {
+    if (!var->value)
+    {
+      global_save_default(thd, var);
+      return false;
+    }
+
+    global_system_variables.path= std::move(*(Sql_path*) var->save_result.ptr);
+    return false;
+  }
+
+  const uchar *
+  session_value_ptr(THD *thd, const LEX_CSTRING *base) const override
+  {
+    return make_value_ptr(thd, thd->variables.path);
+  }
+
+  const uchar *
+  global_value_ptr(THD *thd, const LEX_CSTRING *base) const override
+  {
+    return make_value_ptr(thd, global_system_variables.path);
+  }
+};