diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-11-10 16:12:45 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-11-10 16:12:45 +0200 |
| commit | a48aa0cd569eda88bef98ed4abe41b0b570fcd51 (patch) | |
| tree | 6008b19aabfe0554432c87614d1022594f08fc5f | |
| parent | 8409f721ffe2d91b11d3fc03c6872ff57051bbf8 (diff) | |
| parent | 386e5d476e9bf8f216c760c9076ae0ecdc99054d (diff) | |
| download | mariadb-git-a48aa0cd569eda88bef98ed4abe41b0b570fcd51.tar.gz | |
Merge bb-10.2-ext into 10.3
273 files changed, 8048 insertions, 11290 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index 62a4de7a10e..fa824d598e6 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -1092,7 +1092,7 @@ inline bool is_delimiter_command(char *name, ulong len) only name(first DELIMITER_NAME_LEN bytes) is checked. */ return (len >= DELIMITER_NAME_LEN && - !my_strnncoll(charset_info, (uchar*) name, DELIMITER_NAME_LEN, + !my_strnncoll(&my_charset_latin1, (uchar*) name, DELIMITER_NAME_LEN, (uchar *) DELIMITER_NAME, DELIMITER_NAME_LEN)); } diff --git a/extra/mariabackup/backup_copy.cc b/extra/mariabackup/backup_copy.cc index bc37f347532..0b501970efa 100644 --- a/extra/mariabackup/backup_copy.cc +++ b/extra/mariabackup/backup_copy.cc @@ -46,6 +46,7 @@ Place, Suite 330, Boston, MA 02111-1307 USA #include <ut0mem.h> #include <srv0start.h> #include <fil0fil.h> +#include <trx0sys.h> #include <set> #include <string> #include <mysqld.h> @@ -1680,26 +1681,30 @@ copy_back() ut_crc32_init(); /* copy undo tablespaces */ - if (srv_undo_tablespaces > 0) { - dst_dir = (srv_undo_dir && *srv_undo_dir) - ? srv_undo_dir : mysql_data_home; - ds_data = ds_create(dst_dir, DS_TYPE_LOCAL); + dst_dir = (srv_undo_dir && *srv_undo_dir) + ? srv_undo_dir : mysql_data_home; - for (ulong i = 1; i <= srv_undo_tablespaces; i++) { - char filename[20]; - sprintf(filename, "undo%03lu", i); - if (!(ret = copy_or_move_file(filename, filename, - dst_dir, 1))) { - goto cleanup; - } - } + ds_data = ds_create(dst_dir, DS_TYPE_LOCAL); - ds_destroy(ds_data); - ds_data = NULL; + for (uint i = 1; i <= TRX_SYS_MAX_UNDO_SPACES; i++) { + char filename[20]; + sprintf(filename, "undo%03u", i); + if (!file_exists(filename)) { + break; + } + if (!(ret = copy_or_move_file(filename, filename, + dst_dir, 1))) { + goto cleanup; + } } + ds_destroy(ds_data); + ds_data = NULL; + + /* copy redo logs */ + dst_dir = (srv_log_group_home_dir && *srv_log_group_home_dir) ? srv_log_group_home_dir : mysql_data_home; @@ -1825,7 +1830,7 @@ copy_back() } } - /* copy buufer pool dump */ + /* copy buffer pool dump */ if (innobase_buffer_pool_filename) { const char *src_name; diff --git a/extra/mariabackup/xtrabackup.cc b/extra/mariabackup/xtrabackup.cc index 320f9bcbeba..af00173a4de 100644 --- a/extra/mariabackup/xtrabackup.cc +++ b/extra/mariabackup/xtrabackup.cc @@ -2836,7 +2836,7 @@ static dberr_t enumerate_ibd_files(process_single_tablespace_func_t callback) /* We found a symlink or a file */ if (strlen(fileinfo.name) > 4) { bool is_isl= false; - if (ends_with(fileinfo.name, ".ibd") || ((is_isl = ends_with(fileinfo.name, ".ibd")))) + if (ends_with(fileinfo.name, ".ibd") || ((is_isl = ends_with(fileinfo.name, ".isl")))) (*callback)(dbinfo.name, fileinfo.name, is_isl); } } diff --git a/include/my_alloc.h b/include/my_alloc.h index 85ac75fc666..b461065eb7c 100644 --- a/include/my_alloc.h +++ b/include/my_alloc.h @@ -43,6 +43,7 @@ typedef struct st_mem_root /* if block have less memory it will be put in 'used' list */ size_t min_malloc; size_t block_size; /* initial block size */ + size_t total_alloc; unsigned int block_num; /* allocated blocks counter */ /* first free block in queue test counter (if it exceed diff --git a/include/mysql.h.pp b/include/mysql.h.pp index 4a196b3c772..b87316946a4 100644 --- a/include/mysql.h.pp +++ b/include/mysql.h.pp @@ -238,6 +238,7 @@ typedef struct st_mem_root USED_MEM *pre_alloc; size_t min_malloc; size_t block_size; + size_t total_alloc; unsigned int block_num; unsigned int first_block_usage; void (*error_handler)(void); diff --git a/mysql-test/extra/binlog_tests/binlog_index.inc b/mysql-test/extra/binlog_tests/binlog_index.inc index 50215aef9a9..b930386a0ba 100644 --- a/mysql-test/extra/binlog_tests/binlog_index.inc +++ b/mysql-test/extra/binlog_tests/binlog_index.inc @@ -18,7 +18,7 @@ call mtr.add_suppression('Attempting backtrace'); call mtr.add_suppression('MYSQL_BIN_LOG::purge_logs failed to process registered files that would be purged.'); call mtr.add_suppression('MYSQL_BIN_LOG::open failed to sync the index file'); call mtr.add_suppression('Turning logging off for the whole duration of the MySQL server process.'); -call mtr.add_suppression('Could not open .*'); +call mtr.add_suppression('Could not use .*'); call mtr.add_suppression('MYSQL_BIN_LOG::purge_logs failed to clean registers before purging logs.'); flush tables; diff --git a/mysql-test/extra/rpl_tests/rpl_binlog_errors.inc b/mysql-test/extra/rpl_tests/rpl_binlog_errors.inc index 49ab4f386bf..46c76f2b04c 100644 --- a/mysql-test/extra/rpl_tests/rpl_binlog_errors.inc +++ b/mysql-test/extra/rpl_tests/rpl_binlog_errors.inc @@ -286,7 +286,7 @@ SET GLOBAL debug_dbug=@old_debug; ### file or failure to write the rotate event. call mtr.add_suppression("MYSQL_BIN_LOG::open failed to sync the index file."); -call mtr.add_suppression("Could not open .*"); +call mtr.add_suppression("Could not use .*"); RESET MASTER; SHOW WARNINGS; @@ -392,7 +392,7 @@ RESET MASTER; call mtr.add_suppression("Slave I/O: Relay log write failure: could not queue event from master.*"); call mtr.add_suppression("Error writing file .*"); -call mtr.add_suppression("Could not open .*"); +call mtr.add_suppression("Could not use .*"); call mtr.add_suppression("MYSQL_BIN_LOG::open failed to sync the index file."); call mtr.add_suppression("Can't generate a unique log-filename .*"); -- echo ###################### TEST #13 diff --git a/mysql-test/include/check-testcase.test b/mysql-test/include/check-testcase.test index 3b2c2a46590..a282201857e 100644 --- a/mysql-test/include/check-testcase.test +++ b/mysql-test/include/check-testcase.test @@ -82,6 +82,8 @@ call mtr.check_testcase(); let $datadir=`select @@datadir`; list_files $datadir mysql_upgrade_info; +list_files $datadir/test #sql*; +list_files $datadir/mysql #sql*; --enable_query_log diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 1b072ef7dc7..9f83d6c9d6e 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -1914,10 +1914,10 @@ sub collect_mysqld_features_from_running_server () #print "Major: $1 Minor: $2 Build: $3\n"; $mysql_version_id= $1*10000 + $2*100 + $3; #print "mysql_version_id: $mysql_version_id\n"; - mtr_report("MySQL Version $1.$2.$3"); + mtr_report("MariaDB Version $1.$2.$3"); $mysql_version_extra= $4; } - mtr_error("Could not find version of MySQL") unless $mysql_version_id; + mtr_error("Could not find version of MariaDBL") unless $mysql_version_id; } sub find_mysqld { @@ -2207,7 +2207,7 @@ sub environment_setup { $ENV{'UMASK_DIR'}= "0770"; # The octal *string* # - # MySQL tests can produce output in various character sets + # MariaDB tests can produce output in various character sets # (especially, ctype_xxx.test). To avoid confusing Perl # with output which is incompatible with the current locale # settings, we reset the current values of LC_ALL and LC_CTYPE to "C". @@ -2538,7 +2538,7 @@ sub setup_vardir() { if (check_socket_path_length("$opt_tmpdir/testsocket.sock")){ mtr_error("Socket path '$opt_tmpdir' too long, it would be ", "truncated and thus not possible to use for connection to ", - "MySQL Server. Set a shorter with --tmpdir=<path> option"); + "MariaDB Server. Set a shorter with --tmpdir=<path> option"); } # copy all files from std_data into var/std_data @@ -4394,12 +4394,12 @@ sub extract_warning_lines ($$) { qr/Slave I\/O: error reconnecting to master '.*' - retry-time: [1-3] retries/, qr/Slave I\/0: Master command COM_BINLOG_DUMP failed/, qr/Error reading packet/, - qr/Lost connection to MySQL server at 'reading initial communication packet'/, + qr/Lost connection to MariaDB server at 'reading initial communication packet'/, qr/Failed on request_dump/, qr/Slave: Can't drop database.* database doesn't exist/, qr/Slave: Operation DROP USER failed for 'create_rout_db'/, qr|Checking table: '\..mtr.test_suppressions'|, - qr|Table \./test/bug53592 has a primary key in InnoDB data dictionary, but not in MySQL|, + qr|Table \./test/bug53592 has a primary key in InnoDB data dictionary, but not in|, qr|Table '\..mtr.test_suppressions' is marked as crashed and should be repaired|, qr|Table 'test_suppressions' is marked as crashed and should be repaired|, qr|Can't open shared library|, diff --git a/mysql-test/r/create.result b/mysql-test/r/create.result index dca48c07fe9..b4636dca7e2 100644 --- a/mysql-test/r/create.result +++ b/mysql-test/r/create.result @@ -1173,6 +1173,7 @@ t1 CREATE TABLE `t1` ( `MAX_STAGE` tinyint(2) NOT NULL DEFAULT 0, `PROGRESS` decimal(7,3) NOT NULL DEFAULT 0.000, `MEMORY_USED` bigint(7) NOT NULL DEFAULT 0, + `MAX_MEMORY_USED` bigint(7) NOT NULL DEFAULT 0, `EXAMINED_ROWS` int(7) NOT NULL DEFAULT 0, `QUERY_ID` bigint(4) NOT NULL DEFAULT 0, `INFO_BINARY` blob DEFAULT NULL, @@ -1196,6 +1197,7 @@ t1 CREATE TEMPORARY TABLE `t1` ( `MAX_STAGE` tinyint(2) NOT NULL DEFAULT 0, `PROGRESS` decimal(7,3) NOT NULL DEFAULT 0.000, `MEMORY_USED` bigint(7) NOT NULL DEFAULT 0, + `MAX_MEMORY_USED` bigint(7) NOT NULL DEFAULT 0, `EXAMINED_ROWS` int(7) NOT NULL DEFAULT 0, `QUERY_ID` bigint(4) NOT NULL DEFAULT 0, `INFO_BINARY` blob DEFAULT NULL, diff --git a/mysql-test/r/cte_nonrecursive.result b/mysql-test/r/cte_nonrecursive.result index 3ad6fb8fabe..d0e42cf4042 100644 --- a/mysql-test/r/cte_nonrecursive.result +++ b/mysql-test/r/cte_nonrecursive.result @@ -1079,3 +1079,71 @@ id select_type table type possible_keys key key_len ref rows Extra 3 DERIVED t2 ALL NULL NULL NULL NULL 3 Using where; Using join buffer (flat, BNL join) NULL UNION RESULT <union1,4> ALL NULL NULL NULL NULL NULL DROP TABLE t1,t2; +# +# MDEV-13780: tower of embedding CTEs with multiple usage of them +# +create table t1 (a int); +insert into t1 values (3), (2), (4), (7), (1), (2), (5); +with cte_e as +( +with cte_o as +( +with cte_i as (select * from t1 where a < 7) +select * from cte_i where a > 1 +) +select * from cte_o as cto_o1 where a < 3 +union +select * from cte_o as cto_o2 where a > 4 +) +select * from cte_e as cte_e1 where a > 1 +union +select * from cte_e as cte_e2; +a +2 +5 +explain extended with cte_e as +( +with cte_o as +( +with cte_i as (select * from t1 where a < 7) +select * from cte_i where a > 1 +) +select * from cte_o as cto_o1 where a < 3 +union +select * from cte_o as cto_o2 where a > 4 +) +select * from cte_e as cte_e1 where a > 1 +union +select * from cte_e as cte_e2; +id select_type table type possible_keys key key_len ref rows filtered Extra +1 PRIMARY <derived2> ALL NULL NULL NULL NULL 14 100.00 Using where +2 DERIVED t1 ALL NULL NULL NULL NULL 7 100.00 Using where +5 UNION t1 ALL NULL NULL NULL NULL 7 100.00 Using where +NULL UNION RESULT <union2,5> ALL NULL NULL NULL NULL NULL NULL +6 UNION <derived9> ALL NULL NULL NULL NULL 14 100.00 +9 DERIVED t1 ALL NULL NULL NULL NULL 7 100.00 Using where +12 UNION t1 ALL NULL NULL NULL NULL 7 100.00 Using where +NULL UNION RESULT <union9,12> ALL NULL NULL NULL NULL NULL NULL +NULL UNION RESULT <union1,6> ALL NULL NULL NULL NULL NULL NULL +Warnings: +Note 1003 with cte_e as (with cte_o as (with cte_i as (/* select#4 */ select `test`.`t1`.`a` AS `a` from `test`.`t1` where `test`.`t1`.`a` < 7)/* select#3 */ select `test`.`t1`.`a` AS `a` from `test`.`t1` where `test`.`t1`.`a` > 1)/* select#2 */ select `test`.`t1`.`a` AS `a` from `test`.`t1` where `test`.`t1`.`a` < 3 and `test`.`t1`.`a` > 1 and `test`.`t1`.`a` < 7 and `test`.`t1`.`a` > 1 union /* select#5 */ select `test`.`t1`.`a` AS `a` from `test`.`t1` where `test`.`t1`.`a` > 4 and `test`.`t1`.`a` > 1 and `test`.`t1`.`a` < 7 and `test`.`t1`.`a` > 1)/* select#1 */ select `cte_e1`.`a` AS `a` from `cte_e` `cte_e1` where `cte_e1`.`a` > 1 union /* select#6 */ select `cte_e2`.`a` AS `a` from `cte_e` `cte_e2` +drop table t1; +# +# MDEV-13753: embedded CTE in a VIEW created in prepared statement +# +SET @sql_query = " + CREATE OR REPLACE VIEW cte_test AS + WITH cte1 AS ( SELECT 1 as a from dual ) + , cte2 AS ( SELECT * FROM cte1 ) + SELECT * FROM cte2; +"; +PREPARE stmt FROM @sql_query; +EXECUTE stmt; +DEALLOCATE PREPARE stmt; +SHOW CREATE VIEW cte_test; +View Create View character_set_client collation_connection +cte_test CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `cte_test` AS with cte1 as (select 1 AS `a`), cte2 as (select `cte1`.`a` AS `a` from `cte1`)select `cte2`.`a` AS `a` from `cte2` latin1 latin1_swedish_ci +SELECT * FROM cte_test; +a +1 +DROP VIEW cte_test; diff --git a/mysql-test/r/cte_recursive.result b/mysql-test/r/cte_recursive.result index a4f32927cf1..b902333ddc4 100644 --- a/mysql-test/r/cte_recursive.result +++ b/mysql-test/r/cte_recursive.result @@ -2881,3 +2881,48 @@ f 2 set standard_compliant_cte=default; DROP TABLE t; +# +# mdev-14184: recursive CTE embedded into CTE with multiple references +# +WITH +cte1 AS ( +SELECT n FROM ( +WITH RECURSIVE rec_cte(n) AS ( +SELECT 1 as n1 +UNION ALL +SELECT n+1 as n2 FROM rec_cte WHERE n < 3 +) SELECT n FROM rec_cte +) AS X +), +cte2 as ( +SELECT 2 FROM cte1 +) +SELECT * +FROM cte1; +n +1 +2 +3 +# +# MDEV-14217 [db crash] Recursive CTE when SELECT includes new field +# +CREATE TEMPORARY TABLE a_tbl ( +a VARCHAR(33) PRIMARY KEY, +b VARCHAR(33) +); +INSERT INTO a_tbl VALUES ('block0', 'block0'), ('block1', NULL); +WITH RECURSIVE Q0 AS ( +SELECT T0.a, T0.b, 5 +FROM a_tbl T0 +WHERE b IS NULL +UNION ALL +SELECT T1.a, T1.b +FROM Q0 +JOIN a_tbl T1 +ON T1.a=Q0.a +) SELECT distinct(Q0.a), Q0.b +FROM Q0; +ERROR 21000: The used SELECT statements have a different number of columns +DROP TABLE a_tbl; +WITH RECURSIVE x AS (SELECT 1,2 UNION ALL SELECT 1 FROM x) SELECT * FROM x; +ERROR 21000: The used SELECT statements have a different number of columns diff --git a/mysql-test/r/delimiter_command_case_sensitivity.result b/mysql-test/r/delimiter_command_case_sensitivity.result new file mode 100644 index 00000000000..6ed281c757a --- /dev/null +++ b/mysql-test/r/delimiter_command_case_sensitivity.result @@ -0,0 +1,2 @@ +1 +1 diff --git a/mysql-test/r/derived_cond_pushdown.result b/mysql-test/r/derived_cond_pushdown.result index 9001c5fef43..d8d03d6d062 100644 --- a/mysql-test/r/derived_cond_pushdown.result +++ b/mysql-test/r/derived_cond_pushdown.result @@ -8783,6 +8783,47 @@ EXPLAIN DROP VIEW v2; DROP TABLE t1,t2; # +# MDEV-14237: derived with regexp_substr() in select list +# +create table t1 (a char(8)); +insert into t1 values ('b'), ('a'), ('xx'); +select * +from ( select distinct regexp_substr(t1.a,'^[A-Za-z]+') as f from t1) as t +where t.f = 'a' or t.f = 'b'; +f +b +a +explain format=json select * +from ( select distinct regexp_substr(t1.a,'^[A-Za-z]+') as f from t1) as t +where t.f = 'a' or t.f = 'b'; +EXPLAIN +{ + "query_block": { + "select_id": 1, + "table": { + "table_name": "<derived2>", + "access_type": "ALL", + "rows": 3, + "filtered": 100, + "attached_condition": "t.f = 'a' or t.f = 'b'", + "materialized": { + "query_block": { + "select_id": 2, + "temporary_table": { + "table": { + "table_name": "t1", + "access_type": "ALL", + "rows": 3, + "filtered": 100 + } + } + } + } + } + } +} +drop table t1; +# # MDEV-10855: Pushdown into derived with window functions # set @save_optimizer_switch= @@optimizer_switch; diff --git a/mysql-test/r/errors.result b/mysql-test/r/errors.result index a139d34fa86..ba05a2b37d4 100644 --- a/mysql-test/r/errors.result +++ b/mysql-test/r/errors.result @@ -174,3 +174,11 @@ set max_session_mem_used = 50000; select * from seq_1_to_1000; set max_session_mem_used = 8192; select * from seq_1_to_1000; +# +# MDEV-14269 errors.test fails with valgrind (Conditional jump or move depends on uninitialised value) +# +SET NAMES utf8; +SELECT UPDATEXML(-73 * -2465717823867977728,@@global.auto_increment_increment,null); +ERROR 22003: BIGINT value is out of range in '-73 * -2465717823867977728' +SELECT UPDATEXML(-73 * -2465717823867977728,@@global.long_query_time,null); +ERROR 22003: BIGINT value is out of range in '-73 * -2465717823867977728' diff --git a/mysql-test/r/func_misc.result b/mysql-test/r/func_misc.result index 6c7c6b018ad..982856e980a 100644 --- a/mysql-test/r/func_misc.result +++ b/mysql-test/r/func_misc.result @@ -1458,6 +1458,20 @@ CONCAT(NAME_CONST('name',15),'오') 15오 SET NAMES latin1; # +# MDEV-14116 INET6_NTOA output is set as null to varchar(39) variable +# +CREATE PROCEDURE p1() +BEGIN +DECLARE ip_full_addr varchar(39) DEFAULT ""; +SELECT INET6_NTOA(UNHEX('20000000000000000000000000000000')) into ip_full_addr; +SELECT ip_full_addr; +END; +$$ +CALL p1(); +ip_full_addr +2000:: +DROP PROCEDURE p1; +# # Start of 10.2 tests # # diff --git a/mysql-test/r/having.result b/mysql-test/r/having.result index 4a429e1b119..8a8d6e7b2aa 100644 --- a/mysql-test/r/having.result +++ b/mysql-test/r/having.result @@ -727,3 +727,76 @@ A COUNT(*) DROP VIEW v1; DROP TABLE t1; End of 10.1 tests +# +# MDEV-14093: GROUP BY with HAVING over function + ORDER BY +# +CREATE TABLE _authors ( +id MEDIUMINT(8) UNSIGNED AUTO_INCREMENT, +name VARCHAR(100), +some_field MEDIUMINT(8) UNSIGNED, +PRIMARY KEY (id), +index(some_field) +); +CREATE TABLE _books ( +id MEDIUMINT(8) UNSIGNED AUTO_INCREMENT, +title VARCHAR(100), +PRIMARY KEY (id) +); +CREATE TABLE _books2authors ( +author_id MEDIUMINT(8) DEFAULT 0, +book_id MEDIUMINT(8) DEFAULT 0, +index(author_id), +index(book_id) +); +INSERT INTO _authors (name, some_field) VALUES +('author1', 1),('author2', 2),('author3', 3); +INSERT INTO _books (title) VALUES +('book1'),('book2'),('book3'); +INSERT INTO _books2authors (author_id, book_id) VALUES +(2,1),(3,2),(3,3); +SELECT A.id, +GROUP_CONCAT(B.title ORDER BY B.title DESC SEPARATOR ',') AS books, +some_field-1 AS having_field +FROM _authors A +LEFT JOIN _books2authors B2A FORCE INDEX(author_id) +ON B2A.author_id = A.id +LEFT JOIN +_books B ON B.id = B2A.book_id +GROUP BY A.id +HAVING having_field < 1 +ORDER BY having_field ASC; +id books having_field +1 NULL 0 +DROP TABLE _authors, _books, _books2authors; +# +# Bug#17055185: WRONG RESULTS WHEN RUNNING A SELECT THAT INCLUDE +# A HAVING BASED ON A FUNCTION. +# +CREATE TABLE series ( +val INT(10) UNSIGNED NOT NULL +); +INSERT INTO series VALUES(1); +CREATE FUNCTION next_seq_value() RETURNS INT +BEGIN +DECLARE next_val INT; +SELECT val INTO next_val FROM series; +UPDATE series SET val=mod(val + 1, 2); +RETURN next_val; +END; +| +CREATE TABLE t1 (t INT, u INT, KEY(t)); +INSERT INTO t1 VALUES(10, 10), (11, 11), (12, 12), (12, 13),(14, 15), (15, 16), +(16, 17), (17, 17); +ANALYZE TABLE t1; +Table Op Msg_type Msg_text +test.t1 analyze status OK +SELECT t, next_seq_value() r FROM t1 FORCE INDEX(t) +GROUP BY t HAVING r = 1 ORDER BY t1.u; +t r +10 1 +12 1 +15 1 +17 1 +DROP TABLE t1; +DROP FUNCTION next_seq_value; +DROP TABLE series; diff --git a/mysql-test/r/mysqld--help.result b/mysql-test/r/mysqld--help.result index 1b5a0da7588..b5d68d6bee2 100644 --- a/mysql-test/r/mysqld--help.result +++ b/mysql-test/r/mysqld--help.result @@ -1496,7 +1496,7 @@ performance-schema-max-rwlock-classes 40 performance-schema-max-rwlock-instances -1 performance-schema-max-socket-classes 10 performance-schema-max-socket-instances -1 -performance-schema-max-stage-classes 150 +performance-schema-max-stage-classes 160 performance-schema-max-statement-classes 191 performance-schema-max-table-handles -1 performance-schema-max-table-instances -1 diff --git a/mysql-test/r/show_explain_ps.result b/mysql-test/r/show_explain_ps.result index 71c8f117fa2..fae432e830e 100644 --- a/mysql-test/r/show_explain_ps.result +++ b/mysql-test/r/show_explain_ps.result @@ -4,7 +4,7 @@ drop table if exists t0, t1; select * from performance_schema.setup_instruments where name like '%show_explain%'; NAME ENABLED TIMED wait/synch/cond/sql/show_explain YES YES -stage/sql/show explain YES YES +stage/sql/Show explain YES YES statement/sql/show_explain YES YES # We've got no instances select * from performance_schema.cond_instances where name like '%show_explain%'; @@ -38,5 +38,5 @@ thread_id in(select thread_id from performance_schema.events_statements_history_long where EVENT_NAME='statement/sql/show_explain'); event_name -stage/sql/show explain +stage/sql/Show explain drop table t0; diff --git a/mysql-test/r/subselect_exists2in.result b/mysql-test/r/subselect_exists2in.result index 8b525436c2f..95fc1c19b82 100644 --- a/mysql-test/r/subselect_exists2in.result +++ b/mysql-test/r/subselect_exists2in.result @@ -934,5 +934,42 @@ f2 foo set optimizer_switch= @optimizer_switch_save; DROP TABLE t1; +# +# MDEV-14164: Unknown column error when adding aggregate to function +# in oracle style procedure FOR loop +# +CREATE TABLE t1(id INT, val INT); +CREATE PROCEDURE p1() +BEGIN +DECLARE cur1 CURSOR FOR SELECT * FROM ( +SELECT DISTINCT id FROM t1) a +WHERE NOT EXISTS (SELECT * FROM ( SELECT id FROM t1) b +WHERE a.id=b.id); +OPEN cur1; +CLOSE cur1; +OPEN cur1; +CLOSE cur1; +END; +// +CALL p1(); +DROP PROCEDURE p1; +DROP TABLE t1; +CREATE TABLE t1(id INT, val INT); +CREATE PROCEDURE p1() +BEGIN +SELECT * FROM (SELECT DISTINCT id FROM t1) a +WHERE NOT a.id IN (SELECT b.id FROM t1 b); +SELECT * FROM (SELECT DISTINCT id FROM t1) a +WHERE NOT EXISTS (SELECT * FROM t1 b WHERE a.id=b.id); +END; +// +CALL p1(); +id +id +CALL p1(); +id +id +DROP PROCEDURE p1; +DROP TABLE t1; # End of 10.0 tests set optimizer_switch=default; diff --git a/mysql-test/r/type_bit.result b/mysql-test/r/type_bit.result index b2067907391..30cd94c9277 100644 --- a/mysql-test/r/type_bit.result +++ b/mysql-test/r/type_bit.result @@ -806,3 +806,27 @@ SUM(a) NULL DROP TABLE t1; End of 5.1 tests +# +# Start of 10.1 tests +# +# +# MDEV-8867 Wrong field type or metadata for COALESCE(bit_column, 1) +# +CREATE TABLE t1 (val bit(1)); +INSERT INTO t1 VALUES (0); +CREATE TABLE t2 AS SELECT COALESCE(val, 1) AS c FROM t1; +SELECT * FROM t2; +c +0 +SHOW CREATE TABLE t2; +Table Create Table +t2 CREATE TABLE `t2` ( + `c` decimal(1,0) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +DROP TABLE t2; +SELECT COALESCE(val, 1) FROM t1; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def COALESCE(val, 1) 246 2 1 Y 32896 0 63 +COALESCE(val, 1) +0 +DROP TABLE t1; diff --git a/mysql-test/r/type_date.result b/mysql-test/r/type_date.result index d56fac962fe..69bdf569787 100644 --- a/mysql-test/r/type_date.result +++ b/mysql-test/r/type_date.result @@ -852,6 +852,17 @@ Warning 1292 Incorrect datetime value: '1' Warning 1292 Incorrect datetime value: '1' DROP TABLE t1; # +# MDEV-14221 Assertion `0' failed in Item::field_type_for_temporal_comparison +# +CREATE TABLE t1 (d DATE); +INSERT INTO t1 VALUES ('1985-05-13'),('1989-12-24'); +SELECT d, COUNT(*) FROM t1 GROUP BY d WITH ROLLUP HAVING CASE d WHEN '2017-05-25' THEN 0 ELSE 1 END; +d COUNT(*) +1985-05-13 1 +1989-12-24 1 +NULL 2 +DROP TABLE t1; +# # End of 10.1 tests # # diff --git a/mysql-test/r/type_time.result b/mysql-test/r/type_time.result index 1600732cec3..89718ea8363 100644 --- a/mysql-test/r/type_time.result +++ b/mysql-test/r/type_time.result @@ -1245,6 +1245,20 @@ a b c 2070 00:00:00 00:00:00 DROP TABLE t1,t2; # +# MDEV-10817 CAST(MAX(DATE'2001-01-01') AS TIME) returns a wrong result +# +SELECT CAST(DATE'2001-01-01' AS TIME); +CAST(DATE'2001-01-01' AS TIME) +00:00:00 +SELECT CAST(MAX(DATE'2001-01-01') AS TIME); +CAST(MAX(DATE'2001-01-01') AS TIME) +00:00:00 +CREATE FUNCTION f1() RETURNS DATE RETURN DATE'2001-01-01'; +SELECT CAST(f1() AS TIME); +CAST(f1() AS TIME) +00:00:00 +DROP FUNCTION f1; +# # End of 10.2 tests # # diff --git a/mysql-test/suite/binlog/r/binlog_index.result b/mysql-test/suite/binlog/r/binlog_index.result index bb5d9ff74f1..02af5e40aab 100644 --- a/mysql-test/suite/binlog/r/binlog_index.result +++ b/mysql-test/suite/binlog/r/binlog_index.result @@ -2,7 +2,7 @@ call mtr.add_suppression('Attempting backtrace'); call mtr.add_suppression('MYSQL_BIN_LOG::purge_logs failed to process registered files that would be purged.'); call mtr.add_suppression('MYSQL_BIN_LOG::open failed to sync the index file'); call mtr.add_suppression('Turning logging off for the whole duration of the MySQL server process.'); -call mtr.add_suppression('Could not open .*'); +call mtr.add_suppression('Could not use .*'); call mtr.add_suppression('MYSQL_BIN_LOG::purge_logs failed to clean registers before purging logs.'); flush tables; RESET MASTER; diff --git a/mysql-test/suite/binlog_encryption/binlog_index.result b/mysql-test/suite/binlog_encryption/binlog_index.result index bb5d9ff74f1..02af5e40aab 100644 --- a/mysql-test/suite/binlog_encryption/binlog_index.result +++ b/mysql-test/suite/binlog_encryption/binlog_index.result @@ -2,7 +2,7 @@ call mtr.add_suppression('Attempting backtrace'); call mtr.add_suppression('MYSQL_BIN_LOG::purge_logs failed to process registered files that would be purged.'); call mtr.add_suppression('MYSQL_BIN_LOG::open failed to sync the index file'); call mtr.add_suppression('Turning logging off for the whole duration of the MySQL server process.'); -call mtr.add_suppression('Could not open .*'); +call mtr.add_suppression('Could not use .*'); call mtr.add_suppression('MYSQL_BIN_LOG::purge_logs failed to clean registers before purging logs.'); flush tables; RESET MASTER; diff --git a/mysql-test/suite/binlog_encryption/rpl_binlog_errors.result b/mysql-test/suite/binlog_encryption/rpl_binlog_errors.result index 06be72d523b..eb58dd06997 100644 --- a/mysql-test/suite/binlog_encryption/rpl_binlog_errors.result +++ b/mysql-test/suite/binlog_encryption/rpl_binlog_errors.result @@ -173,7 +173,7 @@ SET SQL_LOG_BIN=1; SET GLOBAL debug_dbug=@old_debug; ###################### TEST #10 call mtr.add_suppression("MYSQL_BIN_LOG::open failed to sync the index file."); -call mtr.add_suppression("Could not open .*"); +call mtr.add_suppression("Could not use .*"); RESET MASTER; SHOW WARNINGS; Level Code Message @@ -233,7 +233,7 @@ include/rpl_reset.inc connection slave; call mtr.add_suppression("Slave I/O: Relay log write failure: could not queue event from master.*"); call mtr.add_suppression("Error writing file .*"); -call mtr.add_suppression("Could not open .*"); +call mtr.add_suppression("Could not use .*"); call mtr.add_suppression("MYSQL_BIN_LOG::open failed to sync the index file."); call mtr.add_suppression("Can't generate a unique log-filename .*"); ###################### TEST #13 diff --git a/mysql-test/suite/funcs_1/datadict/processlist_priv.inc b/mysql-test/suite/funcs_1/datadict/processlist_priv.inc index cd060e7a370..ae46dfd31c8 100644 --- a/mysql-test/suite/funcs_1/datadict/processlist_priv.inc +++ b/mysql-test/suite/funcs_1/datadict/processlist_priv.inc @@ -158,7 +158,7 @@ WHERE DB = 'information_schema' AND COMMAND = 'Sleep' AND USER = 'ddicttestuser1 eval SHOW CREATE TABLE $table; --replace_column 1 ID 3 HOST_NAME 6 TIME 9 TIME_MS eval SHOW $table; ---replace_column 1 ID 3 HOST_NAME 6 TIME 9 TIME_MS 13 MEMORY 14 ROWS 15 QUERY_ID 17 TID +--replace_column 1 ID 3 HOST_NAME 6 TIME 9 TIME_MS 13 MEMORY 14 MAX_MEMORY 15 ROWS 16 QUERY_ID 18 TID eval SELECT * FROM $table $select_where ORDER BY id; --replace_column 1 ID 3 HOST_NAME 6 TIME 9 TIME_MS 13 MEMORY 14 ROWS 15 QUERY_ID 17 TID eval SELECT $columns FROM $table $select_where ORDER BY id; @@ -178,7 +178,7 @@ connection con100; eval SHOW CREATE TABLE $table; --replace_column 1 ID 3 HOST_NAME 6 TIME 9 TIME_MS eval SHOW $table; ---replace_column 1 ID 3 HOST_NAME 6 TIME 9 TIME_MS 13 MEMORY 14 ROWS 15 QUERY_ID 17 TID +--replace_column 1 ID 3 HOST_NAME 6 TIME 9 TIME_MS 13 MEMORY 14 MAX_MEMORY 15 ROWS 16 QUERY_ID 18 TID eval SELECT * FROM $table $select_where ORDER BY id; --replace_column 1 ID 3 HOST_NAME 6 TIME 9 TIME_MS 13 MEMORY 14 ROWS 15 QUERY_ID 17 TID eval SELECT $columns FROM $table $select_where ORDER BY id; @@ -204,7 +204,7 @@ connection con100; SHOW GRANTS; --replace_column 1 ID 3 HOST_NAME 6 TIME 9 TIME_MS SHOW processlist; ---replace_column 1 ID 3 HOST_NAME 6 TIME 9 TIME_MS 13 MEMORY 14 ROWS 15 QUERY_ID 17 TID +--replace_column 1 ID 3 HOST_NAME 6 TIME 9 TIME_MS 13 MEMORY 14 MAX_MEMORY 15 ROWS 16 QUERY_ID 18 TID SELECT * FROM information_schema.processlist; --real_sleep 0.3 @@ -216,7 +216,7 @@ connect (con101,localhost,ddicttestuser1,ddictpass,information_schema); SHOW GRANTS; --replace_column 1 ID 3 HOST_NAME 6 TIME 9 TIME_MS SHOW processlist; ---replace_column 1 ID 3 HOST_NAME 6 TIME 9 TIME_MS 13 MEMORY 14 ROWS 15 QUERY_ID 17 TID +--replace_column 1 ID 3 HOST_NAME 6 TIME 9 TIME_MS 13 MEMORY 14 MAX_MEMORY 15 ROWS 16 QUERY_ID 18 TID SELECT * FROM information_schema.processlist; --real_sleep 0.3 @@ -239,7 +239,7 @@ connect (anonymous1,localhost,"''",,information_schema); SHOW GRANTS; --replace_column 1 ID 3 HOST_NAME 6 TIME 9 TIME_MS SHOW processlist; ---replace_column 1 ID 3 HOST_NAME 6 TIME 9 TIME_MS 13 MEMORY 14 ROWS 15 QUERY_ID 17 TID +--replace_column 1 ID 3 HOST_NAME 6 TIME 9 TIME_MS 13 MEMORY 14 MAX_MEMORY 15 ROWS 16 QUERY_ID 18 TID SELECT * FROM information_schema.processlist; --real_sleep 0.3 @@ -261,7 +261,7 @@ connect (con102,localhost,ddicttestuser1,ddictpass,information_schema); SHOW GRANTS; --replace_column 1 ID 3 HOST_NAME 6 TIME 9 TIME_MS SHOW processlist; ---replace_column 1 ID 3 HOST_NAME 6 TIME 9 TIME_MS 13 MEMORY 14 ROWS 15 QUERY_ID 17 TID +--replace_column 1 ID 3 HOST_NAME 6 TIME 9 TIME_MS 13 MEMORY 14 MAX_MEMORY 15 ROWS 16 QUERY_ID 18 TID SELECT * FROM information_schema.processlist; --real_sleep 0.3 @@ -287,7 +287,7 @@ if ($fixed_bug_30395) --replace_column 1 ID 3 HOST_NAME 6 TIME 9 TIME_MS SHOW processlist; } ---replace_column 1 ID 3 HOST_NAME 6 TIME 9 TIME_MS 13 MEMORY 14 ROWS 15 QUERY_ID 17 TID +--replace_column 1 ID 3 HOST_NAME 6 TIME 9 TIME_MS 13 MEMORY 14 MAX_MEMORY 15 ROWS 16 QUERY_ID 18 TID SELECT * FROM information_schema.processlist; --real_sleep 0.3 @@ -308,7 +308,7 @@ connect (con103,localhost,ddicttestuser1,ddictpass,information_schema); SHOW GRANTS FOR 'ddicttestuser1'@'localhost'; --replace_column 1 ID 3 HOST_NAME 6 TIME 9 TIME_MS SHOW processlist; ---replace_column 1 ID 3 HOST_NAME 6 TIME 9 TIME_MS 13 MEMORY 14 ROWS 15 QUERY_ID 17 TID +--replace_column 1 ID 3 HOST_NAME 6 TIME 9 TIME_MS 13 MEMORY 14 MAX_MEMORY 15 ROWS 16 QUERY_ID 18 TID SELECT * FROM information_schema.processlist; --real_sleep 0.3 @@ -330,7 +330,7 @@ connect (con104,localhost,ddicttestuser1,ddictpass,information_schema); SHOW GRANTS FOR 'ddicttestuser1'@'localhost'; --replace_column 1 ID 3 HOST_NAME 6 TIME 9 TIME_MS SHOW processlist; ---replace_column 1 ID 3 HOST_NAME 6 TIME 9 TIME_MS 13 MEMORY 14 ROWS 15 QUERY_ID 17 TID +--replace_column 1 ID 3 HOST_NAME 6 TIME 9 TIME_MS 13 MEMORY 14 MAX_MEMORY 15 ROWS 16 QUERY_ID 18 TID SELECT * FROM information_schema.processlist; --real_sleep 0.3 @@ -377,7 +377,7 @@ connect (con200,localhost,ddicttestuser2,ddictpass,information_schema); SHOW GRANTS FOR 'ddicttestuser2'@'localhost'; --replace_column 1 ID 3 HOST_NAME 6 TIME 9 TIME_MS SHOW processlist; ---replace_column 1 ID 3 HOST_NAME 6 TIME 9 TIME_MS 13 MEMORY 14 ROWS 15 QUERY_ID 17 TID +--replace_column 1 ID 3 HOST_NAME 6 TIME 9 TIME_MS 13 MEMORY 14 MAX_MEMORY 15 ROWS 16 QUERY_ID 18 TID SELECT * FROM information_schema.processlist; --real_sleep 0.3 @@ -398,7 +398,7 @@ connect (con201,localhost,ddicttestuser2,ddictpass,information_schema); SHOW GRANTS; --replace_column 1 ID 3 HOST_NAME 6 TIME 9 TIME_MS SHOW processlist; ---replace_column 1 ID 3 HOST_NAME 6 TIME 9 TIME_MS 13 MEMORY 14 ROWS 15 QUERY_ID 17 TID +--replace_column 1 ID 3 HOST_NAME 6 TIME 9 TIME_MS 13 MEMORY 14 MAX_MEMORY 15 ROWS 16 QUERY_ID 18 TID SELECT * FROM information_schema.processlist; --real_sleep 0.3 @@ -421,7 +421,7 @@ SHOW GRANTS FOR 'ddicttestuser1'@'localhost'; GRANT PROCESS ON *.* TO 'ddicttestuser2'@'localhost'; --replace_column 1 ID 3 HOST_NAME 6 TIME 9 TIME_MS SHOW processlist; ---replace_column 1 ID 3 HOST_NAME 6 TIME 9 TIME_MS 13 MEMORY 14 ROWS 15 QUERY_ID 17 TID +--replace_column 1 ID 3 HOST_NAME 6 TIME 9 TIME_MS 13 MEMORY 14 MAX_MEMORY 15 ROWS 16 QUERY_ID 18 TID SELECT * FROM information_schema.processlist; --real_sleep 0.3 @@ -445,7 +445,7 @@ connect (con108,localhost,ddicttestuser1,ddictpass,information_schema); SHOW GRANTS FOR 'ddicttestuser1'@'localhost'; --replace_column 1 ID 3 HOST_NAME 6 TIME 9 TIME_MS SHOW processlist; ---replace_column 1 ID 3 HOST_NAME 6 TIME 9 TIME_MS 13 MEMORY 14 ROWS 15 QUERY_ID 17 TID +--replace_column 1 ID 3 HOST_NAME 6 TIME 9 TIME_MS 13 MEMORY 14 MAX_MEMORY 15 ROWS 16 QUERY_ID 18 TID SELECT * FROM information_schema.processlist; --real_sleep 0.3 diff --git a/mysql-test/suite/funcs_1/datadict/processlist_val.inc b/mysql-test/suite/funcs_1/datadict/processlist_val.inc index cfc3c5e751a..24f3eb76a1c 100644 --- a/mysql-test/suite/funcs_1/datadict/processlist_val.inc +++ b/mysql-test/suite/funcs_1/datadict/processlist_val.inc @@ -92,7 +92,7 @@ echo # - INFO must contain the corresponding SHOW/SELECT PROCESSLIST # # 1. Just dump what we get ---replace_column 1 <ID> 3 <HOST_NAME> 6 <TIME> 9 <TIME_MS> 13 <MEMORY> 14 <ROWS> 15 <QUERY_ID> 17 <TID> +--replace_column 1 <ID> 3 <HOST_NAME> 6 <TIME> 9 <TIME_MS> 13 <MEMORY> 14 <MAX_MEMORY> 15 <ROWS> 16 <QUERY_ID> 18 <TID> SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST; --replace_column 1 <ID> 3 <HOST_NAME> 6 <TIME> 9 <TIME_MS> 13 <MEMORY> 14 <ROWS> SHOW FULL PROCESSLIST; @@ -159,7 +159,7 @@ let $wait_condition= SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE COMMAND = 'Sleep' AND USER = 'test_user'; --source include/wait_condition.inc # 1. Just dump what we get ---replace_column 1 <ID> 3 <HOST_NAME> 6 <TIME> 7 <STATE> 9 <TIME_MS> 13 <MEMORY> 14 <ROWS> 15 <QUERY_ID> 17 <TID> +--replace_column 1 <ID> 3 <HOST_NAME> 6 <TIME> 7 <STATE> 9 <TIME_MS> 13 <MEMORY> 14 <MAX_MEMORY> 15 <ROWS> 16 <QUERY_ID> 18 <TID> SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST; --replace_column 1 <ID> 3 <HOST_NAME> 6 <TIME> SHOW FULL PROCESSLIST; @@ -201,7 +201,7 @@ echo #---------------------------------------------------------------------------- ; connection con1; ---replace_column 1 <ID> 3 <HOST_NAME> 6 <TIME> 9 <TIME_MS> 13 <MEMORY> 14 <ROWS> 15 <QUERY_ID> 17 <TID> +--replace_column 1 <ID> 3 <HOST_NAME> 6 <TIME> 9 <TIME_MS> 13 <MEMORY> 14 <MAX_MEMORY> 15 <ROWS> 16 <QUERY_ID> 18 <TID> SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST; --replace_column 1 <ID> 3 <HOST_NAME> 6 <TIME> SHOW FULL PROCESSLIST; @@ -226,7 +226,7 @@ let $wait_condition= SELECT COUNT(*) = 2 FROM INFORMATION_SCHEMA.PROCESSLIST --source include/wait_condition.inc connection con2; # Just dump what we get ---replace_column 1 <ID> 3 <HOST_NAME> 6 <TIME> 9 <TIME_MS> 13 <MEMORY> 14 <ROWS> 15 <QUERY_ID> 17 <TID> +--replace_column 1 <ID> 3 <HOST_NAME> 6 <TIME> 9 <TIME_MS> 13 <MEMORY> 14 <MAX_MEMORY> 15 <ROWS> 16 <QUERY_ID> 18 <TID> SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST; --replace_column 1 <ID> 3 <HOST_NAME> 6 <TIME> SHOW FULL PROCESSLIST; @@ -277,7 +277,7 @@ WHERE ID = @test_user_con2_id AND Command IN('Query','Execute') AND State = 'User sleep' AND INFO IS NOT NULL ; --source include/wait_condition.inc # 1. Just dump what we get ---replace_column 1 <ID> 3 <HOST_NAME> 6 <TIME> 9 <TIME_MS> 13 <MEMORY> 14 <ROWS> 15 <QUERY_ID> 17 <TID> +--replace_column 1 <ID> 3 <HOST_NAME> 6 <TIME> 9 <TIME_MS> 13 <MEMORY> 14 <MAX_MEMORY> 15 <ROWS> 16 <QUERY_ID> 18 <TID> SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST; --replace_column 1 <ID> 3 <HOST_NAME> 6 <TIME> SHOW FULL PROCESSLIST; @@ -336,7 +336,7 @@ let $wait_condition= SELECT COUNT(*) FROM INFORMATION_SCHEMA.PROCESSLIST # # Expect to see the state 'Waiting for table metadata lock' for the third # connection because the SELECT collides with the WRITE TABLE LOCK. ---replace_column 1 <ID> 3 <HOST_NAME> 6 <TIME> 9 <TIME_MS> 13 <MEMORY> 14 <ROWS> 15 <QUERY_ID> 17 <TID> +--replace_column 1 <ID> 3 <HOST_NAME> 6 <TIME> 9 <TIME_MS> 13 <MEMORY> 14 <MAX_MEMORY> 15 <ROWS> 16 <QUERY_ID> 18 <TID> SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST; UNLOCK TABLES; # @@ -383,7 +383,7 @@ echo # SHOW FULL PROCESSLIST Complete statement # SHOW PROCESSLIST statement truncated after 100 char ; ---replace_column 1 <ID> 3 <HOST_NAME> 5 <COMMAND> 6 <TIME> 7 <STATE> 9 <TIME_MS> 13 <MEMORY> 14 <ROWS> 15 <QUERY_ID> 17 <TID> +--replace_column 1 <ID> 3 <HOST_NAME> 5 <COMMAND> 6 <TIME> 7 <STATE> 9 <TIME_MS> 13 <MEMORY> 14 <MAX_MEMORY> 15 <ROWS> 16 <QUERY_ID> 18 <TID> SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST; --replace_column 1 <ID> 3 <HOST_NAME> 5 <COMMAND> 6 <TIME> 7 <STATE> SHOW FULL PROCESSLIST; diff --git a/mysql-test/suite/funcs_1/r/is_columns_is.result b/mysql-test/suite/funcs_1/r/is_columns_is.result index 58105c8d945..ba055f2dc58 100644 --- a/mysql-test/suite/funcs_1/r/is_columns_is.result +++ b/mysql-test/suite/funcs_1/r/is_columns_is.result @@ -256,18 +256,19 @@ def information_schema PLUGINS PLUGIN_TYPE_VERSION 5 '' NO varchar 20 60 NULL NU def information_schema PLUGINS PLUGIN_VERSION 2 '' NO varchar 20 60 NULL NULL NULL utf8 utf8_general_ci varchar(20) select NEVER NULL def information_schema PROCESSLIST COMMAND 5 '' NO varchar 16 48 NULL NULL NULL utf8 utf8_general_ci varchar(16) select NEVER NULL def information_schema PROCESSLIST DB 4 NULL YES varchar 64 192 NULL NULL NULL utf8 utf8_general_ci varchar(64) select NEVER NULL -def information_schema PROCESSLIST EXAMINED_ROWS 14 0 NO int NULL NULL 10 0 NULL NULL NULL int(7) select NEVER NULL +def information_schema PROCESSLIST EXAMINED_ROWS 15 0 NO int NULL NULL 10 0 NULL NULL NULL int(7) select NEVER NULL def information_schema PROCESSLIST HOST 3 '' NO varchar 64 192 NULL NULL NULL utf8 utf8_general_ci varchar(64) select NEVER NULL def information_schema PROCESSLIST ID 1 0 NO bigint NULL NULL 19 0 NULL NULL NULL bigint(4) select NEVER NULL def information_schema PROCESSLIST INFO 8 NULL YES longtext 4294967295 4294967295 NULL NULL NULL utf8 utf8_general_ci longtext select NEVER NULL -def information_schema PROCESSLIST INFO_BINARY 16 NULL YES blob 65535 65535 NULL NULL NULL NULL NULL blob select NEVER NULL +def information_schema PROCESSLIST INFO_BINARY 17 NULL YES blob 65535 65535 NULL NULL NULL NULL NULL blob select NEVER NULL +def information_schema PROCESSLIST MAX_MEMORY_USED 14 0 NO bigint NULL NULL 19 0 NULL NULL NULL bigint(7) select NEVER NULL def information_schema PROCESSLIST MAX_STAGE 11 0 NO tinyint NULL NULL 3 0 NULL NULL NULL tinyint(2) select NEVER NULL def information_schema PROCESSLIST MEMORY_USED 13 0 NO bigint NULL NULL 19 0 NULL NULL NULL bigint(7) select NEVER NULL def information_schema PROCESSLIST PROGRESS 12 0.000 NO decimal NULL NULL 7 3 NULL NULL NULL decimal(7,3) select NEVER NULL -def information_schema PROCESSLIST QUERY_ID 15 0 NO bigint NULL NULL 19 0 NULL NULL NULL bigint(4) select NEVER NULL +def information_schema PROCESSLIST QUERY_ID 16 0 NO bigint NULL NULL 19 0 NULL NULL NULL bigint(4) select NEVER NULL def information_schema PROCESSLIST STAGE 10 0 NO tinyint NULL NULL 3 0 NULL NULL NULL tinyint(2) select NEVER NULL def information_schema PROCESSLIST STATE 7 NULL YES varchar 64 192 NULL NULL NULL utf8 utf8_general_ci varchar(64) select NEVER NULL -def information_schema PROCESSLIST TID 17 0 NO bigint NULL NULL 19 0 NULL NULL NULL bigint(4) select NEVER NULL +def information_schema PROCESSLIST TID 18 0 NO bigint NULL NULL 19 0 NULL NULL NULL bigint(4) select NEVER NULL def information_schema PROCESSLIST TIME 6 0 NO int NULL NULL 10 0 NULL NULL NULL int(7) select NEVER NULL def information_schema PROCESSLIST TIME_MS 9 0.000 NO decimal NULL NULL 22 3 NULL NULL NULL decimal(22,3) select NEVER NULL def information_schema PROCESSLIST USER 2 '' NO varchar 128 384 NULL NULL NULL utf8 utf8_general_ci varchar(128) select NEVER NULL @@ -797,6 +798,7 @@ NULL information_schema PROCESSLIST STAGE tinyint NULL NULL NULL NULL tinyint(2) NULL information_schema PROCESSLIST MAX_STAGE tinyint NULL NULL NULL NULL tinyint(2) NULL information_schema PROCESSLIST PROGRESS decimal NULL NULL NULL NULL decimal(7,3) NULL information_schema PROCESSLIST MEMORY_USED bigint NULL NULL NULL NULL bigint(7) +NULL information_schema PROCESSLIST MAX_MEMORY_USED bigint NULL NULL NULL NULL bigint(7) NULL information_schema PROCESSLIST EXAMINED_ROWS int NULL NULL NULL NULL int(7) NULL information_schema PROCESSLIST QUERY_ID bigint NULL NULL NULL NULL bigint(4) 1.0000 information_schema PROCESSLIST INFO_BINARY blob 65535 65535 NULL NULL blob diff --git a/mysql-test/suite/funcs_1/r/is_columns_is_embedded.result b/mysql-test/suite/funcs_1/r/is_columns_is_embedded.result index 4e12db06817..3bb5e5e6364 100644 --- a/mysql-test/suite/funcs_1/r/is_columns_is_embedded.result +++ b/mysql-test/suite/funcs_1/r/is_columns_is_embedded.result @@ -256,18 +256,19 @@ def information_schema PLUGINS PLUGIN_TYPE_VERSION 5 '' NO varchar 20 60 NULL NU def information_schema PLUGINS PLUGIN_VERSION 2 '' NO varchar 20 60 NULL NULL NULL utf8 utf8_general_ci varchar(20) NEVER NULL def information_schema PROCESSLIST COMMAND 5 '' NO varchar 16 48 NULL NULL NULL utf8 utf8_general_ci varchar(16) NEVER NULL def information_schema PROCESSLIST DB 4 NULL YES varchar 64 192 NULL NULL NULL utf8 utf8_general_ci varchar(64) NEVER NULL -def information_schema PROCESSLIST EXAMINED_ROWS 14 0 NO int NULL NULL 10 0 NULL NULL NULL int(7) NEVER NULL +def information_schema PROCESSLIST EXAMINED_ROWS 15 0 NO int NULL NULL 10 0 NULL NULL NULL int(7) NEVER NULL def information_schema PROCESSLIST HOST 3 '' NO varchar 64 192 NULL NULL NULL utf8 utf8_general_ci varchar(64) NEVER NULL def information_schema PROCESSLIST ID 1 0 NO bigint NULL NULL 19 0 NULL NULL NULL bigint(4) NEVER NULL def information_schema PROCESSLIST INFO 8 NULL YES longtext 4294967295 4294967295 NULL NULL NULL utf8 utf8_general_ci longtext NEVER NULL -def information_schema PROCESSLIST INFO_BINARY 16 NULL YES blob 65535 65535 NULL NULL NULL NULL NULL blob NEVER NULL +def information_schema PROCESSLIST INFO_BINARY 17 NULL YES blob 65535 65535 NULL NULL NULL NULL NULL blob NEVER NULL +def information_schema PROCESSLIST MAX_MEMORY_USED 14 0 NO bigint NULL NULL 19 0 NULL NULL NULL bigint(7) NEVER NULL def information_schema PROCESSLIST MAX_STAGE 11 0 NO tinyint NULL NULL 3 0 NULL NULL NULL tinyint(2) NEVER NULL def information_schema PROCESSLIST MEMORY_USED 13 0 NO bigint NULL NULL 19 0 NULL NULL NULL bigint(7) NEVER NULL def information_schema PROCESSLIST PROGRESS 12 0.000 NO decimal NULL NULL 7 3 NULL NULL NULL decimal(7,3) NEVER NULL -def information_schema PROCESSLIST QUERY_ID 15 0 NO bigint NULL NULL 19 0 NULL NULL NULL bigint(4) NEVER NULL +def information_schema PROCESSLIST QUERY_ID 16 0 NO bigint NULL NULL 19 0 NULL NULL NULL bigint(4) NEVER NULL def information_schema PROCESSLIST STAGE 10 0 NO tinyint NULL NULL 3 0 NULL NULL NULL tinyint(2) NEVER NULL def information_schema PROCESSLIST STATE 7 NULL YES varchar 64 192 NULL NULL NULL utf8 utf8_general_ci varchar(64) NEVER NULL -def information_schema PROCESSLIST TID 17 0 NO bigint NULL NULL 19 0 NULL NULL NULL bigint(4) NEVER NULL +def information_schema PROCESSLIST TID 18 0 NO bigint NULL NULL 19 0 NULL NULL NULL bigint(4) NEVER NULL def information_schema PROCESSLIST TIME 6 0 NO int NULL NULL 10 0 NULL NULL NULL int(7) NEVER NULL def information_schema PROCESSLIST TIME_MS 9 0.000 NO decimal NULL NULL 22 3 NULL NULL NULL decimal(22,3) NEVER NULL def information_schema PROCESSLIST USER 2 '' NO varchar 128 384 NULL NULL NULL utf8 utf8_general_ci varchar(128) NEVER NULL @@ -797,6 +798,7 @@ NULL information_schema PROCESSLIST STAGE tinyint NULL NULL NULL NULL tinyint(2) NULL information_schema PROCESSLIST MAX_STAGE tinyint NULL NULL NULL NULL tinyint(2) NULL information_schema PROCESSLIST PROGRESS decimal NULL NULL NULL NULL decimal(7,3) NULL information_schema PROCESSLIST MEMORY_USED bigint NULL NULL NULL NULL bigint(7) +NULL information_schema PROCESSLIST MAX_MEMORY_USED bigint NULL NULL NULL NULL bigint(7) NULL information_schema PROCESSLIST EXAMINED_ROWS int NULL NULL NULL NULL int(7) NULL information_schema PROCESSLIST QUERY_ID bigint NULL NULL NULL NULL bigint(4) 1.0000 information_schema PROCESSLIST INFO_BINARY blob 65535 65535 NULL NULL blob diff --git a/mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result b/mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result index 6680e045558..5dd432714ab 100644 --- a/mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result +++ b/mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result @@ -37,6 +37,7 @@ PROCESSLIST CREATE TEMPORARY TABLE `PROCESSLIST` ( `MAX_STAGE` tinyint(2) NOT NULL DEFAULT 0, `PROGRESS` decimal(7,3) NOT NULL DEFAULT 0.000, `MEMORY_USED` bigint(7) NOT NULL DEFAULT 0, + `MAX_MEMORY_USED` bigint(7) NOT NULL DEFAULT 0, `EXAMINED_ROWS` int(7) NOT NULL DEFAULT 0, `QUERY_ID` bigint(4) NOT NULL DEFAULT 0, `INFO_BINARY` blob DEFAULT NULL, @@ -44,12 +45,12 @@ PROCESSLIST CREATE TEMPORARY TABLE `PROCESSLIST` ( ) DEFAULT CHARSET=utf8 SHOW processlist; Id User Host db Command Time State Info Progress -ID root HOST_NAME information_schema Query TIME init SHOW processlist TIME_MS +ID root HOST_NAME information_schema Query TIME Init SHOW processlist TIME_MS ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS SELECT * FROM processlist ORDER BY id; -ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS MEMORY_USED EXAMINED_ROWS QUERY_ID INFO_BINARY TID -ID root HOST_NAME information_schema Query TIME Filling schema table SELECT * FROM processlist ORDER BY id TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID SELECT * FROM processlist ORDER BY id TID -ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID NULL TID +ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS MEMORY_USED MAX_MEMORY_USED EXAMINED_ROWS QUERY_ID INFO_BINARY TID +ID root HOST_NAME information_schema Query TIME Filling schema table SELECT * FROM processlist ORDER BY id TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID SELECT * FROM processlist ORDER BY id TID +ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID NULL TID SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO, TIME_MS, STAGE, MAX_STAGE, PROGRESS, MEMORY_USED, EXAMINED_ROWS, QUERY_ID, INFO_BINARY FROM processlist ORDER BY id; ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS MEMORY_USED EXAMINED_ROWS QUERY_ID INFO_BINARY ID root HOST_NAME information_schema Query TIME Filling schema table SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO, TIME_MS, STAGE, MAX_STAGE, PROGRESS, MEMORY_USED, EXAMINED_ROWS, QUERY_ID, INFO_BINARY FROM processlist ORDER BY id TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO, TIME_MS, STAGE, MAX_STAGE, PROGRESS, MEMORY_USED, EXAMINED_ROWS, QUERY_ID, INFO_BINARY FROM processlist ORDER BY id @@ -116,6 +117,7 @@ PROCESSLIST CREATE TEMPORARY TABLE `PROCESSLIST` ( `MAX_STAGE` tinyint(2) NOT NULL DEFAULT 0, `PROGRESS` decimal(7,3) NOT NULL DEFAULT 0.000, `MEMORY_USED` bigint(7) NOT NULL DEFAULT 0, + `MAX_MEMORY_USED` bigint(7) NOT NULL DEFAULT 0, `EXAMINED_ROWS` int(7) NOT NULL DEFAULT 0, `QUERY_ID` bigint(4) NOT NULL DEFAULT 0, `INFO_BINARY` blob DEFAULT NULL, @@ -123,10 +125,10 @@ PROCESSLIST CREATE TEMPORARY TABLE `PROCESSLIST` ( ) DEFAULT CHARSET=utf8 SHOW processlist; Id User Host db Command Time State Info Progress -ID ddicttestuser1 HOST_NAME information_schema Query TIME init SHOW processlist TIME_MS +ID ddicttestuser1 HOST_NAME information_schema Query TIME Init SHOW processlist TIME_MS SELECT * FROM processlist ORDER BY id; -ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS MEMORY_USED EXAMINED_ROWS QUERY_ID INFO_BINARY TID -ID ddicttestuser1 HOST_NAME information_schema Query TIME Filling schema table SELECT * FROM processlist ORDER BY id TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID SELECT * FROM processlist ORDER BY id TID +ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS MEMORY_USED MAX_MEMORY_USED EXAMINED_ROWS QUERY_ID INFO_BINARY TID +ID ddicttestuser1 HOST_NAME information_schema Query TIME Filling schema table SELECT * FROM processlist ORDER BY id TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID SELECT * FROM processlist ORDER BY id TID SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO, TIME_MS, STAGE, MAX_STAGE, PROGRESS, MEMORY_USED, EXAMINED_ROWS, QUERY_ID, INFO_BINARY FROM processlist ORDER BY id; ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS MEMORY_USED EXAMINED_ROWS QUERY_ID INFO_BINARY ID ddicttestuser1 HOST_NAME information_schema Query TIME Filling schema table SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO, TIME_MS, STAGE, MAX_STAGE, PROGRESS, MEMORY_USED, EXAMINED_ROWS, QUERY_ID, INFO_BINARY FROM processlist ORDER BY id TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO, TIME_MS, STAGE, MAX_STAGE, PROGRESS, MEMORY_USED, EXAMINED_ROWS, QUERY_ID, INFO_BINARY FROM processlist ORDER BY id @@ -188,10 +190,10 @@ Grants for ddicttestuser1@localhost GRANT PROCESS ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1' SHOW processlist; Id User Host db Command Time State Info Progress -ID ddicttestuser1 HOST_NAME information_schema Query TIME init SHOW processlist TIME_MS +ID ddicttestuser1 HOST_NAME information_schema Query TIME Init SHOW processlist TIME_MS SELECT * FROM information_schema.processlist; -ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS MEMORY_USED EXAMINED_ROWS QUERY_ID INFO_BINARY TID -ID ddicttestuser1 HOST_NAME information_schema Query TIME Filling schema table SELECT * FROM information_schema.processlist TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID SELECT * FROM information_schema.processlist TID +ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS MEMORY_USED MAX_MEMORY_USED EXAMINED_ROWS QUERY_ID INFO_BINARY TID +ID ddicttestuser1 HOST_NAME information_schema Query TIME Filling schema table SELECT * FROM information_schema.processlist TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID SELECT * FROM information_schema.processlist TID #################################################################################### 4.2 New connection con101 (ddicttestuser1 with PROCESS privilege) SHOW/SELECT shows all processes/threads. @@ -204,12 +206,12 @@ SHOW processlist; Id User Host db Command Time State Info Progress ID root HOST_NAME information_schema Sleep TIME NULL TIME_MS ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS -ID ddicttestuser1 HOST_NAME information_schema Query TIME init SHOW processlist TIME_MS +ID ddicttestuser1 HOST_NAME information_schema Query TIME Init SHOW processlist TIME_MS SELECT * FROM information_schema.processlist; -ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS MEMORY_USED EXAMINED_ROWS QUERY_ID INFO_BINARY TID -ID ddicttestuser1 HOST_NAME information_schema Query TIME Filling schema table SELECT * FROM information_schema.processlist TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID SELECT * FROM information_schema.processlist TID -ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID NULL TID -ID root HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID NULL TID +ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS MEMORY_USED MAX_MEMORY_USED EXAMINED_ROWS QUERY_ID INFO_BINARY TID +ID ddicttestuser1 HOST_NAME information_schema Query TIME Filling schema table SELECT * FROM information_schema.processlist TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID SELECT * FROM information_schema.processlist TID +ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID NULL TID +ID root HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID NULL TID #################################################################################### 5 Grant PROCESS privilege to anonymous user. connection default (user=root) @@ -231,13 +233,13 @@ Id User Host db Command Time State Info Progress ID root HOST_NAME information_schema Sleep TIME NULL TIME_MS ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS -ID HOST_NAME information_schema Query TIME init SHOW processlist TIME_MS +ID HOST_NAME information_schema Query TIME Init SHOW processlist TIME_MS SELECT * FROM information_schema.processlist; -ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS MEMORY_USED EXAMINED_ROWS QUERY_ID INFO_BINARY TID -ID HOST_NAME information_schema Query TIME Filling schema table SELECT * FROM information_schema.processlist TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID SELECT * FROM information_schema.processlist TID -ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID NULL TID -ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID NULL TID -ID root HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID NULL TID +ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS MEMORY_USED MAX_MEMORY_USED EXAMINED_ROWS QUERY_ID INFO_BINARY TID +ID HOST_NAME information_schema Query TIME Filling schema table SELECT * FROM information_schema.processlist TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID SELECT * FROM information_schema.processlist TID +ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID NULL TID +ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID NULL TID +ID root HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID NULL TID #################################################################################### 6 Revoke PROCESS privilege from ddicttestuser1 connection default (user=root) @@ -257,12 +259,12 @@ SHOW processlist; Id User Host db Command Time State Info Progress ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS -ID ddicttestuser1 HOST_NAME information_schema Query TIME init SHOW processlist TIME_MS +ID ddicttestuser1 HOST_NAME information_schema Query TIME Init SHOW processlist TIME_MS SELECT * FROM information_schema.processlist; -ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS MEMORY_USED EXAMINED_ROWS QUERY_ID INFO_BINARY TID -ID ddicttestuser1 HOST_NAME information_schema Query TIME Filling schema table SELECT * FROM information_schema.processlist TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID SELECT * FROM information_schema.processlist TID -ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID NULL TID -ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID NULL TID +ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS MEMORY_USED MAX_MEMORY_USED EXAMINED_ROWS QUERY_ID INFO_BINARY TID +ID ddicttestuser1 HOST_NAME information_schema Query TIME Filling schema table SELECT * FROM information_schema.processlist TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID SELECT * FROM information_schema.processlist TID +ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID NULL TID +ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID NULL TID #################################################################################### 7 Revoke PROCESS privilege from anonymous user connection default (user=root) @@ -279,9 +281,9 @@ SHOW GRANTS FOR ''@'localhost'; Grants for @localhost GRANT USAGE ON *.* TO ''@'localhost' SELECT * FROM information_schema.processlist; -ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS MEMORY_USED EXAMINED_ROWS QUERY_ID INFO_BINARY TID -ID HOST_NAME information_schema Query TIME Filling schema table SELECT * FROM information_schema.processlist TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID SELECT * FROM information_schema.processlist TID -ID HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID NULL TID +ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS MEMORY_USED MAX_MEMORY_USED EXAMINED_ROWS QUERY_ID INFO_BINARY TID +ID HOST_NAME information_schema Query TIME Filling schema table SELECT * FROM information_schema.processlist TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID SELECT * FROM information_schema.processlist TID +ID HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID NULL TID #################################################################################### 8 Grant SUPER (does not imply PROCESS) privilege to ddicttestuser1 connection default (user=root) @@ -301,13 +303,13 @@ Id User Host db Command Time State Info Progress ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS -ID ddicttestuser1 HOST_NAME information_schema Query TIME init SHOW processlist TIME_MS +ID ddicttestuser1 HOST_NAME information_schema Query TIME Init SHOW processlist TIME_MS SELECT * FROM information_schema.processlist; -ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS MEMORY_USED EXAMINED_ROWS QUERY_ID INFO_BINARY TID -ID ddicttestuser1 HOST_NAME information_schema Query TIME Filling schema table SELECT * FROM information_schema.processlist TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID SELECT * FROM information_schema.processlist TID -ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID NULL TID -ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID NULL TID -ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID NULL TID +ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS MEMORY_USED MAX_MEMORY_USED EXAMINED_ROWS QUERY_ID INFO_BINARY TID +ID ddicttestuser1 HOST_NAME information_schema Query TIME Filling schema table SELECT * FROM information_schema.processlist TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID SELECT * FROM information_schema.processlist TID +ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID NULL TID +ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID NULL TID +ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID NULL TID #################################################################################### 9 Revoke SUPER privilege from user ddicttestuser1 connection default (user=root) @@ -329,14 +331,14 @@ ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS -ID ddicttestuser1 HOST_NAME information_schema Query TIME init SHOW processlist TIME_MS +ID ddicttestuser1 HOST_NAME information_schema Query TIME Init SHOW processlist TIME_MS SELECT * FROM information_schema.processlist; -ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS MEMORY_USED EXAMINED_ROWS QUERY_ID INFO_BINARY TID -ID ddicttestuser1 HOST_NAME information_schema Query TIME Filling schema table SELECT * FROM information_schema.processlist TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID SELECT * FROM information_schema.processlist TID -ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID NULL TID -ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID NULL TID -ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID NULL TID -ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID NULL TID +ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS MEMORY_USED MAX_MEMORY_USED EXAMINED_ROWS QUERY_ID INFO_BINARY TID +ID ddicttestuser1 HOST_NAME information_schema Query TIME Filling schema table SELECT * FROM information_schema.processlist TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID SELECT * FROM information_schema.processlist TID +ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID NULL TID +ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID NULL TID +ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID NULL TID +ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID NULL TID #################################################################################### 10 Grant SUPER privilege with grant option to user ddicttestuser1. connection default (user=root) @@ -388,20 +390,20 @@ ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS -ID ddicttestuser2 HOST_NAME information_schema Query TIME init SHOW processlist TIME_MS +ID ddicttestuser2 HOST_NAME information_schema Query TIME Init SHOW processlist TIME_MS SELECT * FROM information_schema.processlist; -ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS MEMORY_USED EXAMINED_ROWS QUERY_ID INFO_BINARY TID -ID ddicttestuser2 HOST_NAME information_schema Query TIME Filling schema table SELECT * FROM information_schema.processlist TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID SELECT * FROM information_schema.processlist TID -ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID NULL TID -ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID NULL TID -ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID NULL TID -ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID NULL TID -ID HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID NULL TID -ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID NULL TID -ID HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID NULL TID -ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID NULL TID -ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID NULL TID -ID root HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID NULL TID +ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS MEMORY_USED MAX_MEMORY_USED EXAMINED_ROWS QUERY_ID INFO_BINARY TID +ID ddicttestuser2 HOST_NAME information_schema Query TIME Filling schema table SELECT * FROM information_schema.processlist TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID SELECT * FROM information_schema.processlist TID +ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID NULL TID +ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID NULL TID +ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID NULL TID +ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID NULL TID +ID HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID NULL TID +ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID NULL TID +ID HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID NULL TID +ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID NULL TID +ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID NULL TID +ID root HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID NULL TID #################################################################################### 11 User ddicttestuser1 revokes PROCESS privilege from user ddicttestuser2 connection ddicttestuser1; @@ -419,11 +421,11 @@ GRANT USAGE ON *.* TO 'ddicttestuser2'@'localhost' IDENTIFIED BY PASSWORD '*22DA SHOW processlist; Id User Host db Command Time State Info Progress ID ddicttestuser2 HOST_NAME information_schema Sleep TIME NULL TIME_MS -ID ddicttestuser2 HOST_NAME information_schema Query TIME init SHOW processlist TIME_MS +ID ddicttestuser2 HOST_NAME information_schema Query TIME Init SHOW processlist TIME_MS SELECT * FROM information_schema.processlist; -ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS MEMORY_USED EXAMINED_ROWS QUERY_ID INFO_BINARY TID -ID ddicttestuser2 HOST_NAME information_schema Query TIME Filling schema table SELECT * FROM information_schema.processlist TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID SELECT * FROM information_schema.processlist TID -ID ddicttestuser2 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID NULL TID +ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS MEMORY_USED MAX_MEMORY_USED EXAMINED_ROWS QUERY_ID INFO_BINARY TID +ID ddicttestuser2 HOST_NAME information_schema Query TIME Filling schema table SELECT * FROM information_schema.processlist TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID SELECT * FROM information_schema.processlist TID +ID ddicttestuser2 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID NULL TID #################################################################################### 11.2 Revoke SUPER,PROCESS,GRANT OPTION privilege from user ddicttestuser1 connection default (user=root) @@ -450,17 +452,17 @@ ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS -ID ddicttestuser1 HOST_NAME information_schema Query TIME init SHOW processlist TIME_MS +ID ddicttestuser1 HOST_NAME information_schema Query TIME Init SHOW processlist TIME_MS SELECT * FROM information_schema.processlist; -ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS MEMORY_USED EXAMINED_ROWS QUERY_ID INFO_BINARY TID -ID ddicttestuser1 HOST_NAME information_schema Query TIME Filling schema table SELECT * FROM information_schema.processlist TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID SELECT * FROM information_schema.processlist TID -ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID NULL TID -ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID NULL TID -ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID NULL TID -ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID NULL TID -ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID NULL TID -ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID NULL TID -ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID NULL TID +ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS MEMORY_USED MAX_MEMORY_USED EXAMINED_ROWS QUERY_ID INFO_BINARY TID +ID ddicttestuser1 HOST_NAME information_schema Query TIME Filling schema table SELECT * FROM information_schema.processlist TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID SELECT * FROM information_schema.processlist TID +ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID NULL TID +ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID NULL TID +ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID NULL TID +ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID NULL TID +ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID NULL TID +ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID NULL TID +ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID NULL TID #################################################################################### 12 Revoke the SELECT privilege from user ddicttestuser1 connection default (user=root) @@ -488,18 +490,18 @@ ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS -ID ddicttestuser1 HOST_NAME information_schema Query TIME init SHOW processlist TIME_MS +ID ddicttestuser1 HOST_NAME information_schema Query TIME Init SHOW processlist TIME_MS SELECT * FROM information_schema.processlist; -ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS MEMORY_USED EXAMINED_ROWS QUERY_ID INFO_BINARY TID -ID ddicttestuser1 HOST_NAME information_schema Query TIME Filling schema table SELECT * FROM information_schema.processlist TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID SELECT * FROM information_schema.processlist TID -ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID NULL TID -ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID NULL TID -ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID NULL TID -ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID NULL TID -ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID NULL TID -ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID NULL TID -ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID NULL TID -ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID NULL TID +ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS MEMORY_USED MAX_MEMORY_USED EXAMINED_ROWS QUERY_ID INFO_BINARY TID +ID ddicttestuser1 HOST_NAME information_schema Query TIME Filling schema table SELECT * FROM information_schema.processlist TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID SELECT * FROM information_schema.processlist TID +ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID NULL TID +ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID NULL TID +ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID NULL TID +ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID NULL TID +ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID NULL TID +ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID NULL TID +ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID NULL TID +ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID NULL TID #################################################################################### 12.2 Revoke only the SELECT privilege on the information_schema from ddicttestuser1. connection default (user=root) diff --git a/mysql-test/suite/funcs_1/r/processlist_priv_ps.result b/mysql-test/suite/funcs_1/r/processlist_priv_ps.result index 09f9d231144..6ade94dbe58 100644 --- a/mysql-test/suite/funcs_1/r/processlist_priv_ps.result +++ b/mysql-test/suite/funcs_1/r/processlist_priv_ps.result @@ -37,6 +37,7 @@ PROCESSLIST CREATE TEMPORARY TABLE `PROCESSLIST` ( `MAX_STAGE` tinyint(2) NOT NULL DEFAULT 0, `PROGRESS` decimal(7,3) NOT NULL DEFAULT 0.000, `MEMORY_USED` bigint(7) NOT NULL DEFAULT 0, + `MAX_MEMORY_USED` bigint(7) NOT NULL DEFAULT 0, `EXAMINED_ROWS` int(7) NOT NULL DEFAULT 0, `QUERY_ID` bigint(4) NOT NULL DEFAULT 0, `INFO_BINARY` blob DEFAULT NULL, @@ -44,12 +45,12 @@ PROCESSLIST CREATE TEMPORARY TABLE `PROCESSLIST` ( ) DEFAULT CHARSET=utf8 SHOW processlist; Id User Host db Command Time State Info Progress -ID root HOST_NAME information_schema Query TIME init SHOW processlist TIME_MS +ID root HOST_NAME information_schema Query TIME Init SHOW processlist TIME_MS ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS SELECT * FROM processlist ORDER BY id; -ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS MEMORY_USED EXAMINED_ROWS QUERY_ID INFO_BINARY TID -ID root HOST_NAME information_schema Execute TIME Filling schema table SELECT * FROM processlist ORDER BY id TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID SELECT * FROM processlist ORDER BY id TID -ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID NULL TID +ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS MEMORY_USED MAX_MEMORY_USED EXAMINED_ROWS QUERY_ID INFO_BINARY TID +ID root HOST_NAME information_schema Execute TIME Filling schema table SELECT * FROM processlist ORDER BY id TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID SELECT * FROM processlist ORDER BY id TID +ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID NULL TID SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO, TIME_MS, STAGE, MAX_STAGE, PROGRESS, MEMORY_USED, EXAMINED_ROWS, QUERY_ID, INFO_BINARY FROM processlist ORDER BY id; ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS MEMORY_USED EXAMINED_ROWS QUERY_ID INFO_BINARY ID root HOST_NAME information_schema Execute TIME Filling schema table SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO, TIME_MS, STAGE, MAX_STAGE, PROGRESS, MEMORY_USED, EXAMINED_ROWS, QUERY_ID, INFO_BINARY FROM processlist ORDER BY id TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO, TIME_MS, STAGE, MAX_STAGE, PROGRESS, MEMORY_USED, EXAMINED_ROWS, QUERY_ID, INFO_BINARY FROM processlist ORDER BY id @@ -116,6 +117,7 @@ PROCESSLIST CREATE TEMPORARY TABLE `PROCESSLIST` ( `MAX_STAGE` tinyint(2) NOT NULL DEFAULT 0, `PROGRESS` decimal(7,3) NOT NULL DEFAULT 0.000, `MEMORY_USED` bigint(7) NOT NULL DEFAULT 0, + `MAX_MEMORY_USED` bigint(7) NOT NULL DEFAULT 0, `EXAMINED_ROWS` int(7) NOT NULL DEFAULT 0, `QUERY_ID` bigint(4) NOT NULL DEFAULT 0, `INFO_BINARY` blob DEFAULT NULL, @@ -123,10 +125,10 @@ PROCESSLIST CREATE TEMPORARY TABLE `PROCESSLIST` ( ) DEFAULT CHARSET=utf8 SHOW processlist; Id User Host db Command Time State Info Progress -ID ddicttestuser1 HOST_NAME information_schema Query TIME init SHOW processlist TIME_MS +ID ddicttestuser1 HOST_NAME information_schema Query TIME Init SHOW processlist TIME_MS SELECT * FROM processlist ORDER BY id; -ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS MEMORY_USED EXAMINED_ROWS QUERY_ID INFO_BINARY TID -ID ddicttestuser1 HOST_NAME information_schema Execute TIME Filling schema table SELECT * FROM processlist ORDER BY id TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID SELECT * FROM processlist ORDER BY id TID +ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS MEMORY_USED MAX_MEMORY_USED EXAMINED_ROWS QUERY_ID INFO_BINARY TID +ID ddicttestuser1 HOST_NAME information_schema Execute TIME Filling schema table SELECT * FROM processlist ORDER BY id TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID SELECT * FROM processlist ORDER BY id TID SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO, TIME_MS, STAGE, MAX_STAGE, PROGRESS, MEMORY_USED, EXAMINED_ROWS, QUERY_ID, INFO_BINARY FROM processlist ORDER BY id; ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS MEMORY_USED EXAMINED_ROWS QUERY_ID INFO_BINARY ID ddicttestuser1 HOST_NAME information_schema Execute TIME Filling schema table SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO, TIME_MS, STAGE, MAX_STAGE, PROGRESS, MEMORY_USED, EXAMINED_ROWS, QUERY_ID, INFO_BINARY FROM processlist ORDER BY id TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO, TIME_MS, STAGE, MAX_STAGE, PROGRESS, MEMORY_USED, EXAMINED_ROWS, QUERY_ID, INFO_BINARY FROM processlist ORDER BY id @@ -188,10 +190,10 @@ Grants for ddicttestuser1@localhost GRANT PROCESS ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1' SHOW processlist; Id User Host db Command Time State Info Progress -ID ddicttestuser1 HOST_NAME information_schema Query TIME init SHOW processlist TIME_MS +ID ddicttestuser1 HOST_NAME information_schema Query TIME Init SHOW processlist TIME_MS SELECT * FROM information_schema.processlist; -ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS MEMORY_USED EXAMINED_ROWS QUERY_ID INFO_BINARY TID -ID ddicttestuser1 HOST_NAME information_schema Execute TIME Filling schema table SELECT * FROM information_schema.processlist TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID SELECT * FROM information_schema.processlist TID +ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS MEMORY_USED MAX_MEMORY_USED EXAMINED_ROWS QUERY_ID INFO_BINARY TID +ID ddicttestuser1 HOST_NAME information_schema Execute TIME Filling schema table SELECT * FROM information_schema.processlist TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID SELECT * FROM information_schema.processlist TID #################################################################################### 4.2 New connection con101 (ddicttestuser1 with PROCESS privilege) SHOW/SELECT shows all processes/threads. @@ -204,12 +206,12 @@ SHOW processlist; Id User Host db Command Time State Info Progress ID root HOST_NAME information_schema Sleep TIME NULL TIME_MS ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS -ID ddicttestuser1 HOST_NAME information_schema Query TIME init SHOW processlist TIME_MS +ID ddicttestuser1 HOST_NAME information_schema Query TIME Init SHOW processlist TIME_MS SELECT * FROM information_schema.processlist; -ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS MEMORY_USED EXAMINED_ROWS QUERY_ID INFO_BINARY TID -ID ddicttestuser1 HOST_NAME information_schema Execute TIME Filling schema table SELECT * FROM information_schema.processlist TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID SELECT * FROM information_schema.processlist TID -ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID NULL TID -ID root HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID NULL TID +ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS MEMORY_USED MAX_MEMORY_USED EXAMINED_ROWS QUERY_ID INFO_BINARY TID +ID ddicttestuser1 HOST_NAME information_schema Execute TIME Filling schema table SELECT * FROM information_schema.processlist TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID SELECT * FROM information_schema.processlist TID +ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID NULL TID +ID root HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID NULL TID #################################################################################### 5 Grant PROCESS privilege to anonymous user. connection default (user=root) @@ -231,13 +233,13 @@ Id User Host db Command Time State Info Progress ID root HOST_NAME information_schema Sleep TIME NULL TIME_MS ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS -ID HOST_NAME information_schema Query TIME init SHOW processlist TIME_MS +ID HOST_NAME information_schema Query TIME Init SHOW processlist TIME_MS SELECT * FROM information_schema.processlist; -ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS MEMORY_USED EXAMINED_ROWS QUERY_ID INFO_BINARY TID -ID HOST_NAME information_schema Execute TIME Filling schema table SELECT * FROM information_schema.processlist TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID SELECT * FROM information_schema.processlist TID -ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID NULL TID -ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID NULL TID -ID root HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID NULL TID +ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS MEMORY_USED MAX_MEMORY_USED EXAMINED_ROWS QUERY_ID INFO_BINARY TID +ID HOST_NAME information_schema Execute TIME Filling schema table SELECT * FROM information_schema.processlist TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID SELECT * FROM information_schema.processlist TID +ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID NULL TID +ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID NULL TID +ID root HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID NULL TID #################################################################################### 6 Revoke PROCESS privilege from ddicttestuser1 connection default (user=root) @@ -257,12 +259,12 @@ SHOW processlist; Id User Host db Command Time State Info Progress ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS -ID ddicttestuser1 HOST_NAME information_schema Query TIME init SHOW processlist TIME_MS +ID ddicttestuser1 HOST_NAME information_schema Query TIME Init SHOW processlist TIME_MS SELECT * FROM information_schema.processlist; -ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS MEMORY_USED EXAMINED_ROWS QUERY_ID INFO_BINARY TID -ID ddicttestuser1 HOST_NAME information_schema Execute TIME Filling schema table SELECT * FROM information_schema.processlist TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID SELECT * FROM information_schema.processlist TID -ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID NULL TID -ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID NULL TID +ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS MEMORY_USED MAX_MEMORY_USED EXAMINED_ROWS QUERY_ID INFO_BINARY TID +ID ddicttestuser1 HOST_NAME information_schema Execute TIME Filling schema table SELECT * FROM information_schema.processlist TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID SELECT * FROM information_schema.processlist TID +ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID NULL TID +ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID NULL TID #################################################################################### 7 Revoke PROCESS privilege from anonymous user connection default (user=root) @@ -279,9 +281,9 @@ SHOW GRANTS FOR ''@'localhost'; Grants for @localhost GRANT USAGE ON *.* TO ''@'localhost' SELECT * FROM information_schema.processlist; -ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS MEMORY_USED EXAMINED_ROWS QUERY_ID INFO_BINARY TID -ID HOST_NAME information_schema Execute TIME Filling schema table SELECT * FROM information_schema.processlist TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID SELECT * FROM information_schema.processlist TID -ID HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID NULL TID +ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS MEMORY_USED MAX_MEMORY_USED EXAMINED_ROWS QUERY_ID INFO_BINARY TID +ID HOST_NAME information_schema Execute TIME Filling schema table SELECT * FROM information_schema.processlist TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID SELECT * FROM information_schema.processlist TID +ID HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID NULL TID #################################################################################### 8 Grant SUPER (does not imply PROCESS) privilege to ddicttestuser1 connection default (user=root) @@ -301,13 +303,13 @@ Id User Host db Command Time State Info Progress ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS -ID ddicttestuser1 HOST_NAME information_schema Query TIME init SHOW processlist TIME_MS +ID ddicttestuser1 HOST_NAME information_schema Query TIME Init SHOW processlist TIME_MS SELECT * FROM information_schema.processlist; -ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS MEMORY_USED EXAMINED_ROWS QUERY_ID INFO_BINARY TID -ID ddicttestuser1 HOST_NAME information_schema Execute TIME Filling schema table SELECT * FROM information_schema.processlist TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID SELECT * FROM information_schema.processlist TID -ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID NULL TID -ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID NULL TID -ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID NULL TID +ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS MEMORY_USED MAX_MEMORY_USED EXAMINED_ROWS QUERY_ID INFO_BINARY TID +ID ddicttestuser1 HOST_NAME information_schema Execute TIME Filling schema table SELECT * FROM information_schema.processlist TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID SELECT * FROM information_schema.processlist TID +ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID NULL TID +ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID NULL TID +ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID NULL TID #################################################################################### 9 Revoke SUPER privilege from user ddicttestuser1 connection default (user=root) @@ -329,14 +331,14 @@ ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS -ID ddicttestuser1 HOST_NAME information_schema Query TIME init SHOW processlist TIME_MS +ID ddicttestuser1 HOST_NAME information_schema Query TIME Init SHOW processlist TIME_MS SELECT * FROM information_schema.processlist; -ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS MEMORY_USED EXAMINED_ROWS QUERY_ID INFO_BINARY TID -ID ddicttestuser1 HOST_NAME information_schema Execute TIME Filling schema table SELECT * FROM information_schema.processlist TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID SELECT * FROM information_schema.processlist TID -ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID NULL TID -ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID NULL TID -ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID NULL TID -ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID NULL TID +ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS MEMORY_USED MAX_MEMORY_USED EXAMINED_ROWS QUERY_ID INFO_BINARY TID +ID ddicttestuser1 HOST_NAME information_schema Execute TIME Filling schema table SELECT * FROM information_schema.processlist TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID SELECT * FROM information_schema.processlist TID +ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID NULL TID +ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID NULL TID +ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID NULL TID +ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID NULL TID #################################################################################### 10 Grant SUPER privilege with grant option to user ddicttestuser1. connection default (user=root) @@ -388,20 +390,20 @@ ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS -ID ddicttestuser2 HOST_NAME information_schema Query TIME init SHOW processlist TIME_MS +ID ddicttestuser2 HOST_NAME information_schema Query TIME Init SHOW processlist TIME_MS SELECT * FROM information_schema.processlist; -ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS MEMORY_USED EXAMINED_ROWS QUERY_ID INFO_BINARY TID -ID ddicttestuser2 HOST_NAME information_schema Execute TIME Filling schema table SELECT * FROM information_schema.processlist TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID SELECT * FROM information_schema.processlist TID -ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID NULL TID -ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID NULL TID -ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID NULL TID -ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID NULL TID -ID HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID NULL TID -ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID NULL TID -ID HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID NULL TID -ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID NULL TID -ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID NULL TID -ID root HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID NULL TID +ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS MEMORY_USED MAX_MEMORY_USED EXAMINED_ROWS QUERY_ID INFO_BINARY TID +ID ddicttestuser2 HOST_NAME information_schema Execute TIME Filling schema table SELECT * FROM information_schema.processlist TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID SELECT * FROM information_schema.processlist TID +ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID NULL TID +ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID NULL TID +ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID NULL TID +ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID NULL TID +ID HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID NULL TID +ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID NULL TID +ID HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID NULL TID +ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID NULL TID +ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID NULL TID +ID root HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID NULL TID #################################################################################### 11 User ddicttestuser1 revokes PROCESS privilege from user ddicttestuser2 connection ddicttestuser1; @@ -419,11 +421,11 @@ GRANT USAGE ON *.* TO 'ddicttestuser2'@'localhost' IDENTIFIED BY PASSWORD '*22DA SHOW processlist; Id User Host db Command Time State Info Progress ID ddicttestuser2 HOST_NAME information_schema Sleep TIME NULL TIME_MS -ID ddicttestuser2 HOST_NAME information_schema Query TIME init SHOW processlist TIME_MS +ID ddicttestuser2 HOST_NAME information_schema Query TIME Init SHOW processlist TIME_MS SELECT * FROM information_schema.processlist; -ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS MEMORY_USED EXAMINED_ROWS QUERY_ID INFO_BINARY TID -ID ddicttestuser2 HOST_NAME information_schema Execute TIME Filling schema table SELECT * FROM information_schema.processlist TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID SELECT * FROM information_schema.processlist TID -ID ddicttestuser2 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID NULL TID +ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS MEMORY_USED MAX_MEMORY_USED EXAMINED_ROWS QUERY_ID INFO_BINARY TID +ID ddicttestuser2 HOST_NAME information_schema Execute TIME Filling schema table SELECT * FROM information_schema.processlist TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID SELECT * FROM information_schema.processlist TID +ID ddicttestuser2 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID NULL TID #################################################################################### 11.2 Revoke SUPER,PROCESS,GRANT OPTION privilege from user ddicttestuser1 connection default (user=root) @@ -450,17 +452,17 @@ ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS -ID ddicttestuser1 HOST_NAME information_schema Query TIME init SHOW processlist TIME_MS +ID ddicttestuser1 HOST_NAME information_schema Query TIME Init SHOW processlist TIME_MS SELECT * FROM information_schema.processlist; -ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS MEMORY_USED EXAMINED_ROWS QUERY_ID INFO_BINARY TID -ID ddicttestuser1 HOST_NAME information_schema Execute TIME Filling schema table SELECT * FROM information_schema.processlist TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID SELECT * FROM information_schema.processlist TID -ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID NULL TID -ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID NULL TID -ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID NULL TID -ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID NULL TID -ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID NULL TID -ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID NULL TID -ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID NULL TID +ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS MEMORY_USED MAX_MEMORY_USED EXAMINED_ROWS QUERY_ID INFO_BINARY TID +ID ddicttestuser1 HOST_NAME information_schema Execute TIME Filling schema table SELECT * FROM information_schema.processlist TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID SELECT * FROM information_schema.processlist TID +ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID NULL TID +ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID NULL TID +ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID NULL TID +ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID NULL TID +ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID NULL TID +ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID NULL TID +ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID NULL TID #################################################################################### 12 Revoke the SELECT privilege from user ddicttestuser1 connection default (user=root) @@ -488,18 +490,18 @@ ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS -ID ddicttestuser1 HOST_NAME information_schema Query TIME init SHOW processlist TIME_MS +ID ddicttestuser1 HOST_NAME information_schema Query TIME Init SHOW processlist TIME_MS SELECT * FROM information_schema.processlist; -ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS MEMORY_USED EXAMINED_ROWS QUERY_ID INFO_BINARY TID -ID ddicttestuser1 HOST_NAME information_schema Execute TIME Filling schema table SELECT * FROM information_schema.processlist TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID SELECT * FROM information_schema.processlist TID -ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID NULL TID -ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID NULL TID -ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID NULL TID -ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID NULL TID -ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID NULL TID -ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID NULL TID -ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID NULL TID -ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY ROWS QUERY_ID NULL TID +ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS MEMORY_USED MAX_MEMORY_USED EXAMINED_ROWS QUERY_ID INFO_BINARY TID +ID ddicttestuser1 HOST_NAME information_schema Execute TIME Filling schema table SELECT * FROM information_schema.processlist TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID SELECT * FROM information_schema.processlist TID +ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID NULL TID +ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID NULL TID +ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID NULL TID +ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID NULL TID +ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID NULL TID +ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID NULL TID +ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID NULL TID +ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS 0 0 0.000 MEMORY MAX_MEMORY ROWS QUERY_ID NULL TID #################################################################################### 12.2 Revoke only the SELECT privilege on the information_schema from ddicttestuser1. connection default (user=root) diff --git a/mysql-test/suite/funcs_1/r/processlist_val_no_prot.result b/mysql-test/suite/funcs_1/r/processlist_val_no_prot.result index f935f7770b8..ad109501f98 100644 --- a/mysql-test/suite/funcs_1/r/processlist_val_no_prot.result +++ b/mysql-test/suite/funcs_1/r/processlist_val_no_prot.result @@ -25,6 +25,7 @@ PROCESSLIST CREATE TEMPORARY TABLE `PROCESSLIST` ( `MAX_STAGE` tinyint(2) NOT NULL DEFAULT 0, `PROGRESS` decimal(7,3) NOT NULL DEFAULT 0.000, `MEMORY_USED` bigint(7) NOT NULL DEFAULT 0, + `MAX_MEMORY_USED` bigint(7) NOT NULL DEFAULT 0, `EXAMINED_ROWS` int(7) NOT NULL DEFAULT 0, `QUERY_ID` bigint(4) NOT NULL DEFAULT 0, `INFO_BINARY` blob DEFAULT NULL, @@ -34,11 +35,11 @@ PROCESSLIST CREATE TEMPORARY TABLE `PROCESSLIST` ( #-------------------------------------------------------------------------- SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST; -ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS MEMORY_USED EXAMINED_ROWS QUERY_ID INFO_BINARY TID -<ID> root <HOST_NAME> test Query <TIME> Filling schema table SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST <TIME_MS> 0 0 0.000 <MEMORY> <ROWS> <QUERY_ID> SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST <TID> +ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS MEMORY_USED MAX_MEMORY_USED EXAMINED_ROWS QUERY_ID INFO_BINARY TID +<ID> root <HOST_NAME> test Query <TIME> Filling schema table SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST <TIME_MS> 0 0 0.000 <MEMORY> <MAX_MEMORY> <ROWS> <QUERY_ID> SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST <TID> SHOW FULL PROCESSLIST; Id User Host db Command Time State Info Progress -<ID> root <HOST_NAME> test Query <TIME> init SHOW FULL PROCESSLIST <TIME_MS> +<ID> root <HOST_NAME> test Query <TIME> Init SHOW FULL PROCESSLIST <TIME_MS> SET @default_id = CONNECTION_ID(); SELECT COUNT(*) = 1 AS "Expect exact one connection with this id" FROM INFORMATION_SCHEMA.PROCESSLIST WHERE ID = @default_id; @@ -79,12 +80,12 @@ connection default; # Poll till the connection con1 is in state COMMAND = 'Sleep'. SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST; -ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS MEMORY_USED EXAMINED_ROWS QUERY_ID INFO_BINARY TID -<ID> test_user <HOST_NAME> information_schema Sleep <TIME> <STATE> NULL <TIME_MS> 0 0 0.000 <MEMORY> <ROWS> <QUERY_ID> NULL <TID> -<ID> root <HOST_NAME> information_schema Query <TIME> <STATE> SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST <TIME_MS> 0 0 0.000 <MEMORY> <ROWS> <QUERY_ID> SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST <TID> +ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS MEMORY_USED MAX_MEMORY_USED EXAMINED_ROWS QUERY_ID INFO_BINARY TID +<ID> test_user <HOST_NAME> information_schema Sleep <TIME> <STATE> NULL <TIME_MS> 0 0 0.000 <MEMORY> <MAX_MEMORY> <ROWS> <QUERY_ID> NULL <TID> +<ID> root <HOST_NAME> information_schema Query <TIME> <STATE> SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST <TIME_MS> 0 0 0.000 <MEMORY> <MAX_MEMORY> <ROWS> <QUERY_ID> SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST <TID> SHOW FULL PROCESSLIST; Id User Host db Command Time State Info Progress -<ID> root <HOST_NAME> information_schema Query <TIME> init SHOW FULL PROCESSLIST 0.000 +<ID> root <HOST_NAME> information_schema Query <TIME> Init SHOW FULL PROCESSLIST 0.000 <ID> test_user <HOST_NAME> information_schema Sleep <TIME> NULL 0.000 SELECT ID,TIME INTO @test_user_con1_id,@time FROM INFORMATION_SCHEMA.PROCESSLIST WHERE COMMAND = 'Sleep' AND USER = 'test_user'; @@ -112,11 +113,11 @@ Expect 1 connection con1; SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST; -ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS MEMORY_USED EXAMINED_ROWS QUERY_ID INFO_BINARY TID -<ID> test_user <HOST_NAME> information_schema Query <TIME> Filling schema table SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST <TIME_MS> 0 0 0.000 <MEMORY> <ROWS> <QUERY_ID> SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST <TID> +ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS MEMORY_USED MAX_MEMORY_USED EXAMINED_ROWS QUERY_ID INFO_BINARY TID +<ID> test_user <HOST_NAME> information_schema Query <TIME> Filling schema table SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST <TIME_MS> 0 0 0.000 <MEMORY> <MAX_MEMORY> <ROWS> <QUERY_ID> SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST <TID> SHOW FULL PROCESSLIST; Id User Host db Command Time State Info Progress -<ID> test_user <HOST_NAME> information_schema Query <TIME> init SHOW FULL PROCESSLIST 0.000 +<ID> test_user <HOST_NAME> information_schema Query <TIME> Init SHOW FULL PROCESSLIST 0.000 # Ensure that the user test_user sees all connections with his username. #---------------------------------------------------------------------------- @@ -126,13 +127,13 @@ connection default; connection con2; SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST; -ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS MEMORY_USED EXAMINED_ROWS QUERY_ID INFO_BINARY TID -<ID> test_user <HOST_NAME> information_schema Query <TIME> Filling schema table SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST <TIME_MS> 0 0 0.000 <MEMORY> <ROWS> <QUERY_ID> SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST <TID> -<ID> test_user <HOST_NAME> information_schema Sleep <TIME> NULL <TIME_MS> 0 0 0.000 <MEMORY> <ROWS> <QUERY_ID> NULL <TID> +ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS MEMORY_USED MAX_MEMORY_USED EXAMINED_ROWS QUERY_ID INFO_BINARY TID +<ID> test_user <HOST_NAME> information_schema Query <TIME> Filling schema table SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST <TIME_MS> 0 0 0.000 <MEMORY> <MAX_MEMORY> <ROWS> <QUERY_ID> SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST <TID> +<ID> test_user <HOST_NAME> information_schema Sleep <TIME> NULL <TIME_MS> 0 0 0.000 <MEMORY> <MAX_MEMORY> <ROWS> <QUERY_ID> NULL <TID> SHOW FULL PROCESSLIST; Id User Host db Command Time State Info Progress <ID> test_user <HOST_NAME> information_schema Sleep <TIME> NULL 0.000 -<ID> test_user <HOST_NAME> information_schema Query <TIME> init SHOW FULL PROCESSLIST 0.000 +<ID> test_user <HOST_NAME> information_schema Query <TIME> Init SHOW FULL PROCESSLIST 0.000 connection default; SELECT ID INTO @test_user_con2_id FROM INFORMATION_SCHEMA.PROCESSLIST WHERE ID <> @test_user_con1_id @@ -149,13 +150,13 @@ connection default; # Poll till connection con2 is in state 'User sleep'. SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST; -ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS MEMORY_USED EXAMINED_ROWS QUERY_ID INFO_BINARY TID -<ID> test_user <HOST_NAME> information_schema Query <TIME> User sleep SELECT sleep(10), 17 <TIME_MS> 0 0 0.000 <MEMORY> <ROWS> <QUERY_ID> SELECT sleep(10), 17 <TID> -<ID> test_user <HOST_NAME> information_schema Sleep <TIME> NULL <TIME_MS> 0 0 0.000 <MEMORY> <ROWS> <QUERY_ID> NULL <TID> -<ID> root <HOST_NAME> information_schema Query <TIME> Filling schema table SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST <TIME_MS> 0 0 0.000 <MEMORY> <ROWS> <QUERY_ID> SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST <TID> +ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS MEMORY_USED MAX_MEMORY_USED EXAMINED_ROWS QUERY_ID INFO_BINARY TID +<ID> test_user <HOST_NAME> information_schema Query <TIME> User sleep SELECT sleep(10), 17 <TIME_MS> 0 0 0.000 <MEMORY> <MAX_MEMORY> <ROWS> <QUERY_ID> SELECT sleep(10), 17 <TID> +<ID> test_user <HOST_NAME> information_schema Sleep <TIME> NULL <TIME_MS> 0 0 0.000 <MEMORY> <MAX_MEMORY> <ROWS> <QUERY_ID> NULL <TID> +<ID> root <HOST_NAME> information_schema Query <TIME> Filling schema table SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST <TIME_MS> 0 0 0.000 <MEMORY> <MAX_MEMORY> <ROWS> <QUERY_ID> SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST <TID> SHOW FULL PROCESSLIST; Id User Host db Command Time State Info Progress -<ID> root <HOST_NAME> information_schema Query <TIME> init SHOW FULL PROCESSLIST 0.000 +<ID> root <HOST_NAME> information_schema Query <TIME> Init SHOW FULL PROCESSLIST 0.000 <ID> test_user <HOST_NAME> information_schema Sleep <TIME> NULL 0.000 <ID> test_user <HOST_NAME> information_schema Query <TIME> User sleep SELECT sleep(10), 17 0.000 SELECT STATE, TIME, INFO INTO @state, @time, @info @@ -192,10 +193,10 @@ connection default; # Poll till INFO is no more NULL and State = 'Waiting for table metadata lock'. SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST; -ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS MEMORY_USED EXAMINED_ROWS QUERY_ID INFO_BINARY TID -<ID> test_user <HOST_NAME> information_schema Query <TIME> Waiting for table metadata lock SELECT COUNT(*) FROM test.t1 <TIME_MS> 0 0 0.000 <MEMORY> <ROWS> <QUERY_ID> SELECT COUNT(*) FROM test.t1 <TID> -<ID> test_user <HOST_NAME> information_schema Sleep <TIME> NULL <TIME_MS> 0 0 0.000 <MEMORY> <ROWS> <QUERY_ID> NULL <TID> -<ID> root <HOST_NAME> information_schema Query <TIME> Filling schema table SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST <TIME_MS> 0 0 0.000 <MEMORY> <ROWS> <QUERY_ID> SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST <TID> +ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS MEMORY_USED MAX_MEMORY_USED EXAMINED_ROWS QUERY_ID INFO_BINARY TID +<ID> test_user <HOST_NAME> information_schema Query <TIME> Waiting for table metadata lock SELECT COUNT(*) FROM test.t1 <TIME_MS> 0 0 0.000 <MEMORY> <MAX_MEMORY> <ROWS> <QUERY_ID> SELECT COUNT(*) FROM test.t1 <TID> +<ID> test_user <HOST_NAME> information_schema Sleep <TIME> NULL <TIME_MS> 0 0 0.000 <MEMORY> <MAX_MEMORY> <ROWS> <QUERY_ID> NULL <TID> +<ID> root <HOST_NAME> information_schema Query <TIME> Filling schema table SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST <TIME_MS> 0 0 0.000 <MEMORY> <MAX_MEMORY> <ROWS> <QUERY_ID> SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST <TID> UNLOCK TABLES; connection con2; # Pull("reap") the result set from the statement executed with "send". @@ -222,10 +223,10 @@ connection default; # SHOW PROCESSLIST statement truncated after 100 char SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST; -ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS MEMORY_USED EXAMINED_ROWS QUERY_ID INFO_BINARY TID -<ID> test_user <HOST_NAME> information_schema <COMMAND> <TIME> <STATE> SELECT count(*),'BEGIN-This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.-END' AS "Long string" FROM test.t1 <TIME_MS> 0 0 0.000 <MEMORY> <ROWS> <QUERY_ID> SELECT count(*),'BEGIN-This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.-END' AS "Long string" FROM test.t1 <TID> -<ID> test_user <HOST_NAME> information_schema <COMMAND> <TIME> <STATE> NULL <TIME_MS> 0 0 0.000 <MEMORY> <ROWS> <QUERY_ID> NULL <TID> -<ID> root <HOST_NAME> information_schema <COMMAND> <TIME> <STATE> SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST <TIME_MS> 0 0 0.000 <MEMORY> <ROWS> <QUERY_ID> SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST <TID> +ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS MEMORY_USED MAX_MEMORY_USED EXAMINED_ROWS QUERY_ID INFO_BINARY TID +<ID> test_user <HOST_NAME> information_schema <COMMAND> <TIME> <STATE> SELECT count(*),'BEGIN-This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.-END' AS "Long string" FROM test.t1 <TIME_MS> 0 0 0.000 <MEMORY> <MAX_MEMORY> <ROWS> <QUERY_ID> SELECT count(*),'BEGIN-This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.-END' AS "Long string" FROM test.t1 <TID> +<ID> test_user <HOST_NAME> information_schema <COMMAND> <TIME> <STATE> NULL <TIME_MS> 0 0 0.000 <MEMORY> <MAX_MEMORY> <ROWS> <QUERY_ID> NULL <TID> +<ID> root <HOST_NAME> information_schema <COMMAND> <TIME> <STATE> SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST <TIME_MS> 0 0 0.000 <MEMORY> <MAX_MEMORY> <ROWS> <QUERY_ID> SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST <TID> SHOW FULL PROCESSLIST; Id User Host db Command Time State Info Progress <ID> root <HOST_NAME> information_schema <COMMAND> <TIME> <STATE> SHOW FULL PROCESSLIST 0.000 diff --git a/mysql-test/suite/funcs_1/r/processlist_val_ps.result b/mysql-test/suite/funcs_1/r/processlist_val_ps.result index 48fcc0a5553..169053cb6be 100644 --- a/mysql-test/suite/funcs_1/r/processlist_val_ps.result +++ b/mysql-test/suite/funcs_1/r/processlist_val_ps.result @@ -25,6 +25,7 @@ PROCESSLIST CREATE TEMPORARY TABLE `PROCESSLIST` ( `MAX_STAGE` tinyint(2) NOT NULL DEFAULT 0, `PROGRESS` decimal(7,3) NOT NULL DEFAULT 0.000, `MEMORY_USED` bigint(7) NOT NULL DEFAULT 0, + `MAX_MEMORY_USED` bigint(7) NOT NULL DEFAULT 0, `EXAMINED_ROWS` int(7) NOT NULL DEFAULT 0, `QUERY_ID` bigint(4) NOT NULL DEFAULT 0, `INFO_BINARY` blob DEFAULT NULL, @@ -34,11 +35,11 @@ PROCESSLIST CREATE TEMPORARY TABLE `PROCESSLIST` ( #-------------------------------------------------------------------------- SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST; -ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS MEMORY_USED EXAMINED_ROWS QUERY_ID INFO_BINARY TID -<ID> root <HOST_NAME> test Execute <TIME> Filling schema table SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST <TIME_MS> 0 0 0.000 <MEMORY> <ROWS> <QUERY_ID> SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST <TID> +ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS MEMORY_USED MAX_MEMORY_USED EXAMINED_ROWS QUERY_ID INFO_BINARY TID +<ID> root <HOST_NAME> test Execute <TIME> Filling schema table SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST <TIME_MS> 0 0 0.000 <MEMORY> <MAX_MEMORY> <ROWS> <QUERY_ID> SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST <TID> SHOW FULL PROCESSLIST; Id User Host db Command Time State Info Progress -<ID> root <HOST_NAME> test Query <TIME> init SHOW FULL PROCESSLIST <TIME_MS> +<ID> root <HOST_NAME> test Query <TIME> Init SHOW FULL PROCESSLIST <TIME_MS> SET @default_id = CONNECTION_ID(); SELECT COUNT(*) = 1 AS "Expect exact one connection with this id" FROM INFORMATION_SCHEMA.PROCESSLIST WHERE ID = @default_id; @@ -79,12 +80,12 @@ connection default; # Poll till the connection con1 is in state COMMAND = 'Sleep'. SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST; -ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS MEMORY_USED EXAMINED_ROWS QUERY_ID INFO_BINARY TID -<ID> test_user <HOST_NAME> information_schema Sleep <TIME> <STATE> NULL <TIME_MS> 0 0 0.000 <MEMORY> <ROWS> <QUERY_ID> NULL <TID> -<ID> root <HOST_NAME> information_schema Execute <TIME> <STATE> SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST <TIME_MS> 0 0 0.000 <MEMORY> <ROWS> <QUERY_ID> SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST <TID> +ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS MEMORY_USED MAX_MEMORY_USED EXAMINED_ROWS QUERY_ID INFO_BINARY TID +<ID> test_user <HOST_NAME> information_schema Sleep <TIME> <STATE> NULL <TIME_MS> 0 0 0.000 <MEMORY> <MAX_MEMORY> <ROWS> <QUERY_ID> NULL <TID> +<ID> root <HOST_NAME> information_schema Execute <TIME> <STATE> SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST <TIME_MS> 0 0 0.000 <MEMORY> <MAX_MEMORY> <ROWS> <QUERY_ID> SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST <TID> SHOW FULL PROCESSLIST; Id User Host db Command Time State Info Progress -<ID> root <HOST_NAME> information_schema Query <TIME> init SHOW FULL PROCESSLIST 0.000 +<ID> root <HOST_NAME> information_schema Query <TIME> Init SHOW FULL PROCESSLIST 0.000 <ID> test_user <HOST_NAME> information_schema Sleep <TIME> NULL 0.000 SELECT ID,TIME INTO @test_user_con1_id,@time FROM INFORMATION_SCHEMA.PROCESSLIST WHERE COMMAND = 'Sleep' AND USER = 'test_user'; @@ -112,11 +113,11 @@ Expect 1 connection con1; SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST; -ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS MEMORY_USED EXAMINED_ROWS QUERY_ID INFO_BINARY TID -<ID> test_user <HOST_NAME> information_schema Execute <TIME> Filling schema table SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST <TIME_MS> 0 0 0.000 <MEMORY> <ROWS> <QUERY_ID> SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST <TID> +ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS MEMORY_USED MAX_MEMORY_USED EXAMINED_ROWS QUERY_ID INFO_BINARY TID +<ID> test_user <HOST_NAME> information_schema Execute <TIME> Filling schema table SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST <TIME_MS> 0 0 0.000 <MEMORY> <MAX_MEMORY> <ROWS> <QUERY_ID> SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST <TID> SHOW FULL PROCESSLIST; Id User Host db Command Time State Info Progress -<ID> test_user <HOST_NAME> information_schema Query <TIME> init SHOW FULL PROCESSLIST 0.000 +<ID> test_user <HOST_NAME> information_schema Query <TIME> Init SHOW FULL PROCESSLIST 0.000 # Ensure that the user test_user sees all connections with his username. #---------------------------------------------------------------------------- @@ -126,13 +127,13 @@ connection default; connection con2; SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST; -ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS MEMORY_USED EXAMINED_ROWS QUERY_ID INFO_BINARY TID -<ID> test_user <HOST_NAME> information_schema Execute <TIME> Filling schema table SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST <TIME_MS> 0 0 0.000 <MEMORY> <ROWS> <QUERY_ID> SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST <TID> -<ID> test_user <HOST_NAME> information_schema Sleep <TIME> NULL <TIME_MS> 0 0 0.000 <MEMORY> <ROWS> <QUERY_ID> NULL <TID> +ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS MEMORY_USED MAX_MEMORY_USED EXAMINED_ROWS QUERY_ID INFO_BINARY TID +<ID> test_user <HOST_NAME> information_schema Execute <TIME> Filling schema table SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST <TIME_MS> 0 0 0.000 <MEMORY> <MAX_MEMORY> <ROWS> <QUERY_ID> SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST <TID> +<ID> test_user <HOST_NAME> information_schema Sleep <TIME> NULL <TIME_MS> 0 0 0.000 <MEMORY> <MAX_MEMORY> <ROWS> <QUERY_ID> NULL <TID> SHOW FULL PROCESSLIST; Id User Host db Command Time State Info Progress <ID> test_user <HOST_NAME> information_schema Sleep <TIME> NULL 0.000 -<ID> test_user <HOST_NAME> information_schema Query <TIME> init SHOW FULL PROCESSLIST 0.000 +<ID> test_user <HOST_NAME> information_schema Query <TIME> Init SHOW FULL PROCESSLIST 0.000 connection default; SELECT ID INTO @test_user_con2_id FROM INFORMATION_SCHEMA.PROCESSLIST WHERE ID <> @test_user_con1_id @@ -149,13 +150,13 @@ connection default; # Poll till connection con2 is in state 'User sleep'. SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST; -ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS MEMORY_USED EXAMINED_ROWS QUERY_ID INFO_BINARY TID -<ID> test_user <HOST_NAME> information_schema Query <TIME> User sleep SELECT sleep(10), 17 <TIME_MS> 0 0 0.000 <MEMORY> <ROWS> <QUERY_ID> SELECT sleep(10), 17 <TID> -<ID> test_user <HOST_NAME> information_schema Sleep <TIME> NULL <TIME_MS> 0 0 0.000 <MEMORY> <ROWS> <QUERY_ID> NULL <TID> -<ID> root <HOST_NAME> information_schema Execute <TIME> Filling schema table SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST <TIME_MS> 0 0 0.000 <MEMORY> <ROWS> <QUERY_ID> SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST <TID> +ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS MEMORY_USED MAX_MEMORY_USED EXAMINED_ROWS QUERY_ID INFO_BINARY TID +<ID> test_user <HOST_NAME> information_schema Query <TIME> User sleep SELECT sleep(10), 17 <TIME_MS> 0 0 0.000 <MEMORY> <MAX_MEMORY> <ROWS> <QUERY_ID> SELECT sleep(10), 17 <TID> +<ID> test_user <HOST_NAME> information_schema Sleep <TIME> NULL <TIME_MS> 0 0 0.000 <MEMORY> <MAX_MEMORY> <ROWS> <QUERY_ID> NULL <TID> +<ID> root <HOST_NAME> information_schema Execute <TIME> Filling schema table SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST <TIME_MS> 0 0 0.000 <MEMORY> <MAX_MEMORY> <ROWS> <QUERY_ID> SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST <TID> SHOW FULL PROCESSLIST; Id User Host db Command Time State Info Progress -<ID> root <HOST_NAME> information_schema Query <TIME> init SHOW FULL PROCESSLIST 0.000 +<ID> root <HOST_NAME> information_schema Query <TIME> Init SHOW FULL PROCESSLIST 0.000 <ID> test_user <HOST_NAME> information_schema Sleep <TIME> NULL 0.000 <ID> test_user <HOST_NAME> information_schema Query <TIME> User sleep SELECT sleep(10), 17 0.000 SELECT STATE, TIME, INFO INTO @state, @time, @info @@ -192,10 +193,10 @@ connection default; # Poll till INFO is no more NULL and State = 'Waiting for table metadata lock'. SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST; -ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS MEMORY_USED EXAMINED_ROWS QUERY_ID INFO_BINARY TID -<ID> test_user <HOST_NAME> information_schema Query <TIME> Waiting for table metadata lock SELECT COUNT(*) FROM test.t1 <TIME_MS> 0 0 0.000 <MEMORY> <ROWS> <QUERY_ID> SELECT COUNT(*) FROM test.t1 <TID> -<ID> test_user <HOST_NAME> information_schema Sleep <TIME> NULL <TIME_MS> 0 0 0.000 <MEMORY> <ROWS> <QUERY_ID> NULL <TID> -<ID> root <HOST_NAME> information_schema Execute <TIME> Filling schema table SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST <TIME_MS> 0 0 0.000 <MEMORY> <ROWS> <QUERY_ID> SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST <TID> +ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS MEMORY_USED MAX_MEMORY_USED EXAMINED_ROWS QUERY_ID INFO_BINARY TID +<ID> test_user <HOST_NAME> information_schema Query <TIME> Waiting for table metadata lock SELECT COUNT(*) FROM test.t1 <TIME_MS> 0 0 0.000 <MEMORY> <MAX_MEMORY> <ROWS> <QUERY_ID> SELECT COUNT(*) FROM test.t1 <TID> +<ID> test_user <HOST_NAME> information_schema Sleep <TIME> NULL <TIME_MS> 0 0 0.000 <MEMORY> <MAX_MEMORY> <ROWS> <QUERY_ID> NULL <TID> +<ID> root <HOST_NAME> information_schema Execute <TIME> Filling schema table SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST <TIME_MS> 0 0 0.000 <MEMORY> <MAX_MEMORY> <ROWS> <QUERY_ID> SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST <TID> UNLOCK TABLES; connection con2; # Pull("reap") the result set from the statement executed with "send". @@ -222,10 +223,10 @@ connection default; # SHOW PROCESSLIST statement truncated after 100 char SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST; -ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS MEMORY_USED EXAMINED_ROWS QUERY_ID INFO_BINARY TID -<ID> test_user <HOST_NAME> information_schema <COMMAND> <TIME> <STATE> SELECT count(*),'BEGIN-This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.-END' AS "Long string" FROM test.t1 <TIME_MS> 0 0 0.000 <MEMORY> <ROWS> <QUERY_ID> SELECT count(*),'BEGIN-This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.-END' AS "Long string" FROM test.t1 <TID> -<ID> test_user <HOST_NAME> information_schema <COMMAND> <TIME> <STATE> NULL <TIME_MS> 0 0 0.000 <MEMORY> <ROWS> <QUERY_ID> NULL <TID> -<ID> root <HOST_NAME> information_schema <COMMAND> <TIME> <STATE> SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST <TIME_MS> 0 0 0.000 <MEMORY> <ROWS> <QUERY_ID> SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST <TID> +ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS MEMORY_USED MAX_MEMORY_USED EXAMINED_ROWS QUERY_ID INFO_BINARY TID +<ID> test_user <HOST_NAME> information_schema <COMMAND> <TIME> <STATE> SELECT count(*),'BEGIN-This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.-END' AS "Long string" FROM test.t1 <TIME_MS> 0 0 0.000 <MEMORY> <MAX_MEMORY> <ROWS> <QUERY_ID> SELECT count(*),'BEGIN-This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.This is the representative of a very long statement.-END' AS "Long string" FROM test.t1 <TID> +<ID> test_user <HOST_NAME> information_schema <COMMAND> <TIME> <STATE> NULL <TIME_MS> 0 0 0.000 <MEMORY> <MAX_MEMORY> <ROWS> <QUERY_ID> NULL <TID> +<ID> root <HOST_NAME> information_schema <COMMAND> <TIME> <STATE> SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST <TIME_MS> 0 0 0.000 <MEMORY> <MAX_MEMORY> <ROWS> <QUERY_ID> SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST <TID> SHOW FULL PROCESSLIST; Id User Host db Command Time State Info Progress <ID> root <HOST_NAME> information_schema <COMMAND> <TIME> <STATE> SHOW FULL PROCESSLIST 0.000 diff --git a/mysql-test/suite/galera/disabled.def b/mysql-test/suite/galera/disabled.def index 423c83208f8..193b9f87d56 100644 --- a/mysql-test/suite/galera/disabled.def +++ b/mysql-test/suite/galera/disabled.def @@ -56,3 +56,7 @@ MW-284 : MDEV-13549 Galera test failures 10.1 galera_as_slave : MDEV-13549 Galera test failures 10.1 galera_var_innodb_disallow_writes : MDEV-10949 galera_kill_applier : race condition at the start of the test +GAL-480 : "Lost connection to MySQL" +MW-328A : "Found wrong usage of mutex" +MW-328B : "Found wrong usage of mutex" +MW-328C : "Found wrong usage of mutex" diff --git a/mysql-test/suite/galera/t/galera_gcs_fc_limit.test b/mysql-test/suite/galera/t/galera_gcs_fc_limit.test index 61576a39316..5d341533161 100644 --- a/mysql-test/suite/galera/t/galera_gcs_fc_limit.test +++ b/mysql-test/suite/galera/t/galera_gcs_fc_limit.test @@ -36,7 +36,7 @@ INSERT INTO t1 VALUES (5); --let $galera_server_number = 1 --source include/galera_connect.inc --connection node_1a ---let $wait_condition = SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE STATE = 'query end' AND INFO = 'INSERT INTO t1 VALUES (5)'; +--let $wait_condition = SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE STATE = 'Commit' AND INFO = 'INSERT INTO t1 VALUES (5)'; --source include/wait_condition.inc --connection node_2 diff --git a/mysql-test/suite/galera/t/galera_var_innodb_disallow_writes.test b/mysql-test/suite/galera/t/galera_var_innodb_disallow_writes.test index c08483b63ad..3606075e7a8 100644 --- a/mysql-test/suite/galera/t/galera_var_innodb_disallow_writes.test +++ b/mysql-test/suite/galera/t/galera_var_innodb_disallow_writes.test @@ -18,7 +18,7 @@ SET GLOBAL innodb_disallow_writes=ON; --send INSERT INTO t1 VALUES (1); --connection node_1a -let $wait_condition = SELECT 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE INFO = 'INSERT INTO t1 VALUES (1)' AND State = 'query end'; +let $wait_condition = SELECT 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE INFO = 'INSERT INTO t1 VALUES (1)' AND State = 'Commit'; --source include/wait_condition.inc SET GLOBAL innodb_disallow_writes=OFF; diff --git a/mysql-test/suite/gcol/r/innodb_virtual_basic.result b/mysql-test/suite/gcol/r/innodb_virtual_basic.result index d48292a6577..0c8880a4799 100644 --- a/mysql-test/suite/gcol/r/innodb_virtual_basic.result +++ b/mysql-test/suite/gcol/r/innodb_virtual_basic.result @@ -960,9 +960,12 @@ INSERT INTO t1 VALUES (11, 3, DEFAULT, 'mm'); INSERT INTO t1 VALUES (18, 1, DEFAULT, 'mm'); INSERT INTO t1 VALUES (28, 1, DEFAULT, 'mm'); ALTER TABLE t1 ADD INDEX idx12 (c) , FORCE, LOCK=NONE; +ERROR 0A000: LOCK=NONE is not supported. Reason: online rebuild with indexed virtual columns. Try LOCK=SHARED +ALTER TABLE t1 ADD INDEX idx12 (c), LOCK=NONE; ALTER TABLE t1 DROP COLUMN h, ADD INDEX idx (c) , FORCE, LOCK=NONE; -Warnings: -Note 1831 Duplicate index `idx`. This is deprecated and will be disallowed in a future release +ERROR 0A000: LOCK=NONE is not supported. Reason: online rebuild with indexed virtual columns. Try LOCK=SHARED +ALTER TABLE t1 DROP COLUMN h, ADD INDEX idx (c), LOCK=NONE; +ERROR 0A000: LOCK=NONE is not supported. Reason: online rebuild with indexed virtual columns. Try LOCK=SHARED DROP TABLE t1 ; CREATE TABLE t1 (a INT, b INT, c INT GENERATED ALWAYS AS(a+b), d INT GENERATED ALWAYS AS(a+b), h VARCHAR(10)); INSERT INTO t1 VALUES (11, 3, DEFAULT, DEFAULT, 'mm'); @@ -1322,6 +1325,8 @@ t CREATE TABLE `t` ( ALTER TABLE t ADD COLUMN i INT GENERATED ALWAYS AS(a+a+b), ADD COLUMN j INT, ALGORITHM=INPLACE; ERROR 0A000: ALGORITHM=INPLACE is not supported. Reason: INPLACE ADD or DROP of virtual columns cannot be combined with other ALTER TABLE actions. Try ALGORITHM=COPY ALTER TABLE t ADD INDEX (x), ADD COLUMN j INT, ALGORITHM=INPLACE, LOCK=NONE; +ERROR 0A000: LOCK=NONE is not supported. Reason: online rebuild with indexed virtual columns. Try LOCK=SHARED +ALTER TABLE t ADD INDEX (x), ADD COLUMN j INT, ALGORITHM=INPLACE; SHOW CREATE TABLE t; Table Create Table t CREATE TABLE `t` ( diff --git a/mysql-test/suite/gcol/r/innodb_virtual_debug.result b/mysql-test/suite/gcol/r/innodb_virtual_debug.result index af220c7cd17..7774c6c347c 100644 --- a/mysql-test/suite/gcol/r/innodb_virtual_debug.result +++ b/mysql-test/suite/gcol/r/innodb_virtual_debug.result @@ -53,46 +53,8 @@ a b c h 18 1 19 mm 28 1 29 mm NULL NULL NULL mx -SET DEBUG_SYNC = 'innodb_inplace_alter_table_enter SIGNAL start_create WAIT_FOR go_ahead'; -ALTER TABLE t ADD COLUMN x INT; -connection con1; -SET DEBUG_SYNC = 'now WAIT_FOR start_create'; -start transaction; -update t set a=1 where a = 0; -rollback; -start transaction; -delete from t; -insert into t values(1,null,default,null); -rollback; -start transaction; -update t set b=b+1; -rollback; -SET DEBUG_SYNC = 'now SIGNAL go_ahead'; -connection default; -check table t; -Table Op Msg_type Msg_text -test.t check status OK -SELECT c FROM t; -c -NULL -3 -19 -29 -SET DEBUG_SYNC = 'innodb_inplace_alter_table_enter SIGNAL start_create WAIT_FOR go_ahead'; -ALTER TABLE t ADD COLUMN x2 INT; -connection con1; -SET DEBUG_SYNC = 'now WAIT_FOR start_create'; -start transaction; -DELETE FROM t WHERE a = 0; -ROLLBACK; -DELETE FROM t WHERE a = 0; -SET DEBUG_SYNC = 'now SIGNAL go_ahead'; -connection default; -SELECT c FROM t; -c -NULL -19 -29 +ALTER TABLE t FORCE, LOCK=NONE; +ERROR 0A000: LOCK=NONE is not supported. Reason: online rebuild with indexed virtual columns. Try LOCK=SHARED disconnect con1; DROP TABLE t; SET DEBUG_SYNC = 'RESET'; @@ -123,135 +85,4 @@ NULL 19 29 DROP TABLE t; -# -# Bug#22018532 ASSERTION WHEN ONLINE REAPPLY REBUILD LOG ON -# MULTIPLE INDEXED VIRTUAL COLUMNS -# -create table t ( -a int as (1) virtual, -b int, -c int as (1) virtual, -unique(b), -unique(c), -key(a) -) engine=innodb; -insert ignore into t values(); -SET DEBUG_SYNC = 'innodb_inplace_alter_table_enter SIGNAL start_create WAIT_FOR go_ahead'; -optimize table t; -connect con1,localhost,root,,; -SET DEBUG_SYNC = 'now WAIT_FOR start_create'; -insert ignore into t values(); -Warnings: -Warning 1062 Duplicate entry '1' for key 'c' -SET DEBUG_SYNC = 'now SIGNAL go_ahead'; -connection default; -/* connection default */ optimize table t; -Table Op Msg_type Msg_text -test.t optimize note Table does not support optimize, doing recreate + analyze instead -test.t optimize error Duplicate entry '1' for key 'a' -test.t optimize status Operation failed -Warnings: -Error 1062 Duplicate entry '1' for key 'a' -SELECT c FROM t; -c -1 -SHOW CREATE TABLE t; -Table Create Table -t CREATE TABLE `t` ( - `a` int(11) GENERATED ALWAYS AS (1) VIRTUAL, - `b` int(11) DEFAULT NULL, - `c` int(11) GENERATED ALWAYS AS (1) VIRTUAL, - UNIQUE KEY `b` (`b`), - UNIQUE KEY `c` (`c`), - KEY `a` (`a`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 -SELECT * FROM t; -a b c -1 NULL 1 -DROP TABLE t; -CREATE TABLE t (a INT, b INT, c INT GENERATED ALWAYS AS(a+b), h VARCHAR(10)); -INSERT INTO t VALUES (11, 3, DEFAULT, 'mm'); -INSERT INTO t VALUES (18, 1, DEFAULT, 'mm'); -INSERT INTO t VALUES (28, 1, DEFAULT, 'mm'); -INSERT INTO t VALUES (null, null, DEFAULT, 'mm'); -CREATE INDEX idx ON t(c); -SET DEBUG_SYNC = 'innodb_inplace_alter_table_enter SIGNAL start_rebuild WAIT_FOR go_ahead'; -optimize table t; -connection con1; -SET DEBUG_SYNC = 'now WAIT_FOR start_rebuild'; -INSERT INTO t VALUES (48, 2, DEFAULT, 'xx'); -INSERT INTO t VALUES (68, 3, DEFAULT, 'sx'); -SET DEBUG_SYNC = 'now SIGNAL go_ahead'; -connection default; -/* connection default */ optimize table t; -Table Op Msg_type Msg_text -test.t optimize note Table does not support optimize, doing recreate + analyze instead -test.t optimize status OK -SELECT c FROM t; -c -NULL -14 -19 -29 -50 -71 -disconnect con1; -DROP TABLE t; -# -# Bug#22951879 - ASSERTS RELATED TO ONLINE DDL AND GCOL -# -create table ibstd_14 (a int not null, d int not null, b varchar(198) not null, c char(181), vadcol int as (a+length(d)) stored, vbcol char(2) as (substr(b,2,2)) virtual, vbidxcol char(3) as (substr(b,1,3)) virtual , index(d), index(a), index(vbidxcol), index(a,vbidxcol), index(vbidxcol,d), unique key (b(10), a, d), index(c(99), b(31)), index(b(5), c(10), a) , index(a,d)) engine=InnoDB stats_persistent=1 row_format=dynamic; -SET DEBUG_SYNC = 'innodb_inplace_alter_table_enter SIGNAL start_create WAIT_FOR go_ahead'; -alter table ibstd_14 row_format=compressed key_block_size=4,add key kn3 (d,c,vbcol,b); -connect con1,localhost,root; -SET DEBUG_SYNC = 'now WAIT_FOR start_create'; -insert into ibstd_14 (a,d,b,c, vbidxcol, vbcol) values ('118','6',repeat('oacolaarlruoacuroauurloraarucoooarcooauoolacalllaulrruarrrucruuooclacuoouccarrcoocloccorrrrarourcooalloocooccouruolaorlcaocualolc','1'),repeat('lolrrlalcocroraaulauclaaucolcorcuooaolruaooooluooooouaoorlarucorullalcrrloccououaooaorluorraclrcooouuolocoaolcocaaculruoocucoocoooauuolarcoraraocaoolulolarru','1'),default,default); -insert into ibstd_14 (a,d,b,c, vbidxcol, vbcol) values ('118','6', 'aaaa', 'lll', default, default); -update ibstd_14 set b='11111' where b='aaaa'; -SET DEBUG_SYNC = 'now SIGNAL go_ahead'; -connection default; -select * from ibstd_14; -a d b c vadcol vbcol vbidxcol -118 6 oacolaarlruoacuroauurloraarucoooarcooauoolacalllaulrruarrrucruuooclacuoouccarrcoocloccorrrrarourcooalloocooccouruolaorlcaocualolc lolrrlalcocroraaulauclaaucolcorcuooaolruaooooluooooouaoorlarucorullalcrrloccououaooaorluorraclrcooouuolocoaolcocaaculruoocucoocoooauuolarcoraraocaoolulolarru 119 ac oac -118 6 11111 lll 119 11 111 -select d,c,vbcol,b from ibstd_14; -d c vbcol b -6 lll 11 11111 -6 lolrrlalcocroraaulauclaaucolcorcuooaolruaooooluooooouaoorlarucorullalcrrloccououaooaorluorraclrcooouuolocoaolcocaaculruoocucoocoooauuolarcoraraocaoolulolarru ac oacolaarlruoacuroauurloraarucoooarcooauoolacalllaulrruarrrucruuooclacuoouccarrcoocloccorrrrarourcooalloocooccouruolaorlcaocualolc -select vbcol from ibstd_14; -vbcol -11 -ac -drop table ibstd_14; -# -# Bug#22018745 CORRUPTION IN ONLINE TABLE REBUILD -# (ROW_FORMAT=REDUNDANT, INDEXED VIRTUAL COLUMN) -# -CREATE TABLE t ( -b char(5) PRIMARY KEY, -v char(3) GENERATED ALWAYS AS (substr(b,1,3)) VIRTUAL, KEY(v) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=REDUNDANT; -connection con1; -SET DEBUG_SYNC='row_log_table_apply1_before SIGNAL prepared WAIT_FOR apply'; -OPTIMIZE TABLE t; -connection default; -SET DEBUG_SYNC='now WAIT_FOR prepared'; -INSERT INTO t SET b='fubar'; -BEGIN; -DELETE FROM t; -ROLLBACK; -SET DEBUG_SYNC='now SIGNAL apply'; -connection con1; -Table Op Msg_type Msg_text -test.t optimize note Table does not support optimize, doing recreate + analyze instead -test.t optimize status OK -connection default; -CHECK TABLE t; -Table Op Msg_type Msg_text -test.t check status OK -SELECT * FROM t; -b v -fubar fub -DROP TABLE t; -disconnect con1; SET DEBUG_SYNC = 'RESET'; diff --git a/mysql-test/suite/gcol/r/innodb_virtual_rebuild.result b/mysql-test/suite/gcol/r/innodb_virtual_rebuild.result new file mode 100644 index 00000000000..2e35698e47e --- /dev/null +++ b/mysql-test/suite/gcol/r/innodb_virtual_rebuild.result @@ -0,0 +1,98 @@ +CREATE TABLE t1 (j SERIAL, i INT, v INT AS (i) VIRTUAL) ENGINE=InnoDB; +CREATE TABLE t2 (j SERIAL, i INT, v INT AS (i) VIRTUAL) ENGINE=InnoDB +ROW_FORMAT=REDUNDANT; +CREATE TABLE t3 (i INT, v INT AS (i) VIRTUAL) ENGINE=InnoDB; +CREATE TABLE t4 (i INT, v INT AS (i) VIRTUAL) ENGINE=InnoDB +ROW_FORMAT=REDUNDANT; +INSERT INTO t4 SET i=1; +ALTER TABLE t4 ADD INDEX(v), LOCK=NONE; +ALTER TABLE t4 ADD COLUMN k INT, LOCK=NONE; +ALTER TABLE t4 DROP k, LOCK=NONE; +ERROR 0A000: LOCK=NONE is not supported. Reason: online rebuild with indexed virtual columns. Try LOCK=SHARED +ALTER TABLE t4 DROP INDEX v, LOCK=NONE; +ALTER TABLE t4 DROP k, LOCK=NONE; +INSERT INTO t3 SET i=1; +ALTER TABLE t3 ADD INDEX(v), LOCK=NONE; +ALTER TABLE t3 ADD COLUMN k INT, LOCK=NONE; +ALTER TABLE t3 DROP k, LOCK=NONE; +ERROR 0A000: LOCK=NONE is not supported. Reason: online rebuild with indexed virtual columns. Try LOCK=SHARED +ALTER TABLE t3 DROP INDEX v, LOCK=NONE; +ALTER TABLE t3 DROP k, LOCK=NONE; +INSERT INTO t2 SET i=1; +ALTER TABLE t2 ADD INDEX(v), LOCK=NONE; +ALTER TABLE t2 ADD COLUMN k INT, LOCK=NONE; +ALTER TABLE t2 DROP k, LOCK=NONE; +ERROR 0A000: LOCK=NONE is not supported. Reason: online rebuild with indexed virtual columns. Try LOCK=SHARED +ALTER TABLE t2 DROP INDEX v, LOCK=NONE; +ALTER TABLE t2 DROP k, LOCK=NONE; +INSERT INTO t1 SET i=1; +ALTER TABLE t1 ADD INDEX(v), LOCK=NONE; +ALTER TABLE t1 ADD COLUMN k INT, LOCK=NONE; +ALTER TABLE t1 DROP k, LOCK=NONE; +ERROR 0A000: LOCK=NONE is not supported. Reason: online rebuild with indexed virtual columns. Try LOCK=SHARED +ALTER TABLE t1 DROP INDEX v, LOCK=NONE; +ALTER TABLE t1 DROP k, LOCK=NONE; +connect ddl,localhost,root,,test; +connection default; +connection ddl; +SET DEBUG_SYNC = 'row_log_table_apply1_before SIGNAL copied WAIT_FOR dml'; +ALTER TABLE t4 FORCE; +connection default; +SET DEBUG_SYNC = 'now WAIT_FOR copied'; +BEGIN; +UPDATE t4 SET i = 0; +ROLLBACK; +SET DEBUG_SYNC = 'now SIGNAL dml'; +connection ddl; +connection default; +SELECT * FROM t4; +i v +1 1 +DROP TABLE t4; +connection ddl; +SET DEBUG_SYNC = 'row_log_table_apply1_before SIGNAL copied WAIT_FOR dml'; +ALTER TABLE t3 FORCE; +connection default; +SET DEBUG_SYNC = 'now WAIT_FOR copied'; +BEGIN; +UPDATE t3 SET i = 0; +ROLLBACK; +SET DEBUG_SYNC = 'now SIGNAL dml'; +connection ddl; +connection default; +SELECT * FROM t3; +i v +1 1 +DROP TABLE t3; +connection ddl; +SET DEBUG_SYNC = 'row_log_table_apply1_before SIGNAL copied WAIT_FOR dml'; +ALTER TABLE t2 FORCE; +connection default; +SET DEBUG_SYNC = 'now WAIT_FOR copied'; +BEGIN; +UPDATE t2 SET i = 0; +ROLLBACK; +SET DEBUG_SYNC = 'now SIGNAL dml'; +connection ddl; +connection default; +SELECT * FROM t2; +j i v +1 1 1 +DROP TABLE t2; +connection ddl; +SET DEBUG_SYNC = 'row_log_table_apply1_before SIGNAL copied WAIT_FOR dml'; +ALTER TABLE t1 FORCE; +connection default; +SET DEBUG_SYNC = 'now WAIT_FOR copied'; +BEGIN; +UPDATE t1 SET i = 0; +ROLLBACK; +SET DEBUG_SYNC = 'now SIGNAL dml'; +connection ddl; +connection default; +SELECT * FROM t1; +j i v +1 1 1 +DROP TABLE t1; +disconnect ddl; +SET DEBUG_SYNC = 'RESET'; diff --git a/mysql-test/suite/gcol/t/innodb_virtual_basic.test b/mysql-test/suite/gcol/t/innodb_virtual_basic.test index e4e00c83536..aa2e1e00c8f 100644 --- a/mysql-test/suite/gcol/t/innodb_virtual_basic.test +++ b/mysql-test/suite/gcol/t/innodb_virtual_basic.test @@ -878,8 +878,13 @@ INSERT INTO t1 VALUES (18, 1, DEFAULT, 'mm'); INSERT INTO t1 VALUES (28, 1, DEFAULT, 'mm'); +--error ER_ALTER_OPERATION_NOT_SUPPORTED_REASON ALTER TABLE t1 ADD INDEX idx12 (c) , FORCE, LOCK=NONE; +ALTER TABLE t1 ADD INDEX idx12 (c), LOCK=NONE; +--error ER_ALTER_OPERATION_NOT_SUPPORTED_REASON ALTER TABLE t1 DROP COLUMN h, ADD INDEX idx (c) , FORCE, LOCK=NONE; +--error ER_ALTER_OPERATION_NOT_SUPPORTED_REASON +ALTER TABLE t1 DROP COLUMN h, ADD INDEX idx (c), LOCK=NONE; DROP TABLE t1 ; @@ -1305,8 +1310,9 @@ SHOW CREATE TABLE t; --error ER_ALTER_OPERATION_NOT_SUPPORTED_REASON ALTER TABLE t ADD COLUMN i INT GENERATED ALWAYS AS(a+a+b), ADD COLUMN j INT, ALGORITHM=INPLACE; -# Add an index along with adding a regular column is allowed. +--error ER_ALTER_OPERATION_NOT_SUPPORTED_REASON ALTER TABLE t ADD INDEX (x), ADD COLUMN j INT, ALGORITHM=INPLACE, LOCK=NONE; +ALTER TABLE t ADD INDEX (x), ADD COLUMN j INT, ALGORITHM=INPLACE; SHOW CREATE TABLE t; # Online add an index on newly added virtual column is not allowed. diff --git a/mysql-test/suite/gcol/t/innodb_virtual_debug.test b/mysql-test/suite/gcol/t/innodb_virtual_debug.test index 7ccf0fb8fc7..3870f84e066 100644 --- a/mysql-test/suite/gcol/t/innodb_virtual_debug.test +++ b/mysql-test/suite/gcol/t/innodb_virtual_debug.test @@ -53,8 +53,11 @@ SELECT c FROM t; SHOW CREATE TABLE t; SELECT * FROM t; +--error ER_ALTER_OPERATION_NOT_SUPPORTED_REASON +ALTER TABLE t FORCE, LOCK=NONE; +if (0) {# MDEV-14341 TODO: re-enable this SET DEBUG_SYNC = 'innodb_inplace_alter_table_enter SIGNAL start_create WAIT_FOR go_ahead'; ---send ALTER TABLE t ADD COLUMN x INT +--send ALTER TABLE t FORCE connection con1; @@ -78,7 +81,7 @@ check table t; SELECT c FROM t; SET DEBUG_SYNC = 'innodb_inplace_alter_table_enter SIGNAL start_create WAIT_FOR go_ahead'; ---send ALTER TABLE t ADD COLUMN x2 INT +--send ALTER TABLE t FORCE connection con1; @@ -93,6 +96,7 @@ connection default; reap; SELECT c FROM t; +} disconnect con1; DROP TABLE t; @@ -129,7 +133,7 @@ SELECT c FROM t; DROP TABLE t; - +if (0) {# MDEV-14341 TODO: re-enable LOCK=NONE and these tests --echo # --echo # Bug#22018532 ASSERTION WHEN ONLINE REAPPLY REBUILD LOG ON --echo # MULTIPLE INDEXED VIRTUAL COLUMNS @@ -264,7 +268,7 @@ SELECT * FROM t; DROP TABLE t; disconnect con1; - +} SET DEBUG_SYNC = 'RESET'; --source include/wait_until_count_sessions.inc diff --git a/mysql-test/suite/gcol/t/innodb_virtual_rebuild.test b/mysql-test/suite/gcol/t/innodb_virtual_rebuild.test new file mode 100644 index 00000000000..37ab82c46db --- /dev/null +++ b/mysql-test/suite/gcol/t/innodb_virtual_rebuild.test @@ -0,0 +1,50 @@ +--source include/have_innodb.inc +--source include/have_debug.inc +--source include/have_debug_sync.inc + +CREATE TABLE t1 (j SERIAL, i INT, v INT AS (i) VIRTUAL) ENGINE=InnoDB; +CREATE TABLE t2 (j SERIAL, i INT, v INT AS (i) VIRTUAL) ENGINE=InnoDB +ROW_FORMAT=REDUNDANT; +CREATE TABLE t3 (i INT, v INT AS (i) VIRTUAL) ENGINE=InnoDB; +CREATE TABLE t4 (i INT, v INT AS (i) VIRTUAL) ENGINE=InnoDB +ROW_FORMAT=REDUNDANT; + +let $n=4; +while ($n) +{ +eval INSERT INTO t$n SET i=1; +eval ALTER TABLE t$n ADD INDEX(v), LOCK=NONE; +eval ALTER TABLE t$n ADD COLUMN k INT, LOCK=NONE; +--error ER_ALTER_OPERATION_NOT_SUPPORTED_REASON +eval ALTER TABLE t$n DROP k, LOCK=NONE; +eval ALTER TABLE t$n DROP INDEX v, LOCK=NONE; +eval ALTER TABLE t$n DROP k, LOCK=NONE; +dec $n; +} + +connect (ddl,localhost,root,,test); +connection default; + +let $n=4; +while ($n) +{ +connection ddl; +SET DEBUG_SYNC = 'row_log_table_apply1_before SIGNAL copied WAIT_FOR dml'; +send_eval ALTER TABLE t$n FORCE; + +connection default; +SET DEBUG_SYNC = 'now WAIT_FOR copied'; +BEGIN; +eval UPDATE t$n SET i = 0; +ROLLBACK; +SET DEBUG_SYNC = 'now SIGNAL dml'; + +connection ddl; +reap; +connection default; +eval SELECT * FROM t$n; +eval DROP TABLE t$n; +dec $n; +} +disconnect ddl; +SET DEBUG_SYNC = 'RESET'; diff --git a/mysql-test/suite/innodb/r/instant_alter_debug.result b/mysql-test/suite/innodb/r/instant_alter_debug.result index d3d75ff05d4..b1407aad1f3 100644 --- a/mysql-test/suite/innodb/r/instant_alter_debug.result +++ b/mysql-test/suite/innodb/r/instant_alter_debug.result @@ -35,7 +35,7 @@ ALTER TABLE t4 ADD COLUMN b INT; SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS LEFT JOIN t4 ON (NUMERIC_SCALE = pk); COUNT(*) -1733 +1734 SET DEBUG_SYNC='innodb_inplace_alter_table_enter SIGNAL enter WAIT_FOR delete'; ALTER TABLE t4 ADD COLUMN c INT; connect dml,localhost,root,,; diff --git a/mysql-test/suite/innodb/r/table_definition_cache_debug.result b/mysql-test/suite/innodb/r/table_definition_cache_debug.result index afceec731b0..2c2c6de44ae 100644 --- a/mysql-test/suite/innodb/r/table_definition_cache_debug.result +++ b/mysql-test/suite/innodb/r/table_definition_cache_debug.result @@ -1,3 +1,4 @@ +call mtr.add_suppression("InnoDB: innodb_open_files=13 is exceeded"); SET @save_tdc= @@GLOBAL.table_definition_cache; SET @save_toc= @@GLOBAL.table_open_cache; SET GLOBAL table_definition_cache= 400; diff --git a/mysql-test/suite/innodb/t/table_definition_cache_debug.test b/mysql-test/suite/innodb/t/table_definition_cache_debug.test index 57d64d6844e..1f3598d68c9 100644 --- a/mysql-test/suite/innodb/t/table_definition_cache_debug.test +++ b/mysql-test/suite/innodb/t/table_definition_cache_debug.test @@ -2,6 +2,8 @@ --source include/have_debug.inc --source include/have_debug_sync.inc +call mtr.add_suppression("InnoDB: innodb_open_files=13 is exceeded"); + SET @save_tdc= @@GLOBAL.table_definition_cache; SET @save_toc= @@GLOBAL.table_open_cache; diff --git a/mysql-test/suite/mariabackup/data_directory.result b/mysql-test/suite/mariabackup/data_directory.result new file mode 100644 index 00000000000..e7201918cbd --- /dev/null +++ b/mysql-test/suite/mariabackup/data_directory.result @@ -0,0 +1,13 @@ +CREATE TABLE t(a INT) ENGINE=InnoDB DATA DIRECTORY='table_data_dir'; +INSERT INTO t VALUES(1); +# xtrabackup backup +# xtrabackup prepare +DROP TABLE t; +# shutdown server +# remove datadir +# xtrabackup move back +# restart server +SELECT * FROM t; +a +1 +DROP TABLE t; diff --git a/mysql-test/suite/mariabackup/data_directory.test b/mysql-test/suite/mariabackup/data_directory.test new file mode 100644 index 00000000000..50789a34c78 --- /dev/null +++ b/mysql-test/suite/mariabackup/data_directory.test @@ -0,0 +1,23 @@ +let $table_data_dir=$MYSQLTEST_VARDIR/ddir; +mkdir $table_data_dir; +--replace_result $table_data_dir table_data_dir +EVAL CREATE TABLE t(a INT) ENGINE=InnoDB DATA DIRECTORY='$table_data_dir'; +INSERT INTO t VALUES(1); +echo # xtrabackup backup; +let $targetdir=$MYSQLTEST_VARDIR/tmp/backup; +--disable_result_log +exec $XTRABACKUP --defaults-file=$MYSQLTEST_VARDIR/my.cnf --backup --target-dir=$targetdir; +--enable_result_log +--source include/shutdown_mysqld.inc +echo # xtrabackup prepare; +--disable_result_log +exec $XTRABACKUP --prepare --target-dir=$targetdir; +--source include/start_mysqld.inc +DROP TABLE t; +rmdir $table_data_dir; +-- source include/restart_and_restore.inc +--enable_result_log +SELECT * FROM t; +DROP TABLE t; +rmdir $targetdir; +rmdir $table_data_dir; diff --git a/mysql-test/suite/mariabackup/incremental_backup.result b/mysql-test/suite/mariabackup/incremental_backup.result index eeedc751d83..cc7277bdde9 100644 --- a/mysql-test/suite/mariabackup/incremental_backup.result +++ b/mysql-test/suite/mariabackup/incremental_backup.result @@ -1,13 +1,22 @@ call mtr.add_suppression("InnoDB: New log files created"); -CREATE TABLE t(i INT) ENGINE INNODB; +CREATE TABLE t(i INT PRIMARY KEY) ENGINE INNODB; +BEGIN; +INSERT INTO t VALUES(2); +connect con1,localhost,root,,; +SET GLOBAL innodb_flush_log_at_trx_commit = 1; INSERT INTO t VALUES(1); # Create full backup , modify table, then create incremental/differential backup -INSERT INTO t VALUES(2); +BEGIN; +INSERT INTO t VALUES(0); +DELETE FROM t WHERE i=0; +connection default; +COMMIT; SELECT * FROM t; i 1 2 # Prepare full backup, apply incremental one +disconnect con1; # Restore and check results # shutdown server # remove datadir diff --git a/mysql-test/suite/mariabackup/incremental_backup.test b/mysql-test/suite/mariabackup/incremental_backup.test index b60b151563f..8fbfa701999 100644 --- a/mysql-test/suite/mariabackup/incremental_backup.test +++ b/mysql-test/suite/mariabackup/incremental_backup.test @@ -5,14 +5,22 @@ call mtr.add_suppression("InnoDB: New log files created"); let $basedir=$MYSQLTEST_VARDIR/tmp/backup; let $incremental_dir=$MYSQLTEST_VARDIR/tmp/backup_inc1; -CREATE TABLE t(i INT) ENGINE INNODB; +CREATE TABLE t(i INT PRIMARY KEY) ENGINE INNODB; +BEGIN; +INSERT INTO t VALUES(2); +connect (con1,localhost,root,,); +SET GLOBAL innodb_flush_log_at_trx_commit = 1; INSERT INTO t VALUES(1); echo # Create full backup , modify table, then create incremental/differential backup; --disable_result_log exec $XTRABACKUP --defaults-file=$MYSQLTEST_VARDIR/my.cnf --backup --target-dir=$basedir; --enable_result_log -INSERT INTO t VALUES(2); +BEGIN; +INSERT INTO t VALUES(0); +DELETE FROM t WHERE i=0; +connection default; +COMMIT; SELECT * FROM t; exec $XTRABACKUP --defaults-file=$MYSQLTEST_VARDIR/my.cnf --backup --ftwrl-wait-timeout=5 --ftwrl-wait-threshold=300 --ftwrl-wait-query-type=all --target-dir=$incremental_dir --incremental-basedir=$basedir; @@ -21,6 +29,7 @@ echo # Prepare full backup, apply incremental one; exec $XTRABACKUP --prepare --target-dir=$basedir; exec $XTRABACKUP --prepare --target-dir=$basedir --incremental-dir=$incremental_dir ; +disconnect con1; echo # Restore and check results; let $targetdir=$basedir; -- source include/restart_and_restore.inc diff --git a/mysql-test/suite/mariabackup/partition_datadir.opt b/mysql-test/suite/mariabackup/partition_datadir.opt new file mode 100644 index 00000000000..8a3240370eb --- /dev/null +++ b/mysql-test/suite/mariabackup/partition_datadir.opt @@ -0,0 +1 @@ +--partition
\ No newline at end of file diff --git a/mysql-test/suite/mariabackup/partition_datadir.result b/mysql-test/suite/mariabackup/partition_datadir.result new file mode 100644 index 00000000000..3fc5fe30907 --- /dev/null +++ b/mysql-test/suite/mariabackup/partition_datadir.result @@ -0,0 +1,22 @@ +CREATE TABLE t(i int) +ENGINE=InnoDB +PARTITION BY RANGE (i) +(PARTITION p0 VALUES LESS THAN (100), +PARTITION P1 VALUES LESS THAN (200), +PARTITION p2 VALUES LESS THAN (300) DATA DIRECTORY = 'MYSQLTEST_VARDIR/partitdata', +PARTITION p3 VALUES LESS THAN (400) DATA DIRECTORY = 'MYSQLTEST_VARDIR/partitdata', +PARTITION p4 VALUES LESS THAN MAXVALUE); +INSERT INTO t VALUES (1), (101), (201), (301), (401); +DROP TABLE t; +# shutdown server +# remove datadir +# xtrabackup move back +# restart server +SELECT * FROM t; +i +1 +101 +201 +301 +401 +DROP TABLE t; diff --git a/mysql-test/suite/mariabackup/partition_datadir.test b/mysql-test/suite/mariabackup/partition_datadir.test new file mode 100644 index 00000000000..882b0111267 --- /dev/null +++ b/mysql-test/suite/mariabackup/partition_datadir.test @@ -0,0 +1,24 @@ +let $targetdir=$MYSQLTEST_VARDIR/backup; +mkdir $targetdir; +mkdir $MYSQLTEST_VARDIR/partitdata; + +--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR +eval CREATE TABLE t(i int) +ENGINE=InnoDB +PARTITION BY RANGE (i) +(PARTITION p0 VALUES LESS THAN (100), + PARTITION P1 VALUES LESS THAN (200), + PARTITION p2 VALUES LESS THAN (300) DATA DIRECTORY = '$MYSQLTEST_VARDIR/partitdata', + PARTITION p3 VALUES LESS THAN (400) DATA DIRECTORY = '$MYSQLTEST_VARDIR/partitdata', + PARTITION p4 VALUES LESS THAN MAXVALUE); +INSERT INTO t VALUES (1), (101), (201), (301), (401); +exec $XTRABACKUP --defaults-file=$MYSQLTEST_VARDIR/my.cnf --backup --target-dir=$targetdir; +exec $XTRABACKUP --prepare --target-dir=$targetdir; +DROP TABLE t; +rmdir $MYSQLTEST_VARDIR/partitdata; +--source include/restart_and_restore.inc +--enable_result_log +SELECT * FROM t; +DROP TABLE t; +rmdir $targetdir; +rmdir $MYSQLTEST_VARDIR/partitdata; diff --git a/mysql-test/suite/perfschema/include/event_aggregate_setup.inc b/mysql-test/suite/perfschema/include/event_aggregate_setup.inc index 7dfefd25235..f116b09ff04 100644 --- a/mysql-test/suite/perfschema/include/event_aggregate_setup.inc +++ b/mysql-test/suite/perfschema/include/event_aggregate_setup.inc @@ -118,10 +118,10 @@ update performance_schema.setup_instruments set enabled='YES', timed='YES' 'idle'); update performance_schema.setup_instruments set enabled='YES', timed='YES' - where name in ('stage/sql/init', - 'stage/sql/checking permissions', + where name in ('stage/sql/Init', 'stage/sql/Init for update', + 'stage/sql/Checking permissions', 'stage/sql/Opening tables', - 'stage/sql/closing tables'); + 'stage/sql/Closing tables'); update performance_schema.setup_instruments set enabled='YES', timed='YES' where name in ('statement/sql/select', @@ -247,7 +247,7 @@ prepare dump_stages_account from "select user, host, event_name, count_star from performance_schema.events_stages_summary_by_account_by_event_name where user like \'user%\' - and event_name in ('stage/sql/init', + and event_name in ('stage/sql/init', 'stage/sql/Init for update', 'stage/sql/checking permissions', 'stage/sql/Opening tables', 'stage/sql/closing tables') @@ -257,7 +257,7 @@ prepare dump_stages_user from "select user, event_name, count_star from performance_schema.events_stages_summary_by_user_by_event_name where user like \'user%\' - and event_name in ('stage/sql/init', + and event_name in ('stage/sql/init', 'stage/sql/Init for update', 'stage/sql/checking permissions', 'stage/sql/Opening tables', 'stage/sql/closing tables') @@ -267,7 +267,7 @@ prepare dump_stages_host from "select host, event_name, count_star from performance_schema.events_stages_summary_by_host_by_event_name where host=\'localhost\' - and event_name in ('stage/sql/init', + and event_name in ('stage/sql/init', 'stage/sql/Init for update', 'stage/sql/checking permissions', 'stage/sql/Opening tables', 'stage/sql/closing tables') @@ -276,7 +276,7 @@ prepare dump_stages_host from prepare dump_stages_global from "select event_name, count_star from performance_schema.events_stages_summary_global_by_event_name - where event_name in ('stage/sql/init', + where event_name in ('stage/sql/init', 'stage/sql/Init for update', 'stage/sql/checking permissions', 'stage/sql/Opening tables', 'stage/sql/closing tables') @@ -285,7 +285,7 @@ prepare dump_stages_global from prepare dump_stages_history from "select event_name, count(event_name) from performance_schema.events_stages_history_long - where event_name in ('stage/sql/init', + where event_name in ('stage/sql/init', 'stage/sql/Init for update', 'stage/sql/checking permissions', 'stage/sql/Opening tables', 'stage/sql/closing tables') diff --git a/mysql-test/suite/perfschema/include/start_server_common.inc b/mysql-test/suite/perfschema/include/start_server_common.inc index 41dcfd8ecb5..8cbd40c2bc1 100644 --- a/mysql-test/suite/perfschema/include/start_server_common.inc +++ b/mysql-test/suite/perfschema/include/start_server_common.inc @@ -13,6 +13,7 @@ select count(*) from performance_schema.setup_timers; # Make sure we don't crash, no matter what the starting parameters are --disable_result_log +--disable_query_log select * from performance_schema.accounts; select * from performance_schema.cond_instances; select * from performance_schema.events_stages_current; @@ -66,11 +67,7 @@ select * from performance_schema.table_lock_waits_summary_by_table; select * from performance_schema.threads; select * from performance_schema.users; --enable_result_log - -# This has a stable output, printing the result: -show variables where - `Variable_name` != "performance_schema_max_statement_classes" and - `Variable_name` like "performance_schema%"; +--enable_query_log # This has an unrepeatable output, it does depends too much on # - the platform hardware (sizeof structures, padding) diff --git a/mysql-test/suite/perfschema/include/table_aggregate_load.inc b/mysql-test/suite/perfschema/include/table_aggregate_load.inc index ae548d11627..80c622d77be 100644 --- a/mysql-test/suite/perfschema/include/table_aggregate_load.inc +++ b/mysql-test/suite/perfschema/include/table_aggregate_load.inc @@ -29,10 +29,12 @@ truncate performance_schema.events_waits_summary_global_by_event_name; truncate performance_schema.events_waits_history_long; # Check the configuration is ok -show variables where - `Variable_name` != "performance_schema_max_statement_classes" and - `Variable_name` like "performance_schema%"; -show status like "performance_schema%"; +# We don't print this as it causes too many changes in test cases if +# one variable changes value +#show variables where +# `Variable_name` != "performance_schema_max_statement_classes" and +# `Variable_name` like "performance_schema%"; +#show status like "performance_schema%"; echo "================== Step 1 =================="; call dump_thread(); @@ -493,4 +495,3 @@ execute dump_objects_summary; # On test failures, may help to track the root cause show status like "performance_schema%"; - diff --git a/mysql-test/suite/perfschema/r/event_aggregate.result b/mysql-test/suite/perfschema/r/event_aggregate.result index 1f168cee431..9ab62329fc9 100644 --- a/mysql-test/suite/perfschema/r/event_aggregate.result +++ b/mysql-test/suite/perfschema/r/event_aggregate.result @@ -32,15 +32,17 @@ execute dump_stages_user; user event_name count_star execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 0 -localhost stage/sql/closing tables 0 -localhost stage/sql/init 0 +localhost stage/sql/Checking permissions 0 +localhost stage/sql/Closing tables 0 +localhost stage/sql/Init 0 +localhost stage/sql/Init for update 0 localhost stage/sql/Opening tables 0 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 0 -stage/sql/closing tables 0 -stage/sql/init 0 +stage/sql/Checking permissions 0 +stage/sql/Closing tables 0 +stage/sql/Init 0 +stage/sql/Init for update 0 stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) @@ -115,27 +117,31 @@ event_name count(event_name) wait/io/file/sql/query_log 1 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 0 -user1 localhost stage/sql/closing tables 0 -user1 localhost stage/sql/init 0 +user1 localhost stage/sql/Checking permissions 0 +user1 localhost stage/sql/Closing tables 0 +user1 localhost stage/sql/Init 0 +user1 localhost stage/sql/Init for update 0 user1 localhost stage/sql/Opening tables 0 execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 0 -user1 stage/sql/closing tables 0 -user1 stage/sql/init 0 +user1 stage/sql/Checking permissions 0 +user1 stage/sql/Closing tables 0 +user1 stage/sql/Init 0 +user1 stage/sql/Init for update 0 user1 stage/sql/Opening tables 0 execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 0 -localhost stage/sql/closing tables 0 -localhost stage/sql/init 0 +localhost stage/sql/Checking permissions 0 +localhost stage/sql/Closing tables 0 +localhost stage/sql/Init 0 +localhost stage/sql/Init for update 0 localhost stage/sql/Opening tables 0 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 0 -stage/sql/closing tables 0 -stage/sql/init 0 +stage/sql/Checking permissions 0 +stage/sql/Closing tables 0 +stage/sql/Init 0 +stage/sql/Init for update 0 stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) @@ -228,33 +234,38 @@ wait/io/file/sql/query_log 4 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 3 -user1 localhost stage/sql/closing tables 3 -user1 localhost stage/sql/init 6 +user1 localhost stage/sql/Checking permissions 3 +user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Init 5 +user1 localhost stage/sql/Init for update 1 user1 localhost stage/sql/Opening tables 3 execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 3 -user1 stage/sql/closing tables 3 -user1 stage/sql/init 6 +user1 stage/sql/Checking permissions 3 +user1 stage/sql/Closing tables 4 +user1 stage/sql/Init 5 +user1 stage/sql/Init for update 1 user1 stage/sql/Opening tables 3 execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 3 -localhost stage/sql/closing tables 3 -localhost stage/sql/init 6 +localhost stage/sql/Checking permissions 3 +localhost stage/sql/Closing tables 4 +localhost stage/sql/Init 5 +localhost stage/sql/Init for update 1 localhost stage/sql/Opening tables 3 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 3 -stage/sql/closing tables 3 -stage/sql/init 6 +stage/sql/Checking permissions 3 +stage/sql/Closing tables 4 +stage/sql/Init 5 +stage/sql/Init for update 1 stage/sql/Opening tables 3 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 3 -stage/sql/closing tables 3 -stage/sql/init 6 +stage/sql/Checking permissions 3 +stage/sql/Closing tables 4 +stage/sql/Init 5 +stage/sql/Init for update 1 stage/sql/Opening tables 3 execute dump_statements_account; user host event_name count_star @@ -351,41 +362,48 @@ wait/io/file/sql/query_log 5 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 3 -user1 localhost stage/sql/closing tables 3 -user1 localhost stage/sql/init 6 +user1 localhost stage/sql/Checking permissions 3 +user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Init 5 +user1 localhost stage/sql/Init for update 1 user1 localhost stage/sql/Opening tables 3 -user2 localhost stage/sql/checking permissions 0 -user2 localhost stage/sql/closing tables 0 -user2 localhost stage/sql/init 0 +user2 localhost stage/sql/Checking permissions 0 +user2 localhost stage/sql/Closing tables 0 +user2 localhost stage/sql/Init 0 +user2 localhost stage/sql/Init for update 0 user2 localhost stage/sql/Opening tables 0 execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 3 -user1 stage/sql/closing tables 3 -user1 stage/sql/init 6 +user1 stage/sql/Checking permissions 3 +user1 stage/sql/Closing tables 4 +user1 stage/sql/Init 5 +user1 stage/sql/Init for update 1 user1 stage/sql/Opening tables 3 -user2 stage/sql/checking permissions 0 -user2 stage/sql/closing tables 0 -user2 stage/sql/init 0 +user2 stage/sql/Checking permissions 0 +user2 stage/sql/Closing tables 0 +user2 stage/sql/Init 0 +user2 stage/sql/Init for update 0 user2 stage/sql/Opening tables 0 execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 3 -localhost stage/sql/closing tables 3 -localhost stage/sql/init 6 +localhost stage/sql/Checking permissions 3 +localhost stage/sql/Closing tables 4 +localhost stage/sql/Init 5 +localhost stage/sql/Init for update 1 localhost stage/sql/Opening tables 3 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 3 -stage/sql/closing tables 3 -stage/sql/init 6 +stage/sql/Checking permissions 3 +stage/sql/Closing tables 4 +stage/sql/Init 5 +stage/sql/Init for update 1 stage/sql/Opening tables 3 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 3 -stage/sql/closing tables 3 -stage/sql/init 6 +stage/sql/Checking permissions 3 +stage/sql/Closing tables 4 +stage/sql/Init 5 +stage/sql/Init for update 1 stage/sql/Opening tables 3 execute dump_statements_account; user host event_name count_star @@ -499,41 +517,48 @@ wait/io/file/sql/query_log 8 wait/synch/rwlock/sql/LOCK_grant 2 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 3 -user1 localhost stage/sql/closing tables 3 -user1 localhost stage/sql/init 6 +user1 localhost stage/sql/Checking permissions 3 +user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Init 5 +user1 localhost stage/sql/Init for update 1 user1 localhost stage/sql/Opening tables 3 -user2 localhost stage/sql/checking permissions 3 -user2 localhost stage/sql/closing tables 3 -user2 localhost stage/sql/init 6 +user2 localhost stage/sql/Checking permissions 3 +user2 localhost stage/sql/Closing tables 4 +user2 localhost stage/sql/Init 5 +user2 localhost stage/sql/Init for update 1 user2 localhost stage/sql/Opening tables 3 execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 3 -user1 stage/sql/closing tables 3 -user1 stage/sql/init 6 +user1 stage/sql/Checking permissions 3 +user1 stage/sql/Closing tables 4 +user1 stage/sql/Init 5 +user1 stage/sql/Init for update 1 user1 stage/sql/Opening tables 3 -user2 stage/sql/checking permissions 3 -user2 stage/sql/closing tables 3 -user2 stage/sql/init 6 +user2 stage/sql/Checking permissions 3 +user2 stage/sql/Closing tables 4 +user2 stage/sql/Init 5 +user2 stage/sql/Init for update 1 user2 stage/sql/Opening tables 3 execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 6 -localhost stage/sql/closing tables 6 -localhost stage/sql/init 12 +localhost stage/sql/Checking permissions 6 +localhost stage/sql/Closing tables 8 +localhost stage/sql/Init 10 +localhost stage/sql/Init for update 2 localhost stage/sql/Opening tables 6 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 6 -stage/sql/closing tables 6 -stage/sql/init 12 +stage/sql/Checking permissions 6 +stage/sql/Closing tables 8 +stage/sql/Init 10 +stage/sql/Init for update 2 stage/sql/Opening tables 6 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 6 -stage/sql/closing tables 6 -stage/sql/init 12 +stage/sql/Checking permissions 6 +stage/sql/Closing tables 8 +stage/sql/Init 10 +stage/sql/Init for update 2 stage/sql/Opening tables 6 execute dump_statements_account; user host event_name count_star @@ -651,49 +676,58 @@ wait/io/file/sql/query_log 9 wait/synch/rwlock/sql/LOCK_grant 2 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 3 -user1 localhost stage/sql/closing tables 3 -user1 localhost stage/sql/init 6 +user1 localhost stage/sql/Checking permissions 3 +user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Init 5 +user1 localhost stage/sql/Init for update 1 user1 localhost stage/sql/Opening tables 3 -user2 localhost stage/sql/checking permissions 3 -user2 localhost stage/sql/closing tables 3 -user2 localhost stage/sql/init 6 +user2 localhost stage/sql/Checking permissions 3 +user2 localhost stage/sql/Closing tables 4 +user2 localhost stage/sql/Init 5 +user2 localhost stage/sql/Init for update 1 user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/checking permissions 0 -user3 localhost stage/sql/closing tables 0 -user3 localhost stage/sql/init 0 +user3 localhost stage/sql/Checking permissions 0 +user3 localhost stage/sql/Closing tables 0 +user3 localhost stage/sql/Init 0 +user3 localhost stage/sql/Init for update 0 user3 localhost stage/sql/Opening tables 0 execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 3 -user1 stage/sql/closing tables 3 -user1 stage/sql/init 6 +user1 stage/sql/Checking permissions 3 +user1 stage/sql/Closing tables 4 +user1 stage/sql/Init 5 +user1 stage/sql/Init for update 1 user1 stage/sql/Opening tables 3 -user2 stage/sql/checking permissions 3 -user2 stage/sql/closing tables 3 -user2 stage/sql/init 6 +user2 stage/sql/Checking permissions 3 +user2 stage/sql/Closing tables 4 +user2 stage/sql/Init 5 +user2 stage/sql/Init for update 1 user2 stage/sql/Opening tables 3 -user3 stage/sql/checking permissions 0 -user3 stage/sql/closing tables 0 -user3 stage/sql/init 0 +user3 stage/sql/Checking permissions 0 +user3 stage/sql/Closing tables 0 +user3 stage/sql/Init 0 +user3 stage/sql/Init for update 0 user3 stage/sql/Opening tables 0 execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 6 -localhost stage/sql/closing tables 6 -localhost stage/sql/init 12 +localhost stage/sql/Checking permissions 6 +localhost stage/sql/Closing tables 8 +localhost stage/sql/Init 10 +localhost stage/sql/Init for update 2 localhost stage/sql/Opening tables 6 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 6 -stage/sql/closing tables 6 -stage/sql/init 12 +stage/sql/Checking permissions 6 +stage/sql/Closing tables 8 +stage/sql/Init 10 +stage/sql/Init for update 2 stage/sql/Opening tables 6 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 6 -stage/sql/closing tables 6 -stage/sql/init 12 +stage/sql/Checking permissions 6 +stage/sql/Closing tables 8 +stage/sql/Init 10 +stage/sql/Init for update 2 stage/sql/Opening tables 6 execute dump_statements_account; user host event_name count_star @@ -828,49 +862,58 @@ wait/io/file/sql/query_log 12 wait/synch/rwlock/sql/LOCK_grant 3 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 3 -user1 localhost stage/sql/closing tables 3 -user1 localhost stage/sql/init 6 +user1 localhost stage/sql/Checking permissions 3 +user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Init 5 +user1 localhost stage/sql/Init for update 1 user1 localhost stage/sql/Opening tables 3 -user2 localhost stage/sql/checking permissions 3 -user2 localhost stage/sql/closing tables 3 -user2 localhost stage/sql/init 6 +user2 localhost stage/sql/Checking permissions 3 +user2 localhost stage/sql/Closing tables 4 +user2 localhost stage/sql/Init 5 +user2 localhost stage/sql/Init for update 1 user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/checking permissions 3 -user3 localhost stage/sql/closing tables 3 -user3 localhost stage/sql/init 6 +user3 localhost stage/sql/Checking permissions 3 +user3 localhost stage/sql/Closing tables 4 +user3 localhost stage/sql/Init 5 +user3 localhost stage/sql/Init for update 1 user3 localhost stage/sql/Opening tables 3 execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 3 -user1 stage/sql/closing tables 3 -user1 stage/sql/init 6 +user1 stage/sql/Checking permissions 3 +user1 stage/sql/Closing tables 4 +user1 stage/sql/Init 5 +user1 stage/sql/Init for update 1 user1 stage/sql/Opening tables 3 -user2 stage/sql/checking permissions 3 -user2 stage/sql/closing tables 3 -user2 stage/sql/init 6 +user2 stage/sql/Checking permissions 3 +user2 stage/sql/Closing tables 4 +user2 stage/sql/Init 5 +user2 stage/sql/Init for update 1 user2 stage/sql/Opening tables 3 -user3 stage/sql/checking permissions 3 -user3 stage/sql/closing tables 3 -user3 stage/sql/init 6 +user3 stage/sql/Checking permissions 3 +user3 stage/sql/Closing tables 4 +user3 stage/sql/Init 5 +user3 stage/sql/Init for update 1 user3 stage/sql/Opening tables 3 execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 9 -localhost stage/sql/closing tables 9 -localhost stage/sql/init 18 +localhost stage/sql/Checking permissions 9 +localhost stage/sql/Closing tables 12 +localhost stage/sql/Init 15 +localhost stage/sql/Init for update 3 localhost stage/sql/Opening tables 9 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 9 -stage/sql/closing tables 9 -stage/sql/init 18 +stage/sql/Checking permissions 9 +stage/sql/Closing tables 12 +stage/sql/Init 15 +stage/sql/Init for update 3 stage/sql/Opening tables 9 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 9 -stage/sql/closing tables 9 -stage/sql/init 18 +stage/sql/Checking permissions 9 +stage/sql/Closing tables 12 +stage/sql/Init 15 +stage/sql/Init for update 3 stage/sql/Opening tables 9 execute dump_statements_account; user host event_name count_star @@ -1009,57 +1052,68 @@ wait/io/file/sql/query_log 13 wait/synch/rwlock/sql/LOCK_grant 3 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 3 -user1 localhost stage/sql/closing tables 3 -user1 localhost stage/sql/init 6 +user1 localhost stage/sql/Checking permissions 3 +user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Init 5 +user1 localhost stage/sql/Init for update 1 user1 localhost stage/sql/Opening tables 3 -user2 localhost stage/sql/checking permissions 3 -user2 localhost stage/sql/closing tables 3 -user2 localhost stage/sql/init 6 +user2 localhost stage/sql/Checking permissions 3 +user2 localhost stage/sql/Closing tables 4 +user2 localhost stage/sql/Init 5 +user2 localhost stage/sql/Init for update 1 user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/checking permissions 3 -user3 localhost stage/sql/closing tables 3 -user3 localhost stage/sql/init 6 +user3 localhost stage/sql/Checking permissions 3 +user3 localhost stage/sql/Closing tables 4 +user3 localhost stage/sql/Init 5 +user3 localhost stage/sql/Init for update 1 user3 localhost stage/sql/Opening tables 3 -user4 localhost stage/sql/checking permissions 0 -user4 localhost stage/sql/closing tables 0 -user4 localhost stage/sql/init 0 +user4 localhost stage/sql/Checking permissions 0 +user4 localhost stage/sql/Closing tables 0 +user4 localhost stage/sql/Init 0 +user4 localhost stage/sql/Init for update 0 user4 localhost stage/sql/Opening tables 0 execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 3 -user1 stage/sql/closing tables 3 -user1 stage/sql/init 6 +user1 stage/sql/Checking permissions 3 +user1 stage/sql/Closing tables 4 +user1 stage/sql/Init 5 +user1 stage/sql/Init for update 1 user1 stage/sql/Opening tables 3 -user2 stage/sql/checking permissions 3 -user2 stage/sql/closing tables 3 -user2 stage/sql/init 6 +user2 stage/sql/Checking permissions 3 +user2 stage/sql/Closing tables 4 +user2 stage/sql/Init 5 +user2 stage/sql/Init for update 1 user2 stage/sql/Opening tables 3 -user3 stage/sql/checking permissions 3 -user3 stage/sql/closing tables 3 -user3 stage/sql/init 6 +user3 stage/sql/Checking permissions 3 +user3 stage/sql/Closing tables 4 +user3 stage/sql/Init 5 +user3 stage/sql/Init for update 1 user3 stage/sql/Opening tables 3 -user4 stage/sql/checking permissions 0 -user4 stage/sql/closing tables 0 -user4 stage/sql/init 0 +user4 stage/sql/Checking permissions 0 +user4 stage/sql/Closing tables 0 +user4 stage/sql/Init 0 +user4 stage/sql/Init for update 0 user4 stage/sql/Opening tables 0 execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 9 -localhost stage/sql/closing tables 9 -localhost stage/sql/init 18 +localhost stage/sql/Checking permissions 9 +localhost stage/sql/Closing tables 12 +localhost stage/sql/Init 15 +localhost stage/sql/Init for update 3 localhost stage/sql/Opening tables 9 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 9 -stage/sql/closing tables 9 -stage/sql/init 18 +stage/sql/Checking permissions 9 +stage/sql/Closing tables 12 +stage/sql/Init 15 +stage/sql/Init for update 3 stage/sql/Opening tables 9 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 9 -stage/sql/closing tables 9 -stage/sql/init 18 +stage/sql/Checking permissions 9 +stage/sql/Closing tables 12 +stage/sql/Init 15 +stage/sql/Init for update 3 stage/sql/Opening tables 9 execute dump_statements_account; user host event_name count_star @@ -1215,57 +1269,68 @@ wait/io/file/sql/query_log 16 wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 3 -user1 localhost stage/sql/closing tables 3 -user1 localhost stage/sql/init 6 +user1 localhost stage/sql/Checking permissions 3 +user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Init 5 +user1 localhost stage/sql/Init for update 1 user1 localhost stage/sql/Opening tables 3 -user2 localhost stage/sql/checking permissions 3 -user2 localhost stage/sql/closing tables 3 -user2 localhost stage/sql/init 6 +user2 localhost stage/sql/Checking permissions 3 +user2 localhost stage/sql/Closing tables 4 +user2 localhost stage/sql/Init 5 +user2 localhost stage/sql/Init for update 1 user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/checking permissions 3 -user3 localhost stage/sql/closing tables 3 -user3 localhost stage/sql/init 6 +user3 localhost stage/sql/Checking permissions 3 +user3 localhost stage/sql/Closing tables 4 +user3 localhost stage/sql/Init 5 +user3 localhost stage/sql/Init for update 1 user3 localhost stage/sql/Opening tables 3 -user4 localhost stage/sql/checking permissions 3 -user4 localhost stage/sql/closing tables 3 -user4 localhost stage/sql/init 6 +user4 localhost stage/sql/Checking permissions 3 +user4 localhost stage/sql/Closing tables 4 +user4 localhost stage/sql/Init 5 +user4 localhost stage/sql/Init for update 1 user4 localhost stage/sql/Opening tables 3 execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 3 -user1 stage/sql/closing tables 3 -user1 stage/sql/init 6 +user1 stage/sql/Checking permissions 3 +user1 stage/sql/Closing tables 4 +user1 stage/sql/Init 5 +user1 stage/sql/Init for update 1 user1 stage/sql/Opening tables 3 -user2 stage/sql/checking permissions 3 -user2 stage/sql/closing tables 3 -user2 stage/sql/init 6 +user2 stage/sql/Checking permissions 3 +user2 stage/sql/Closing tables 4 +user2 stage/sql/Init 5 +user2 stage/sql/Init for update 1 user2 stage/sql/Opening tables 3 -user3 stage/sql/checking permissions 3 -user3 stage/sql/closing tables 3 -user3 stage/sql/init 6 +user3 stage/sql/Checking permissions 3 +user3 stage/sql/Closing tables 4 +user3 stage/sql/Init 5 +user3 stage/sql/Init for update 1 user3 stage/sql/Opening tables 3 -user4 stage/sql/checking permissions 3 -user4 stage/sql/closing tables 3 -user4 stage/sql/init 6 +user4 stage/sql/Checking permissions 3 +user4 stage/sql/Closing tables 4 +user4 stage/sql/Init 5 +user4 stage/sql/Init for update 1 user4 stage/sql/Opening tables 3 execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 12 -localhost stage/sql/closing tables 12 -localhost stage/sql/init 24 +localhost stage/sql/Checking permissions 12 +localhost stage/sql/Closing tables 16 +localhost stage/sql/Init 20 +localhost stage/sql/Init for update 4 localhost stage/sql/Opening tables 12 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 24 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 20 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 24 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 20 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -1412,57 +1477,68 @@ wait/synch/mutex/sql/LOCK_connection_count 1 wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 3 -user1 localhost stage/sql/closing tables 3 -user1 localhost stage/sql/init 7 +user1 localhost stage/sql/Checking permissions 3 +user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Init 6 +user1 localhost stage/sql/Init for update 1 user1 localhost stage/sql/Opening tables 3 -user2 localhost stage/sql/checking permissions 3 -user2 localhost stage/sql/closing tables 3 -user2 localhost stage/sql/init 6 +user2 localhost stage/sql/Checking permissions 3 +user2 localhost stage/sql/Closing tables 4 +user2 localhost stage/sql/Init 5 +user2 localhost stage/sql/Init for update 1 user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/checking permissions 3 -user3 localhost stage/sql/closing tables 3 -user3 localhost stage/sql/init 6 +user3 localhost stage/sql/Checking permissions 3 +user3 localhost stage/sql/Closing tables 4 +user3 localhost stage/sql/Init 5 +user3 localhost stage/sql/Init for update 1 user3 localhost stage/sql/Opening tables 3 -user4 localhost stage/sql/checking permissions 3 -user4 localhost stage/sql/closing tables 3 -user4 localhost stage/sql/init 6 +user4 localhost stage/sql/Checking permissions 3 +user4 localhost stage/sql/Closing tables 4 +user4 localhost stage/sql/Init 5 +user4 localhost stage/sql/Init for update 1 user4 localhost stage/sql/Opening tables 3 execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 3 -user1 stage/sql/closing tables 3 -user1 stage/sql/init 7 +user1 stage/sql/Checking permissions 3 +user1 stage/sql/Closing tables 4 +user1 stage/sql/Init 6 +user1 stage/sql/Init for update 1 user1 stage/sql/Opening tables 3 -user2 stage/sql/checking permissions 3 -user2 stage/sql/closing tables 3 -user2 stage/sql/init 6 +user2 stage/sql/Checking permissions 3 +user2 stage/sql/Closing tables 4 +user2 stage/sql/Init 5 +user2 stage/sql/Init for update 1 user2 stage/sql/Opening tables 3 -user3 stage/sql/checking permissions 3 -user3 stage/sql/closing tables 3 -user3 stage/sql/init 6 +user3 stage/sql/Checking permissions 3 +user3 stage/sql/Closing tables 4 +user3 stage/sql/Init 5 +user3 stage/sql/Init for update 1 user3 stage/sql/Opening tables 3 -user4 stage/sql/checking permissions 3 -user4 stage/sql/closing tables 3 -user4 stage/sql/init 6 +user4 stage/sql/Checking permissions 3 +user4 stage/sql/Closing tables 4 +user4 stage/sql/Init 5 +user4 stage/sql/Init for update 1 user4 stage/sql/Opening tables 3 execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 12 -localhost stage/sql/closing tables 12 -localhost stage/sql/init 25 +localhost stage/sql/Checking permissions 12 +localhost stage/sql/Closing tables 16 +localhost stage/sql/Init 21 +localhost stage/sql/Init for update 4 localhost stage/sql/Opening tables 12 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 25 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 21 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 25 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 21 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -1607,57 +1683,68 @@ wait/synch/mutex/sql/LOCK_connection_count 2 wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 3 -user1 localhost stage/sql/closing tables 3 -user1 localhost stage/sql/init 7 +user1 localhost stage/sql/Checking permissions 3 +user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Init 6 +user1 localhost stage/sql/Init for update 1 user1 localhost stage/sql/Opening tables 3 -user2 localhost stage/sql/checking permissions 3 -user2 localhost stage/sql/closing tables 3 -user2 localhost stage/sql/init 7 +user2 localhost stage/sql/Checking permissions 3 +user2 localhost stage/sql/Closing tables 4 +user2 localhost stage/sql/Init 6 +user2 localhost stage/sql/Init for update 1 user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/checking permissions 3 -user3 localhost stage/sql/closing tables 3 -user3 localhost stage/sql/init 6 +user3 localhost stage/sql/Checking permissions 3 +user3 localhost stage/sql/Closing tables 4 +user3 localhost stage/sql/Init 5 +user3 localhost stage/sql/Init for update 1 user3 localhost stage/sql/Opening tables 3 -user4 localhost stage/sql/checking permissions 3 -user4 localhost stage/sql/closing tables 3 -user4 localhost stage/sql/init 6 +user4 localhost stage/sql/Checking permissions 3 +user4 localhost stage/sql/Closing tables 4 +user4 localhost stage/sql/Init 5 +user4 localhost stage/sql/Init for update 1 user4 localhost stage/sql/Opening tables 3 execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 3 -user1 stage/sql/closing tables 3 -user1 stage/sql/init 7 +user1 stage/sql/Checking permissions 3 +user1 stage/sql/Closing tables 4 +user1 stage/sql/Init 6 +user1 stage/sql/Init for update 1 user1 stage/sql/Opening tables 3 -user2 stage/sql/checking permissions 3 -user2 stage/sql/closing tables 3 -user2 stage/sql/init 7 +user2 stage/sql/Checking permissions 3 +user2 stage/sql/Closing tables 4 +user2 stage/sql/Init 6 +user2 stage/sql/Init for update 1 user2 stage/sql/Opening tables 3 -user3 stage/sql/checking permissions 3 -user3 stage/sql/closing tables 3 -user3 stage/sql/init 6 +user3 stage/sql/Checking permissions 3 +user3 stage/sql/Closing tables 4 +user3 stage/sql/Init 5 +user3 stage/sql/Init for update 1 user3 stage/sql/Opening tables 3 -user4 stage/sql/checking permissions 3 -user4 stage/sql/closing tables 3 -user4 stage/sql/init 6 +user4 stage/sql/Checking permissions 3 +user4 stage/sql/Closing tables 4 +user4 stage/sql/Init 5 +user4 stage/sql/Init for update 1 user4 stage/sql/Opening tables 3 execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 12 -localhost stage/sql/closing tables 12 -localhost stage/sql/init 26 +localhost stage/sql/Checking permissions 12 +localhost stage/sql/Closing tables 16 +localhost stage/sql/Init 22 +localhost stage/sql/Init for update 4 localhost stage/sql/Opening tables 12 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 26 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 22 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 26 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 22 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -1799,57 +1886,68 @@ wait/synch/mutex/sql/LOCK_connection_count 3 wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 3 -user1 localhost stage/sql/closing tables 3 -user1 localhost stage/sql/init 7 +user1 localhost stage/sql/Checking permissions 3 +user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Init 6 +user1 localhost stage/sql/Init for update 1 user1 localhost stage/sql/Opening tables 3 -user2 localhost stage/sql/checking permissions 3 -user2 localhost stage/sql/closing tables 3 -user2 localhost stage/sql/init 7 +user2 localhost stage/sql/Checking permissions 3 +user2 localhost stage/sql/Closing tables 4 +user2 localhost stage/sql/Init 6 +user2 localhost stage/sql/Init for update 1 user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/checking permissions 3 -user3 localhost stage/sql/closing tables 3 -user3 localhost stage/sql/init 7 +user3 localhost stage/sql/Checking permissions 3 +user3 localhost stage/sql/Closing tables 4 +user3 localhost stage/sql/Init 6 +user3 localhost stage/sql/Init for update 1 user3 localhost stage/sql/Opening tables 3 -user4 localhost stage/sql/checking permissions 3 -user4 localhost stage/sql/closing tables 3 -user4 localhost stage/sql/init 6 +user4 localhost stage/sql/Checking permissions 3 +user4 localhost stage/sql/Closing tables 4 +user4 localhost stage/sql/Init 5 +user4 localhost stage/sql/Init for update 1 user4 localhost stage/sql/Opening tables 3 execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 3 -user1 stage/sql/closing tables 3 -user1 stage/sql/init 7 +user1 stage/sql/Checking permissions 3 +user1 stage/sql/Closing tables 4 +user1 stage/sql/Init 6 +user1 stage/sql/Init for update 1 user1 stage/sql/Opening tables 3 -user2 stage/sql/checking permissions 3 -user2 stage/sql/closing tables 3 -user2 stage/sql/init 7 +user2 stage/sql/Checking permissions 3 +user2 stage/sql/Closing tables 4 +user2 stage/sql/Init 6 +user2 stage/sql/Init for update 1 user2 stage/sql/Opening tables 3 -user3 stage/sql/checking permissions 3 -user3 stage/sql/closing tables 3 -user3 stage/sql/init 7 +user3 stage/sql/Checking permissions 3 +user3 stage/sql/Closing tables 4 +user3 stage/sql/Init 6 +user3 stage/sql/Init for update 1 user3 stage/sql/Opening tables 3 -user4 stage/sql/checking permissions 3 -user4 stage/sql/closing tables 3 -user4 stage/sql/init 6 +user4 stage/sql/Checking permissions 3 +user4 stage/sql/Closing tables 4 +user4 stage/sql/Init 5 +user4 stage/sql/Init for update 1 user4 stage/sql/Opening tables 3 execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 12 -localhost stage/sql/closing tables 12 -localhost stage/sql/init 27 +localhost stage/sql/Checking permissions 12 +localhost stage/sql/Closing tables 16 +localhost stage/sql/Init 23 +localhost stage/sql/Init for update 4 localhost stage/sql/Opening tables 12 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 27 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 23 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 27 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 23 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -1988,57 +2086,68 @@ wait/synch/mutex/sql/LOCK_connection_count 4 wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 3 -user1 localhost stage/sql/closing tables 3 -user1 localhost stage/sql/init 7 +user1 localhost stage/sql/Checking permissions 3 +user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Init 6 +user1 localhost stage/sql/Init for update 1 user1 localhost stage/sql/Opening tables 3 -user2 localhost stage/sql/checking permissions 3 -user2 localhost stage/sql/closing tables 3 -user2 localhost stage/sql/init 7 +user2 localhost stage/sql/Checking permissions 3 +user2 localhost stage/sql/Closing tables 4 +user2 localhost stage/sql/Init 6 +user2 localhost stage/sql/Init for update 1 user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/checking permissions 3 -user3 localhost stage/sql/closing tables 3 -user3 localhost stage/sql/init 7 +user3 localhost stage/sql/Checking permissions 3 +user3 localhost stage/sql/Closing tables 4 +user3 localhost stage/sql/Init 6 +user3 localhost stage/sql/Init for update 1 user3 localhost stage/sql/Opening tables 3 -user4 localhost stage/sql/checking permissions 3 -user4 localhost stage/sql/closing tables 3 -user4 localhost stage/sql/init 7 +user4 localhost stage/sql/Checking permissions 3 +user4 localhost stage/sql/Closing tables 4 +user4 localhost stage/sql/Init 6 +user4 localhost stage/sql/Init for update 1 user4 localhost stage/sql/Opening tables 3 execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 3 -user1 stage/sql/closing tables 3 -user1 stage/sql/init 7 +user1 stage/sql/Checking permissions 3 +user1 stage/sql/Closing tables 4 +user1 stage/sql/Init 6 +user1 stage/sql/Init for update 1 user1 stage/sql/Opening tables 3 -user2 stage/sql/checking permissions 3 -user2 stage/sql/closing tables 3 -user2 stage/sql/init 7 +user2 stage/sql/Checking permissions 3 +user2 stage/sql/Closing tables 4 +user2 stage/sql/Init 6 +user2 stage/sql/Init for update 1 user2 stage/sql/Opening tables 3 -user3 stage/sql/checking permissions 3 -user3 stage/sql/closing tables 3 -user3 stage/sql/init 7 +user3 stage/sql/Checking permissions 3 +user3 stage/sql/Closing tables 4 +user3 stage/sql/Init 6 +user3 stage/sql/Init for update 1 user3 stage/sql/Opening tables 3 -user4 stage/sql/checking permissions 3 -user4 stage/sql/closing tables 3 -user4 stage/sql/init 7 +user4 stage/sql/Checking permissions 3 +user4 stage/sql/Closing tables 4 +user4 stage/sql/Init 6 +user4 stage/sql/Init for update 1 user4 stage/sql/Opening tables 3 execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 12 -localhost stage/sql/closing tables 12 -localhost stage/sql/init 28 +localhost stage/sql/Checking permissions 12 +localhost stage/sql/Closing tables 16 +localhost stage/sql/Init 24 +localhost stage/sql/Init for update 4 localhost stage/sql/Opening tables 12 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -2178,57 +2287,68 @@ wait/synch/mutex/sql/LOCK_connection_count 4 wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 3 -user1 localhost stage/sql/closing tables 3 -user1 localhost stage/sql/init 7 +user1 localhost stage/sql/Checking permissions 3 +user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Init 6 +user1 localhost stage/sql/Init for update 1 user1 localhost stage/sql/Opening tables 3 -user2 localhost stage/sql/checking permissions 3 -user2 localhost stage/sql/closing tables 3 -user2 localhost stage/sql/init 7 +user2 localhost stage/sql/Checking permissions 3 +user2 localhost stage/sql/Closing tables 4 +user2 localhost stage/sql/Init 6 +user2 localhost stage/sql/Init for update 1 user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/checking permissions 3 -user3 localhost stage/sql/closing tables 3 -user3 localhost stage/sql/init 7 +user3 localhost stage/sql/Checking permissions 3 +user3 localhost stage/sql/Closing tables 4 +user3 localhost stage/sql/Init 6 +user3 localhost stage/sql/Init for update 1 user3 localhost stage/sql/Opening tables 3 -user4 localhost stage/sql/checking permissions 3 -user4 localhost stage/sql/closing tables 3 -user4 localhost stage/sql/init 7 +user4 localhost stage/sql/Checking permissions 3 +user4 localhost stage/sql/Closing tables 4 +user4 localhost stage/sql/Init 6 +user4 localhost stage/sql/Init for update 1 user4 localhost stage/sql/Opening tables 3 execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 3 -user1 stage/sql/closing tables 3 -user1 stage/sql/init 7 +user1 stage/sql/Checking permissions 3 +user1 stage/sql/Closing tables 4 +user1 stage/sql/Init 6 +user1 stage/sql/Init for update 1 user1 stage/sql/Opening tables 3 -user2 stage/sql/checking permissions 3 -user2 stage/sql/closing tables 3 -user2 stage/sql/init 7 +user2 stage/sql/Checking permissions 3 +user2 stage/sql/Closing tables 4 +user2 stage/sql/Init 6 +user2 stage/sql/Init for update 1 user2 stage/sql/Opening tables 3 -user3 stage/sql/checking permissions 3 -user3 stage/sql/closing tables 3 -user3 stage/sql/init 7 +user3 stage/sql/Checking permissions 3 +user3 stage/sql/Closing tables 4 +user3 stage/sql/Init 6 +user3 stage/sql/Init for update 1 user3 stage/sql/Opening tables 3 -user4 stage/sql/checking permissions 3 -user4 stage/sql/closing tables 3 -user4 stage/sql/init 7 +user4 stage/sql/Checking permissions 3 +user4 stage/sql/Closing tables 4 +user4 stage/sql/Init 6 +user4 stage/sql/Init for update 1 user4 stage/sql/Opening tables 3 execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 12 -localhost stage/sql/closing tables 12 -localhost stage/sql/init 28 +localhost stage/sql/Checking permissions 12 +localhost stage/sql/Closing tables 16 +localhost stage/sql/Init 24 +localhost stage/sql/Init for update 4 localhost stage/sql/Opening tables 12 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -2367,57 +2487,68 @@ wait/synch/mutex/sql/LOCK_connection_count 4 wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 3 -user1 localhost stage/sql/closing tables 3 -user1 localhost stage/sql/init 7 +user1 localhost stage/sql/Checking permissions 3 +user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Init 6 +user1 localhost stage/sql/Init for update 1 user1 localhost stage/sql/Opening tables 3 -user2 localhost stage/sql/checking permissions 3 -user2 localhost stage/sql/closing tables 3 -user2 localhost stage/sql/init 7 +user2 localhost stage/sql/Checking permissions 3 +user2 localhost stage/sql/Closing tables 4 +user2 localhost stage/sql/Init 6 +user2 localhost stage/sql/Init for update 1 user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/checking permissions 3 -user3 localhost stage/sql/closing tables 3 -user3 localhost stage/sql/init 7 +user3 localhost stage/sql/Checking permissions 3 +user3 localhost stage/sql/Closing tables 4 +user3 localhost stage/sql/Init 6 +user3 localhost stage/sql/Init for update 1 user3 localhost stage/sql/Opening tables 3 -user4 localhost stage/sql/checking permissions 3 -user4 localhost stage/sql/closing tables 3 -user4 localhost stage/sql/init 7 +user4 localhost stage/sql/Checking permissions 3 +user4 localhost stage/sql/Closing tables 4 +user4 localhost stage/sql/Init 6 +user4 localhost stage/sql/Init for update 1 user4 localhost stage/sql/Opening tables 3 execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 3 -user1 stage/sql/closing tables 3 -user1 stage/sql/init 7 +user1 stage/sql/Checking permissions 3 +user1 stage/sql/Closing tables 4 +user1 stage/sql/Init 6 +user1 stage/sql/Init for update 1 user1 stage/sql/Opening tables 3 -user2 stage/sql/checking permissions 3 -user2 stage/sql/closing tables 3 -user2 stage/sql/init 7 +user2 stage/sql/Checking permissions 3 +user2 stage/sql/Closing tables 4 +user2 stage/sql/Init 6 +user2 stage/sql/Init for update 1 user2 stage/sql/Opening tables 3 -user3 stage/sql/checking permissions 3 -user3 stage/sql/closing tables 3 -user3 stage/sql/init 7 +user3 stage/sql/Checking permissions 3 +user3 stage/sql/Closing tables 4 +user3 stage/sql/Init 6 +user3 stage/sql/Init for update 1 user3 stage/sql/Opening tables 3 -user4 stage/sql/checking permissions 3 -user4 stage/sql/closing tables 3 -user4 stage/sql/init 7 +user4 stage/sql/Checking permissions 3 +user4 stage/sql/Closing tables 4 +user4 stage/sql/Init 6 +user4 stage/sql/Init for update 1 user4 stage/sql/Opening tables 3 execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 12 -localhost stage/sql/closing tables 12 -localhost stage/sql/init 28 +localhost stage/sql/Checking permissions 12 +localhost stage/sql/Closing tables 16 +localhost stage/sql/Init 24 +localhost stage/sql/Init for update 4 localhost stage/sql/Opening tables 12 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -2556,57 +2687,68 @@ wait/synch/mutex/sql/LOCK_connection_count 4 wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 3 -user1 localhost stage/sql/closing tables 3 -user1 localhost stage/sql/init 7 +user1 localhost stage/sql/Checking permissions 3 +user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Init 6 +user1 localhost stage/sql/Init for update 1 user1 localhost stage/sql/Opening tables 3 -user2 localhost stage/sql/checking permissions 3 -user2 localhost stage/sql/closing tables 3 -user2 localhost stage/sql/init 7 +user2 localhost stage/sql/Checking permissions 3 +user2 localhost stage/sql/Closing tables 4 +user2 localhost stage/sql/Init 6 +user2 localhost stage/sql/Init for update 1 user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/checking permissions 3 -user3 localhost stage/sql/closing tables 3 -user3 localhost stage/sql/init 7 +user3 localhost stage/sql/Checking permissions 3 +user3 localhost stage/sql/Closing tables 4 +user3 localhost stage/sql/Init 6 +user3 localhost stage/sql/Init for update 1 user3 localhost stage/sql/Opening tables 3 -user4 localhost stage/sql/checking permissions 3 -user4 localhost stage/sql/closing tables 3 -user4 localhost stage/sql/init 7 +user4 localhost stage/sql/Checking permissions 3 +user4 localhost stage/sql/Closing tables 4 +user4 localhost stage/sql/Init 6 +user4 localhost stage/sql/Init for update 1 user4 localhost stage/sql/Opening tables 3 execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 3 -user1 stage/sql/closing tables 3 -user1 stage/sql/init 7 +user1 stage/sql/Checking permissions 3 +user1 stage/sql/Closing tables 4 +user1 stage/sql/Init 6 +user1 stage/sql/Init for update 1 user1 stage/sql/Opening tables 3 -user2 stage/sql/checking permissions 3 -user2 stage/sql/closing tables 3 -user2 stage/sql/init 7 +user2 stage/sql/Checking permissions 3 +user2 stage/sql/Closing tables 4 +user2 stage/sql/Init 6 +user2 stage/sql/Init for update 1 user2 stage/sql/Opening tables 3 -user3 stage/sql/checking permissions 3 -user3 stage/sql/closing tables 3 -user3 stage/sql/init 7 +user3 stage/sql/Checking permissions 3 +user3 stage/sql/Closing tables 4 +user3 stage/sql/Init 6 +user3 stage/sql/Init for update 1 user3 stage/sql/Opening tables 3 -user4 stage/sql/checking permissions 3 -user4 stage/sql/closing tables 3 -user4 stage/sql/init 7 +user4 stage/sql/Checking permissions 3 +user4 stage/sql/Closing tables 4 +user4 stage/sql/Init 6 +user4 stage/sql/Init for update 1 user4 stage/sql/Opening tables 3 execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 12 -localhost stage/sql/closing tables 12 -localhost stage/sql/init 28 +localhost stage/sql/Checking permissions 12 +localhost stage/sql/Closing tables 16 +localhost stage/sql/Init 24 +localhost stage/sql/Init for update 4 localhost stage/sql/Opening tables 12 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -2745,57 +2887,68 @@ wait/synch/mutex/sql/LOCK_connection_count 4 wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 3 -user1 localhost stage/sql/closing tables 3 -user1 localhost stage/sql/init 7 +user1 localhost stage/sql/Checking permissions 3 +user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Init 6 +user1 localhost stage/sql/Init for update 1 user1 localhost stage/sql/Opening tables 3 -user2 localhost stage/sql/checking permissions 3 -user2 localhost stage/sql/closing tables 3 -user2 localhost stage/sql/init 7 +user2 localhost stage/sql/Checking permissions 3 +user2 localhost stage/sql/Closing tables 4 +user2 localhost stage/sql/Init 6 +user2 localhost stage/sql/Init for update 1 user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/checking permissions 3 -user3 localhost stage/sql/closing tables 3 -user3 localhost stage/sql/init 7 +user3 localhost stage/sql/Checking permissions 3 +user3 localhost stage/sql/Closing tables 4 +user3 localhost stage/sql/Init 6 +user3 localhost stage/sql/Init for update 1 user3 localhost stage/sql/Opening tables 3 -user4 localhost stage/sql/checking permissions 3 -user4 localhost stage/sql/closing tables 3 -user4 localhost stage/sql/init 7 +user4 localhost stage/sql/Checking permissions 3 +user4 localhost stage/sql/Closing tables 4 +user4 localhost stage/sql/Init 6 +user4 localhost stage/sql/Init for update 1 user4 localhost stage/sql/Opening tables 3 execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 3 -user1 stage/sql/closing tables 3 -user1 stage/sql/init 7 +user1 stage/sql/Checking permissions 3 +user1 stage/sql/Closing tables 4 +user1 stage/sql/Init 6 +user1 stage/sql/Init for update 1 user1 stage/sql/Opening tables 3 -user2 stage/sql/checking permissions 3 -user2 stage/sql/closing tables 3 -user2 stage/sql/init 7 +user2 stage/sql/Checking permissions 3 +user2 stage/sql/Closing tables 4 +user2 stage/sql/Init 6 +user2 stage/sql/Init for update 1 user2 stage/sql/Opening tables 3 -user3 stage/sql/checking permissions 3 -user3 stage/sql/closing tables 3 -user3 stage/sql/init 7 +user3 stage/sql/Checking permissions 3 +user3 stage/sql/Closing tables 4 +user3 stage/sql/Init 6 +user3 stage/sql/Init for update 1 user3 stage/sql/Opening tables 3 -user4 stage/sql/checking permissions 3 -user4 stage/sql/closing tables 3 -user4 stage/sql/init 7 +user4 stage/sql/Checking permissions 3 +user4 stage/sql/Closing tables 4 +user4 stage/sql/Init 6 +user4 stage/sql/Init for update 1 user4 stage/sql/Opening tables 3 execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 12 -localhost stage/sql/closing tables 12 -localhost stage/sql/init 28 +localhost stage/sql/Checking permissions 12 +localhost stage/sql/Closing tables 16 +localhost stage/sql/Init 24 +localhost stage/sql/Init for update 4 localhost stage/sql/Opening tables 12 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -2934,57 +3087,68 @@ wait/synch/mutex/sql/LOCK_connection_count 4 wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 3 -user1 localhost stage/sql/closing tables 3 -user1 localhost stage/sql/init 7 +user1 localhost stage/sql/Checking permissions 3 +user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Init 6 +user1 localhost stage/sql/Init for update 1 user1 localhost stage/sql/Opening tables 3 -user2 localhost stage/sql/checking permissions 3 -user2 localhost stage/sql/closing tables 3 -user2 localhost stage/sql/init 7 +user2 localhost stage/sql/Checking permissions 3 +user2 localhost stage/sql/Closing tables 4 +user2 localhost stage/sql/Init 6 +user2 localhost stage/sql/Init for update 1 user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/checking permissions 3 -user3 localhost stage/sql/closing tables 3 -user3 localhost stage/sql/init 7 +user3 localhost stage/sql/Checking permissions 3 +user3 localhost stage/sql/Closing tables 4 +user3 localhost stage/sql/Init 6 +user3 localhost stage/sql/Init for update 1 user3 localhost stage/sql/Opening tables 3 -user4 localhost stage/sql/checking permissions 3 -user4 localhost stage/sql/closing tables 3 -user4 localhost stage/sql/init 7 +user4 localhost stage/sql/Checking permissions 3 +user4 localhost stage/sql/Closing tables 4 +user4 localhost stage/sql/Init 6 +user4 localhost stage/sql/Init for update 1 user4 localhost stage/sql/Opening tables 3 execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 3 -user1 stage/sql/closing tables 3 -user1 stage/sql/init 7 +user1 stage/sql/Checking permissions 3 +user1 stage/sql/Closing tables 4 +user1 stage/sql/Init 6 +user1 stage/sql/Init for update 1 user1 stage/sql/Opening tables 3 -user2 stage/sql/checking permissions 3 -user2 stage/sql/closing tables 3 -user2 stage/sql/init 7 +user2 stage/sql/Checking permissions 3 +user2 stage/sql/Closing tables 4 +user2 stage/sql/Init 6 +user2 stage/sql/Init for update 1 user2 stage/sql/Opening tables 3 -user3 stage/sql/checking permissions 3 -user3 stage/sql/closing tables 3 -user3 stage/sql/init 7 +user3 stage/sql/Checking permissions 3 +user3 stage/sql/Closing tables 4 +user3 stage/sql/Init 6 +user3 stage/sql/Init for update 1 user3 stage/sql/Opening tables 3 -user4 stage/sql/checking permissions 3 -user4 stage/sql/closing tables 3 -user4 stage/sql/init 7 +user4 stage/sql/Checking permissions 3 +user4 stage/sql/Closing tables 4 +user4 stage/sql/Init 6 +user4 stage/sql/Init for update 1 user4 stage/sql/Opening tables 3 execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 12 -localhost stage/sql/closing tables 12 -localhost stage/sql/init 28 +localhost stage/sql/Checking permissions 12 +localhost stage/sql/Closing tables 16 +localhost stage/sql/Init 24 +localhost stage/sql/Init for update 4 localhost stage/sql/Opening tables 12 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -3123,57 +3287,68 @@ wait/synch/mutex/sql/LOCK_connection_count 4 wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 3 -user1 localhost stage/sql/closing tables 3 -user1 localhost stage/sql/init 7 +user1 localhost stage/sql/Checking permissions 3 +user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Init 6 +user1 localhost stage/sql/Init for update 1 user1 localhost stage/sql/Opening tables 3 -user2 localhost stage/sql/checking permissions 3 -user2 localhost stage/sql/closing tables 3 -user2 localhost stage/sql/init 7 +user2 localhost stage/sql/Checking permissions 3 +user2 localhost stage/sql/Closing tables 4 +user2 localhost stage/sql/Init 6 +user2 localhost stage/sql/Init for update 1 user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/checking permissions 3 -user3 localhost stage/sql/closing tables 3 -user3 localhost stage/sql/init 7 +user3 localhost stage/sql/Checking permissions 3 +user3 localhost stage/sql/Closing tables 4 +user3 localhost stage/sql/Init 6 +user3 localhost stage/sql/Init for update 1 user3 localhost stage/sql/Opening tables 3 -user4 localhost stage/sql/checking permissions 3 -user4 localhost stage/sql/closing tables 3 -user4 localhost stage/sql/init 7 +user4 localhost stage/sql/Checking permissions 3 +user4 localhost stage/sql/Closing tables 4 +user4 localhost stage/sql/Init 6 +user4 localhost stage/sql/Init for update 1 user4 localhost stage/sql/Opening tables 3 execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 3 -user1 stage/sql/closing tables 3 -user1 stage/sql/init 7 +user1 stage/sql/Checking permissions 3 +user1 stage/sql/Closing tables 4 +user1 stage/sql/Init 6 +user1 stage/sql/Init for update 1 user1 stage/sql/Opening tables 3 -user2 stage/sql/checking permissions 3 -user2 stage/sql/closing tables 3 -user2 stage/sql/init 7 +user2 stage/sql/Checking permissions 3 +user2 stage/sql/Closing tables 4 +user2 stage/sql/Init 6 +user2 stage/sql/Init for update 1 user2 stage/sql/Opening tables 3 -user3 stage/sql/checking permissions 3 -user3 stage/sql/closing tables 3 -user3 stage/sql/init 7 +user3 stage/sql/Checking permissions 3 +user3 stage/sql/Closing tables 4 +user3 stage/sql/Init 6 +user3 stage/sql/Init for update 1 user3 stage/sql/Opening tables 3 -user4 stage/sql/checking permissions 3 -user4 stage/sql/closing tables 3 -user4 stage/sql/init 7 +user4 stage/sql/Checking permissions 3 +user4 stage/sql/Closing tables 4 +user4 stage/sql/Init 6 +user4 stage/sql/Init for update 1 user4 stage/sql/Opening tables 3 execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 12 -localhost stage/sql/closing tables 12 -localhost stage/sql/init 28 +localhost stage/sql/Checking permissions 12 +localhost stage/sql/Closing tables 16 +localhost stage/sql/Init 24 +localhost stage/sql/Init for update 4 localhost stage/sql/Opening tables 12 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -3312,57 +3487,68 @@ wait/synch/mutex/sql/LOCK_connection_count 4 wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 0 -user1 localhost stage/sql/closing tables 0 -user1 localhost stage/sql/init 0 +user1 localhost stage/sql/Checking permissions 0 +user1 localhost stage/sql/Closing tables 0 +user1 localhost stage/sql/Init 0 +user1 localhost stage/sql/Init for update 0 user1 localhost stage/sql/Opening tables 0 -user2 localhost stage/sql/checking permissions 0 -user2 localhost stage/sql/closing tables 0 -user2 localhost stage/sql/init 0 +user2 localhost stage/sql/Checking permissions 0 +user2 localhost stage/sql/Closing tables 0 +user2 localhost stage/sql/Init 0 +user2 localhost stage/sql/Init for update 0 user2 localhost stage/sql/Opening tables 0 -user3 localhost stage/sql/checking permissions 0 -user3 localhost stage/sql/closing tables 0 -user3 localhost stage/sql/init 0 +user3 localhost stage/sql/Checking permissions 0 +user3 localhost stage/sql/Closing tables 0 +user3 localhost stage/sql/Init 0 +user3 localhost stage/sql/Init for update 0 user3 localhost stage/sql/Opening tables 0 -user4 localhost stage/sql/checking permissions 0 -user4 localhost stage/sql/closing tables 0 -user4 localhost stage/sql/init 0 +user4 localhost stage/sql/Checking permissions 0 +user4 localhost stage/sql/Closing tables 0 +user4 localhost stage/sql/Init 0 +user4 localhost stage/sql/Init for update 0 user4 localhost stage/sql/Opening tables 0 execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 3 -user1 stage/sql/closing tables 3 -user1 stage/sql/init 7 +user1 stage/sql/Checking permissions 3 +user1 stage/sql/Closing tables 4 +user1 stage/sql/Init 6 +user1 stage/sql/Init for update 1 user1 stage/sql/Opening tables 3 -user2 stage/sql/checking permissions 3 -user2 stage/sql/closing tables 3 -user2 stage/sql/init 7 +user2 stage/sql/Checking permissions 3 +user2 stage/sql/Closing tables 4 +user2 stage/sql/Init 6 +user2 stage/sql/Init for update 1 user2 stage/sql/Opening tables 3 -user3 stage/sql/checking permissions 3 -user3 stage/sql/closing tables 3 -user3 stage/sql/init 7 +user3 stage/sql/Checking permissions 3 +user3 stage/sql/Closing tables 4 +user3 stage/sql/Init 6 +user3 stage/sql/Init for update 1 user3 stage/sql/Opening tables 3 -user4 stage/sql/checking permissions 3 -user4 stage/sql/closing tables 3 -user4 stage/sql/init 7 +user4 stage/sql/Checking permissions 3 +user4 stage/sql/Closing tables 4 +user4 stage/sql/Init 6 +user4 stage/sql/Init for update 1 user4 stage/sql/Opening tables 3 execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 12 -localhost stage/sql/closing tables 12 -localhost stage/sql/init 28 +localhost stage/sql/Checking permissions 12 +localhost stage/sql/Closing tables 16 +localhost stage/sql/Init 24 +localhost stage/sql/Init for update 4 localhost stage/sql/Opening tables 12 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -3501,57 +3687,68 @@ wait/synch/mutex/sql/LOCK_connection_count 4 wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 0 -user1 localhost stage/sql/closing tables 0 -user1 localhost stage/sql/init 0 +user1 localhost stage/sql/Checking permissions 0 +user1 localhost stage/sql/Closing tables 0 +user1 localhost stage/sql/Init 0 +user1 localhost stage/sql/Init for update 0 user1 localhost stage/sql/Opening tables 0 -user2 localhost stage/sql/checking permissions 0 -user2 localhost stage/sql/closing tables 0 -user2 localhost stage/sql/init 0 +user2 localhost stage/sql/Checking permissions 0 +user2 localhost stage/sql/Closing tables 0 +user2 localhost stage/sql/Init 0 +user2 localhost stage/sql/Init for update 0 user2 localhost stage/sql/Opening tables 0 -user3 localhost stage/sql/checking permissions 0 -user3 localhost stage/sql/closing tables 0 -user3 localhost stage/sql/init 0 +user3 localhost stage/sql/Checking permissions 0 +user3 localhost stage/sql/Closing tables 0 +user3 localhost stage/sql/Init 0 +user3 localhost stage/sql/Init for update 0 user3 localhost stage/sql/Opening tables 0 -user4 localhost stage/sql/checking permissions 0 -user4 localhost stage/sql/closing tables 0 -user4 localhost stage/sql/init 0 +user4 localhost stage/sql/Checking permissions 0 +user4 localhost stage/sql/Closing tables 0 +user4 localhost stage/sql/Init 0 +user4 localhost stage/sql/Init for update 0 user4 localhost stage/sql/Opening tables 0 execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 0 -user1 stage/sql/closing tables 0 -user1 stage/sql/init 0 +user1 stage/sql/Checking permissions 0 +user1 stage/sql/Closing tables 0 +user1 stage/sql/Init 0 +user1 stage/sql/Init for update 0 user1 stage/sql/Opening tables 0 -user2 stage/sql/checking permissions 0 -user2 stage/sql/closing tables 0 -user2 stage/sql/init 0 +user2 stage/sql/Checking permissions 0 +user2 stage/sql/Closing tables 0 +user2 stage/sql/Init 0 +user2 stage/sql/Init for update 0 user2 stage/sql/Opening tables 0 -user3 stage/sql/checking permissions 0 -user3 stage/sql/closing tables 0 -user3 stage/sql/init 0 +user3 stage/sql/Checking permissions 0 +user3 stage/sql/Closing tables 0 +user3 stage/sql/Init 0 +user3 stage/sql/Init for update 0 user3 stage/sql/Opening tables 0 -user4 stage/sql/checking permissions 0 -user4 stage/sql/closing tables 0 -user4 stage/sql/init 0 +user4 stage/sql/Checking permissions 0 +user4 stage/sql/Closing tables 0 +user4 stage/sql/Init 0 +user4 stage/sql/Init for update 0 user4 stage/sql/Opening tables 0 execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 12 -localhost stage/sql/closing tables 12 -localhost stage/sql/init 28 +localhost stage/sql/Checking permissions 12 +localhost stage/sql/Closing tables 16 +localhost stage/sql/Init 24 +localhost stage/sql/Init for update 4 localhost stage/sql/Opening tables 12 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -3690,57 +3887,68 @@ wait/synch/mutex/sql/LOCK_connection_count 4 wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 0 -user1 localhost stage/sql/closing tables 0 -user1 localhost stage/sql/init 0 +user1 localhost stage/sql/Checking permissions 0 +user1 localhost stage/sql/Closing tables 0 +user1 localhost stage/sql/Init 0 +user1 localhost stage/sql/Init for update 0 user1 localhost stage/sql/Opening tables 0 -user2 localhost stage/sql/checking permissions 0 -user2 localhost stage/sql/closing tables 0 -user2 localhost stage/sql/init 0 +user2 localhost stage/sql/Checking permissions 0 +user2 localhost stage/sql/Closing tables 0 +user2 localhost stage/sql/Init 0 +user2 localhost stage/sql/Init for update 0 user2 localhost stage/sql/Opening tables 0 -user3 localhost stage/sql/checking permissions 0 -user3 localhost stage/sql/closing tables 0 -user3 localhost stage/sql/init 0 +user3 localhost stage/sql/Checking permissions 0 +user3 localhost stage/sql/Closing tables 0 +user3 localhost stage/sql/Init 0 +user3 localhost stage/sql/Init for update 0 user3 localhost stage/sql/Opening tables 0 -user4 localhost stage/sql/checking permissions 0 -user4 localhost stage/sql/closing tables 0 -user4 localhost stage/sql/init 0 +user4 localhost stage/sql/Checking permissions 0 +user4 localhost stage/sql/Closing tables 0 +user4 localhost stage/sql/Init 0 +user4 localhost stage/sql/Init for update 0 user4 localhost stage/sql/Opening tables 0 execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 0 -user1 stage/sql/closing tables 0 -user1 stage/sql/init 0 +user1 stage/sql/Checking permissions 0 +user1 stage/sql/Closing tables 0 +user1 stage/sql/Init 0 +user1 stage/sql/Init for update 0 user1 stage/sql/Opening tables 0 -user2 stage/sql/checking permissions 0 -user2 stage/sql/closing tables 0 -user2 stage/sql/init 0 +user2 stage/sql/Checking permissions 0 +user2 stage/sql/Closing tables 0 +user2 stage/sql/Init 0 +user2 stage/sql/Init for update 0 user2 stage/sql/Opening tables 0 -user3 stage/sql/checking permissions 0 -user3 stage/sql/closing tables 0 -user3 stage/sql/init 0 +user3 stage/sql/Checking permissions 0 +user3 stage/sql/Closing tables 0 +user3 stage/sql/Init 0 +user3 stage/sql/Init for update 0 user3 stage/sql/Opening tables 0 -user4 stage/sql/checking permissions 0 -user4 stage/sql/closing tables 0 -user4 stage/sql/init 0 +user4 stage/sql/Checking permissions 0 +user4 stage/sql/Closing tables 0 +user4 stage/sql/Init 0 +user4 stage/sql/Init for update 0 user4 stage/sql/Opening tables 0 execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 0 -localhost stage/sql/closing tables 0 -localhost stage/sql/init 0 +localhost stage/sql/Checking permissions 0 +localhost stage/sql/Closing tables 0 +localhost stage/sql/Init 0 +localhost stage/sql/Init for update 0 localhost stage/sql/Opening tables 0 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -3879,57 +4087,68 @@ wait/synch/mutex/sql/LOCK_connection_count 4 wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 0 -user1 localhost stage/sql/closing tables 0 -user1 localhost stage/sql/init 0 +user1 localhost stage/sql/Checking permissions 0 +user1 localhost stage/sql/Closing tables 0 +user1 localhost stage/sql/Init 0 +user1 localhost stage/sql/Init for update 0 user1 localhost stage/sql/Opening tables 0 -user2 localhost stage/sql/checking permissions 0 -user2 localhost stage/sql/closing tables 0 -user2 localhost stage/sql/init 0 +user2 localhost stage/sql/Checking permissions 0 +user2 localhost stage/sql/Closing tables 0 +user2 localhost stage/sql/Init 0 +user2 localhost stage/sql/Init for update 0 user2 localhost stage/sql/Opening tables 0 -user3 localhost stage/sql/checking permissions 0 -user3 localhost stage/sql/closing tables 0 -user3 localhost stage/sql/init 0 +user3 localhost stage/sql/Checking permissions 0 +user3 localhost stage/sql/Closing tables 0 +user3 localhost stage/sql/Init 0 +user3 localhost stage/sql/Init for update 0 user3 localhost stage/sql/Opening tables 0 -user4 localhost stage/sql/checking permissions 0 -user4 localhost stage/sql/closing tables 0 -user4 localhost stage/sql/init 0 +user4 localhost stage/sql/Checking permissions 0 +user4 localhost stage/sql/Closing tables 0 +user4 localhost stage/sql/Init 0 +user4 localhost stage/sql/Init for update 0 user4 localhost stage/sql/Opening tables 0 execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 0 -user1 stage/sql/closing tables 0 -user1 stage/sql/init 0 +user1 stage/sql/Checking permissions 0 +user1 stage/sql/Closing tables 0 +user1 stage/sql/Init 0 +user1 stage/sql/Init for update 0 user1 stage/sql/Opening tables 0 -user2 stage/sql/checking permissions 0 -user2 stage/sql/closing tables 0 -user2 stage/sql/init 0 +user2 stage/sql/Checking permissions 0 +user2 stage/sql/Closing tables 0 +user2 stage/sql/Init 0 +user2 stage/sql/Init for update 0 user2 stage/sql/Opening tables 0 -user3 stage/sql/checking permissions 0 -user3 stage/sql/closing tables 0 -user3 stage/sql/init 0 +user3 stage/sql/Checking permissions 0 +user3 stage/sql/Closing tables 0 +user3 stage/sql/Init 0 +user3 stage/sql/Init for update 0 user3 stage/sql/Opening tables 0 -user4 stage/sql/checking permissions 0 -user4 stage/sql/closing tables 0 -user4 stage/sql/init 0 +user4 stage/sql/Checking permissions 0 +user4 stage/sql/Closing tables 0 +user4 stage/sql/Init 0 +user4 stage/sql/Init for update 0 user4 stage/sql/Opening tables 0 execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 0 -localhost stage/sql/closing tables 0 -localhost stage/sql/init 0 +localhost stage/sql/Checking permissions 0 +localhost stage/sql/Closing tables 0 +localhost stage/sql/Init 0 +localhost stage/sql/Init for update 0 localhost stage/sql/Opening tables 0 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 0 -stage/sql/closing tables 0 -stage/sql/init 0 +stage/sql/Checking permissions 0 +stage/sql/Closing tables 0 +stage/sql/Init 0 +stage/sql/Init for update 0 stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -4068,57 +4287,68 @@ wait/synch/mutex/sql/LOCK_connection_count 4 wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 0 -user1 localhost stage/sql/closing tables 0 -user1 localhost stage/sql/init 0 +user1 localhost stage/sql/Checking permissions 0 +user1 localhost stage/sql/Closing tables 0 +user1 localhost stage/sql/Init 0 +user1 localhost stage/sql/Init for update 0 user1 localhost stage/sql/Opening tables 0 -user2 localhost stage/sql/checking permissions 0 -user2 localhost stage/sql/closing tables 0 -user2 localhost stage/sql/init 0 +user2 localhost stage/sql/Checking permissions 0 +user2 localhost stage/sql/Closing tables 0 +user2 localhost stage/sql/Init 0 +user2 localhost stage/sql/Init for update 0 user2 localhost stage/sql/Opening tables 0 -user3 localhost stage/sql/checking permissions 0 -user3 localhost stage/sql/closing tables 0 -user3 localhost stage/sql/init 0 +user3 localhost stage/sql/Checking permissions 0 +user3 localhost stage/sql/Closing tables 0 +user3 localhost stage/sql/Init 0 +user3 localhost stage/sql/Init for update 0 user3 localhost stage/sql/Opening tables 0 -user4 localhost stage/sql/checking permissions 0 -user4 localhost stage/sql/closing tables 0 -user4 localhost stage/sql/init 0 +user4 localhost stage/sql/Checking permissions 0 +user4 localhost stage/sql/Closing tables 0 +user4 localhost stage/sql/Init 0 +user4 localhost stage/sql/Init for update 0 user4 localhost stage/sql/Opening tables 0 execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 0 -user1 stage/sql/closing tables 0 -user1 stage/sql/init 0 +user1 stage/sql/Checking permissions 0 +user1 stage/sql/Closing tables 0 +user1 stage/sql/Init 0 +user1 stage/sql/Init for update 0 user1 stage/sql/Opening tables 0 -user2 stage/sql/checking permissions 0 -user2 stage/sql/closing tables 0 -user2 stage/sql/init 0 +user2 stage/sql/Checking permissions 0 +user2 stage/sql/Closing tables 0 +user2 stage/sql/Init 0 +user2 stage/sql/Init for update 0 user2 stage/sql/Opening tables 0 -user3 stage/sql/checking permissions 0 -user3 stage/sql/closing tables 0 -user3 stage/sql/init 0 +user3 stage/sql/Checking permissions 0 +user3 stage/sql/Closing tables 0 +user3 stage/sql/Init 0 +user3 stage/sql/Init for update 0 user3 stage/sql/Opening tables 0 -user4 stage/sql/checking permissions 0 -user4 stage/sql/closing tables 0 -user4 stage/sql/init 0 +user4 stage/sql/Checking permissions 0 +user4 stage/sql/Closing tables 0 +user4 stage/sql/Init 0 +user4 stage/sql/Init for update 0 user4 stage/sql/Opening tables 0 execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 0 -localhost stage/sql/closing tables 0 -localhost stage/sql/init 0 +localhost stage/sql/Checking permissions 0 +localhost stage/sql/Closing tables 0 +localhost stage/sql/Init 0 +localhost stage/sql/Init for update 0 localhost stage/sql/Opening tables 0 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 0 -stage/sql/closing tables 0 -stage/sql/init 0 +stage/sql/Checking permissions 0 +stage/sql/Closing tables 0 +stage/sql/Init 0 +stage/sql/Init for update 0 stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -4257,57 +4487,68 @@ wait/synch/mutex/sql/LOCK_connection_count 4 wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 0 -user1 localhost stage/sql/closing tables 0 -user1 localhost stage/sql/init 0 +user1 localhost stage/sql/Checking permissions 0 +user1 localhost stage/sql/Closing tables 0 +user1 localhost stage/sql/Init 0 +user1 localhost stage/sql/Init for update 0 user1 localhost stage/sql/Opening tables 0 -user2 localhost stage/sql/checking permissions 0 -user2 localhost stage/sql/closing tables 0 -user2 localhost stage/sql/init 0 +user2 localhost stage/sql/Checking permissions 0 +user2 localhost stage/sql/Closing tables 0 +user2 localhost stage/sql/Init 0 +user2 localhost stage/sql/Init for update 0 user2 localhost stage/sql/Opening tables 0 -user3 localhost stage/sql/checking permissions 0 -user3 localhost stage/sql/closing tables 0 -user3 localhost stage/sql/init 0 +user3 localhost stage/sql/Checking permissions 0 +user3 localhost stage/sql/Closing tables 0 +user3 localhost stage/sql/Init 0 +user3 localhost stage/sql/Init for update 0 user3 localhost stage/sql/Opening tables 0 -user4 localhost stage/sql/checking permissions 0 -user4 localhost stage/sql/closing tables 0 -user4 localhost stage/sql/init 0 +user4 localhost stage/sql/Checking permissions 0 +user4 localhost stage/sql/Closing tables 0 +user4 localhost stage/sql/Init 0 +user4 localhost stage/sql/Init for update 0 user4 localhost stage/sql/Opening tables 0 execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 0 -user1 stage/sql/closing tables 0 -user1 stage/sql/init 0 +user1 stage/sql/Checking permissions 0 +user1 stage/sql/Closing tables 0 +user1 stage/sql/Init 0 +user1 stage/sql/Init for update 0 user1 stage/sql/Opening tables 0 -user2 stage/sql/checking permissions 0 -user2 stage/sql/closing tables 0 -user2 stage/sql/init 0 +user2 stage/sql/Checking permissions 0 +user2 stage/sql/Closing tables 0 +user2 stage/sql/Init 0 +user2 stage/sql/Init for update 0 user2 stage/sql/Opening tables 0 -user3 stage/sql/checking permissions 0 -user3 stage/sql/closing tables 0 -user3 stage/sql/init 0 +user3 stage/sql/Checking permissions 0 +user3 stage/sql/Closing tables 0 +user3 stage/sql/Init 0 +user3 stage/sql/Init for update 0 user3 stage/sql/Opening tables 0 -user4 stage/sql/checking permissions 0 -user4 stage/sql/closing tables 0 -user4 stage/sql/init 0 +user4 stage/sql/Checking permissions 0 +user4 stage/sql/Closing tables 0 +user4 stage/sql/Init 0 +user4 stage/sql/Init for update 0 user4 stage/sql/Opening tables 0 execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 0 -localhost stage/sql/closing tables 0 -localhost stage/sql/init 0 +localhost stage/sql/Checking permissions 0 +localhost stage/sql/Closing tables 0 +localhost stage/sql/Init 0 +localhost stage/sql/Init for update 0 localhost stage/sql/Opening tables 0 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 0 -stage/sql/closing tables 0 -stage/sql/init 0 +stage/sql/Checking permissions 0 +stage/sql/Closing tables 0 +stage/sql/Init 0 +stage/sql/Init for update 0 stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -4446,57 +4687,68 @@ wait/synch/mutex/sql/LOCK_connection_count 4 wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 0 -user1 localhost stage/sql/closing tables 0 -user1 localhost stage/sql/init 0 +user1 localhost stage/sql/Checking permissions 0 +user1 localhost stage/sql/Closing tables 0 +user1 localhost stage/sql/Init 0 +user1 localhost stage/sql/Init for update 0 user1 localhost stage/sql/Opening tables 0 -user2 localhost stage/sql/checking permissions 0 -user2 localhost stage/sql/closing tables 0 -user2 localhost stage/sql/init 0 +user2 localhost stage/sql/Checking permissions 0 +user2 localhost stage/sql/Closing tables 0 +user2 localhost stage/sql/Init 0 +user2 localhost stage/sql/Init for update 0 user2 localhost stage/sql/Opening tables 0 -user3 localhost stage/sql/checking permissions 0 -user3 localhost stage/sql/closing tables 0 -user3 localhost stage/sql/init 0 +user3 localhost stage/sql/Checking permissions 0 +user3 localhost stage/sql/Closing tables 0 +user3 localhost stage/sql/Init 0 +user3 localhost stage/sql/Init for update 0 user3 localhost stage/sql/Opening tables 0 -user4 localhost stage/sql/checking permissions 0 -user4 localhost stage/sql/closing tables 0 -user4 localhost stage/sql/init 0 +user4 localhost stage/sql/Checking permissions 0 +user4 localhost stage/sql/Closing tables 0 +user4 localhost stage/sql/Init 0 +user4 localhost stage/sql/Init for update 0 user4 localhost stage/sql/Opening tables 0 execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 0 -user1 stage/sql/closing tables 0 -user1 stage/sql/init 0 +user1 stage/sql/Checking permissions 0 +user1 stage/sql/Closing tables 0 +user1 stage/sql/Init 0 +user1 stage/sql/Init for update 0 user1 stage/sql/Opening tables 0 -user2 stage/sql/checking permissions 0 -user2 stage/sql/closing tables 0 -user2 stage/sql/init 0 +user2 stage/sql/Checking permissions 0 +user2 stage/sql/Closing tables 0 +user2 stage/sql/Init 0 +user2 stage/sql/Init for update 0 user2 stage/sql/Opening tables 0 -user3 stage/sql/checking permissions 0 -user3 stage/sql/closing tables 0 -user3 stage/sql/init 0 +user3 stage/sql/Checking permissions 0 +user3 stage/sql/Closing tables 0 +user3 stage/sql/Init 0 +user3 stage/sql/Init for update 0 user3 stage/sql/Opening tables 0 -user4 stage/sql/checking permissions 0 -user4 stage/sql/closing tables 0 -user4 stage/sql/init 0 +user4 stage/sql/Checking permissions 0 +user4 stage/sql/Closing tables 0 +user4 stage/sql/Init 0 +user4 stage/sql/Init for update 0 user4 stage/sql/Opening tables 0 execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 0 -localhost stage/sql/closing tables 0 -localhost stage/sql/init 0 +localhost stage/sql/Checking permissions 0 +localhost stage/sql/Closing tables 0 +localhost stage/sql/Init 0 +localhost stage/sql/Init for update 0 localhost stage/sql/Opening tables 0 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 0 -stage/sql/closing tables 0 -stage/sql/init 0 +stage/sql/Checking permissions 0 +stage/sql/Closing tables 0 +stage/sql/Init 0 +stage/sql/Init for update 0 stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -4635,57 +4887,68 @@ wait/synch/mutex/sql/LOCK_connection_count 4 wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 0 -user1 localhost stage/sql/closing tables 0 -user1 localhost stage/sql/init 0 +user1 localhost stage/sql/Checking permissions 0 +user1 localhost stage/sql/Closing tables 0 +user1 localhost stage/sql/Init 0 +user1 localhost stage/sql/Init for update 0 user1 localhost stage/sql/Opening tables 0 -user2 localhost stage/sql/checking permissions 0 -user2 localhost stage/sql/closing tables 0 -user2 localhost stage/sql/init 0 +user2 localhost stage/sql/Checking permissions 0 +user2 localhost stage/sql/Closing tables 0 +user2 localhost stage/sql/Init 0 +user2 localhost stage/sql/Init for update 0 user2 localhost stage/sql/Opening tables 0 -user3 localhost stage/sql/checking permissions 0 -user3 localhost stage/sql/closing tables 0 -user3 localhost stage/sql/init 0 +user3 localhost stage/sql/Checking permissions 0 +user3 localhost stage/sql/Closing tables 0 +user3 localhost stage/sql/Init 0 +user3 localhost stage/sql/Init for update 0 user3 localhost stage/sql/Opening tables 0 -user4 localhost stage/sql/checking permissions 0 -user4 localhost stage/sql/closing tables 0 -user4 localhost stage/sql/init 0 +user4 localhost stage/sql/Checking permissions 0 +user4 localhost stage/sql/Closing tables 0 +user4 localhost stage/sql/Init 0 +user4 localhost stage/sql/Init for update 0 user4 localhost stage/sql/Opening tables 0 execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 0 -user1 stage/sql/closing tables 0 -user1 stage/sql/init 0 +user1 stage/sql/Checking permissions 0 +user1 stage/sql/Closing tables 0 +user1 stage/sql/Init 0 +user1 stage/sql/Init for update 0 user1 stage/sql/Opening tables 0 -user2 stage/sql/checking permissions 0 -user2 stage/sql/closing tables 0 -user2 stage/sql/init 0 +user2 stage/sql/Checking permissions 0 +user2 stage/sql/Closing tables 0 +user2 stage/sql/Init 0 +user2 stage/sql/Init for update 0 user2 stage/sql/Opening tables 0 -user3 stage/sql/checking permissions 0 -user3 stage/sql/closing tables 0 -user3 stage/sql/init 0 +user3 stage/sql/Checking permissions 0 +user3 stage/sql/Closing tables 0 +user3 stage/sql/Init 0 +user3 stage/sql/Init for update 0 user3 stage/sql/Opening tables 0 -user4 stage/sql/checking permissions 0 -user4 stage/sql/closing tables 0 -user4 stage/sql/init 0 +user4 stage/sql/Checking permissions 0 +user4 stage/sql/Closing tables 0 +user4 stage/sql/Init 0 +user4 stage/sql/Init for update 0 user4 stage/sql/Opening tables 0 execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 0 -localhost stage/sql/closing tables 0 -localhost stage/sql/init 0 +localhost stage/sql/Checking permissions 0 +localhost stage/sql/Closing tables 0 +localhost stage/sql/Init 0 +localhost stage/sql/Init for update 0 localhost stage/sql/Opening tables 0 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 0 -stage/sql/closing tables 0 -stage/sql/init 0 +stage/sql/Checking permissions 0 +stage/sql/Closing tables 0 +stage/sql/Init 0 +stage/sql/Init for update 0 stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -4824,57 +5087,68 @@ wait/synch/mutex/sql/LOCK_connection_count 4 wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 0 -user1 localhost stage/sql/closing tables 0 -user1 localhost stage/sql/init 0 +user1 localhost stage/sql/Checking permissions 0 +user1 localhost stage/sql/Closing tables 0 +user1 localhost stage/sql/Init 0 +user1 localhost stage/sql/Init for update 0 user1 localhost stage/sql/Opening tables 0 -user2 localhost stage/sql/checking permissions 0 -user2 localhost stage/sql/closing tables 0 -user2 localhost stage/sql/init 0 +user2 localhost stage/sql/Checking permissions 0 +user2 localhost stage/sql/Closing tables 0 +user2 localhost stage/sql/Init 0 +user2 localhost stage/sql/Init for update 0 user2 localhost stage/sql/Opening tables 0 -user3 localhost stage/sql/checking permissions 0 -user3 localhost stage/sql/closing tables 0 -user3 localhost stage/sql/init 0 +user3 localhost stage/sql/Checking permissions 0 +user3 localhost stage/sql/Closing tables 0 +user3 localhost stage/sql/Init 0 +user3 localhost stage/sql/Init for update 0 user3 localhost stage/sql/Opening tables 0 -user4 localhost stage/sql/checking permissions 0 -user4 localhost stage/sql/closing tables 0 -user4 localhost stage/sql/init 0 +user4 localhost stage/sql/Checking permissions 0 +user4 localhost stage/sql/Closing tables 0 +user4 localhost stage/sql/Init 0 +user4 localhost stage/sql/Init for update 0 user4 localhost stage/sql/Opening tables 0 execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 0 -user1 stage/sql/closing tables 0 -user1 stage/sql/init 0 +user1 stage/sql/Checking permissions 0 +user1 stage/sql/Closing tables 0 +user1 stage/sql/Init 0 +user1 stage/sql/Init for update 0 user1 stage/sql/Opening tables 0 -user2 stage/sql/checking permissions 0 -user2 stage/sql/closing tables 0 -user2 stage/sql/init 0 +user2 stage/sql/Checking permissions 0 +user2 stage/sql/Closing tables 0 +user2 stage/sql/Init 0 +user2 stage/sql/Init for update 0 user2 stage/sql/Opening tables 0 -user3 stage/sql/checking permissions 0 -user3 stage/sql/closing tables 0 -user3 stage/sql/init 0 +user3 stage/sql/Checking permissions 0 +user3 stage/sql/Closing tables 0 +user3 stage/sql/Init 0 +user3 stage/sql/Init for update 0 user3 stage/sql/Opening tables 0 -user4 stage/sql/checking permissions 0 -user4 stage/sql/closing tables 0 -user4 stage/sql/init 0 +user4 stage/sql/Checking permissions 0 +user4 stage/sql/Closing tables 0 +user4 stage/sql/Init 0 +user4 stage/sql/Init for update 0 user4 stage/sql/Opening tables 0 execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 0 -localhost stage/sql/closing tables 0 -localhost stage/sql/init 0 +localhost stage/sql/Checking permissions 0 +localhost stage/sql/Closing tables 0 +localhost stage/sql/Init 0 +localhost stage/sql/Init for update 0 localhost stage/sql/Opening tables 0 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 0 -stage/sql/closing tables 0 -stage/sql/init 0 +stage/sql/Checking permissions 0 +stage/sql/Closing tables 0 +stage/sql/Init 0 +stage/sql/Init for update 0 stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -4999,39 +5273,46 @@ execute dump_stages_account; user host event_name count_star execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 0 -user1 stage/sql/closing tables 0 -user1 stage/sql/init 0 +user1 stage/sql/Checking permissions 0 +user1 stage/sql/Closing tables 0 +user1 stage/sql/Init 0 +user1 stage/sql/Init for update 0 user1 stage/sql/Opening tables 0 -user2 stage/sql/checking permissions 0 -user2 stage/sql/closing tables 0 -user2 stage/sql/init 0 +user2 stage/sql/Checking permissions 0 +user2 stage/sql/Closing tables 0 +user2 stage/sql/Init 0 +user2 stage/sql/Init for update 0 user2 stage/sql/Opening tables 0 -user3 stage/sql/checking permissions 0 -user3 stage/sql/closing tables 0 -user3 stage/sql/init 0 +user3 stage/sql/Checking permissions 0 +user3 stage/sql/Closing tables 0 +user3 stage/sql/Init 0 +user3 stage/sql/Init for update 0 user3 stage/sql/Opening tables 0 -user4 stage/sql/checking permissions 0 -user4 stage/sql/closing tables 0 -user4 stage/sql/init 0 +user4 stage/sql/Checking permissions 0 +user4 stage/sql/Closing tables 0 +user4 stage/sql/Init 0 +user4 stage/sql/Init for update 0 user4 stage/sql/Opening tables 0 execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 0 -localhost stage/sql/closing tables 0 -localhost stage/sql/init 0 +localhost stage/sql/Checking permissions 0 +localhost stage/sql/Closing tables 0 +localhost stage/sql/Init 0 +localhost stage/sql/Init for update 0 localhost stage/sql/Opening tables 0 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 0 -stage/sql/closing tables 0 -stage/sql/init 0 +stage/sql/Checking permissions 0 +stage/sql/Closing tables 0 +stage/sql/Init 0 +stage/sql/Init for update 0 stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -5122,21 +5403,24 @@ execute dump_stages_user; user event_name count_star execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 0 -localhost stage/sql/closing tables 0 -localhost stage/sql/init 0 +localhost stage/sql/Checking permissions 0 +localhost stage/sql/Closing tables 0 +localhost stage/sql/Init 0 +localhost stage/sql/Init for update 0 localhost stage/sql/Opening tables 0 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 0 -stage/sql/closing tables 0 -stage/sql/init 0 +stage/sql/Checking permissions 0 +stage/sql/Closing tables 0 +stage/sql/Init 0 +stage/sql/Init for update 0 stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -5207,21 +5491,24 @@ execute dump_stages_user; user event_name count_star execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 0 -localhost stage/sql/closing tables 0 -localhost stage/sql/init 0 +localhost stage/sql/Checking permissions 0 +localhost stage/sql/Closing tables 0 +localhost stage/sql/Init 0 +localhost stage/sql/Init for update 0 localhost stage/sql/Opening tables 0 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 0 -stage/sql/closing tables 0 -stage/sql/init 0 +stage/sql/Checking permissions 0 +stage/sql/Closing tables 0 +stage/sql/Init 0 +stage/sql/Init for update 0 stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star 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 7c9c3794d5f..ece0402335d 100644 --- a/mysql-test/suite/perfschema/r/event_aggregate_no_a.result +++ b/mysql-test/suite/perfschema/r/event_aggregate_no_a.result @@ -32,15 +32,17 @@ execute dump_stages_user; user event_name count_star execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 0 -localhost stage/sql/closing tables 0 -localhost stage/sql/init 0 +localhost stage/sql/Checking permissions 0 +localhost stage/sql/Closing tables 0 +localhost stage/sql/Init 0 +localhost stage/sql/Init for update 0 localhost stage/sql/Opening tables 0 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 0 -stage/sql/closing tables 0 -stage/sql/init 0 +stage/sql/Checking permissions 0 +stage/sql/Closing tables 0 +stage/sql/Init 0 +stage/sql/Init for update 0 stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) @@ -112,21 +114,24 @@ execute dump_stages_account; user host event_name count_star execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 0 -user1 stage/sql/closing tables 0 -user1 stage/sql/init 0 +user1 stage/sql/Checking permissions 0 +user1 stage/sql/Closing tables 0 +user1 stage/sql/Init 0 +user1 stage/sql/Init for update 0 user1 stage/sql/Opening tables 0 execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 0 -localhost stage/sql/closing tables 0 -localhost stage/sql/init 0 +localhost stage/sql/Checking permissions 0 +localhost stage/sql/Closing tables 0 +localhost stage/sql/Init 0 +localhost stage/sql/Init for update 0 localhost stage/sql/Opening tables 0 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 0 -stage/sql/closing tables 0 -stage/sql/init 0 +stage/sql/Checking permissions 0 +stage/sql/Closing tables 0 +stage/sql/Init 0 +stage/sql/Init for update 0 stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) @@ -211,27 +216,31 @@ execute dump_stages_account; user host event_name count_star execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 3 -user1 stage/sql/closing tables 3 -user1 stage/sql/init 6 +user1 stage/sql/Checking permissions 3 +user1 stage/sql/Closing tables 4 +user1 stage/sql/Init 5 +user1 stage/sql/Init for update 1 user1 stage/sql/Opening tables 3 execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 3 -localhost stage/sql/closing tables 3 -localhost stage/sql/init 6 +localhost stage/sql/Checking permissions 3 +localhost stage/sql/Closing tables 4 +localhost stage/sql/Init 5 +localhost stage/sql/Init for update 1 localhost stage/sql/Opening tables 3 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 3 -stage/sql/closing tables 3 -stage/sql/init 6 +stage/sql/Checking permissions 3 +stage/sql/Closing tables 4 +stage/sql/Init 5 +stage/sql/Init for update 1 stage/sql/Opening tables 3 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 3 -stage/sql/closing tables 3 -stage/sql/init 6 +stage/sql/Checking permissions 3 +stage/sql/Closing tables 4 +stage/sql/Init 5 +stage/sql/Init for update 1 stage/sql/Opening tables 3 execute dump_statements_account; user host event_name count_star @@ -316,31 +325,36 @@ execute dump_stages_account; user host event_name count_star execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 3 -user1 stage/sql/closing tables 3 -user1 stage/sql/init 6 +user1 stage/sql/Checking permissions 3 +user1 stage/sql/Closing tables 4 +user1 stage/sql/Init 5 +user1 stage/sql/Init for update 1 user1 stage/sql/Opening tables 3 -user2 stage/sql/checking permissions 0 -user2 stage/sql/closing tables 0 -user2 stage/sql/init 0 +user2 stage/sql/Checking permissions 0 +user2 stage/sql/Closing tables 0 +user2 stage/sql/Init 0 +user2 stage/sql/Init for update 0 user2 stage/sql/Opening tables 0 execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 3 -localhost stage/sql/closing tables 3 -localhost stage/sql/init 6 +localhost stage/sql/Checking permissions 3 +localhost stage/sql/Closing tables 4 +localhost stage/sql/Init 5 +localhost stage/sql/Init for update 1 localhost stage/sql/Opening tables 3 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 3 -stage/sql/closing tables 3 -stage/sql/init 6 +stage/sql/Checking permissions 3 +stage/sql/Closing tables 4 +stage/sql/Init 5 +stage/sql/Init for update 1 stage/sql/Opening tables 3 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 3 -stage/sql/closing tables 3 -stage/sql/init 6 +stage/sql/Checking permissions 3 +stage/sql/Closing tables 4 +stage/sql/Init 5 +stage/sql/Init for update 1 stage/sql/Opening tables 3 execute dump_statements_account; user host event_name count_star @@ -437,31 +451,36 @@ execute dump_stages_account; user host event_name count_star execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 3 -user1 stage/sql/closing tables 3 -user1 stage/sql/init 6 +user1 stage/sql/Checking permissions 3 +user1 stage/sql/Closing tables 4 +user1 stage/sql/Init 5 +user1 stage/sql/Init for update 1 user1 stage/sql/Opening tables 3 -user2 stage/sql/checking permissions 3 -user2 stage/sql/closing tables 3 -user2 stage/sql/init 6 +user2 stage/sql/Checking permissions 3 +user2 stage/sql/Closing tables 4 +user2 stage/sql/Init 5 +user2 stage/sql/Init for update 1 user2 stage/sql/Opening tables 3 execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 6 -localhost stage/sql/closing tables 6 -localhost stage/sql/init 12 +localhost stage/sql/Checking permissions 6 +localhost stage/sql/Closing tables 8 +localhost stage/sql/Init 10 +localhost stage/sql/Init for update 2 localhost stage/sql/Opening tables 6 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 6 -stage/sql/closing tables 6 -stage/sql/init 12 +stage/sql/Checking permissions 6 +stage/sql/Closing tables 8 +stage/sql/Init 10 +stage/sql/Init for update 2 stage/sql/Opening tables 6 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 6 -stage/sql/closing tables 6 -stage/sql/init 12 +stage/sql/Checking permissions 6 +stage/sql/Closing tables 8 +stage/sql/Init 10 +stage/sql/Init for update 2 stage/sql/Opening tables 6 execute dump_statements_account; user host event_name count_star @@ -558,35 +577,41 @@ execute dump_stages_account; user host event_name count_star execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 3 -user1 stage/sql/closing tables 3 -user1 stage/sql/init 6 +user1 stage/sql/Checking permissions 3 +user1 stage/sql/Closing tables 4 +user1 stage/sql/Init 5 +user1 stage/sql/Init for update 1 user1 stage/sql/Opening tables 3 -user2 stage/sql/checking permissions 3 -user2 stage/sql/closing tables 3 -user2 stage/sql/init 6 +user2 stage/sql/Checking permissions 3 +user2 stage/sql/Closing tables 4 +user2 stage/sql/Init 5 +user2 stage/sql/Init for update 1 user2 stage/sql/Opening tables 3 -user3 stage/sql/checking permissions 0 -user3 stage/sql/closing tables 0 -user3 stage/sql/init 0 +user3 stage/sql/Checking permissions 0 +user3 stage/sql/Closing tables 0 +user3 stage/sql/Init 0 +user3 stage/sql/Init for update 0 user3 stage/sql/Opening tables 0 execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 6 -localhost stage/sql/closing tables 6 -localhost stage/sql/init 12 +localhost stage/sql/Checking permissions 6 +localhost stage/sql/Closing tables 8 +localhost stage/sql/Init 10 +localhost stage/sql/Init for update 2 localhost stage/sql/Opening tables 6 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 6 -stage/sql/closing tables 6 -stage/sql/init 12 +stage/sql/Checking permissions 6 +stage/sql/Closing tables 8 +stage/sql/Init 10 +stage/sql/Init for update 2 stage/sql/Opening tables 6 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 6 -stage/sql/closing tables 6 -stage/sql/init 12 +stage/sql/Checking permissions 6 +stage/sql/Closing tables 8 +stage/sql/Init 10 +stage/sql/Init for update 2 stage/sql/Opening tables 6 execute dump_statements_account; user host event_name count_star @@ -695,35 +720,41 @@ execute dump_stages_account; user host event_name count_star execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 3 -user1 stage/sql/closing tables 3 -user1 stage/sql/init 6 +user1 stage/sql/Checking permissions 3 +user1 stage/sql/Closing tables 4 +user1 stage/sql/Init 5 +user1 stage/sql/Init for update 1 user1 stage/sql/Opening tables 3 -user2 stage/sql/checking permissions 3 -user2 stage/sql/closing tables 3 -user2 stage/sql/init 6 +user2 stage/sql/Checking permissions 3 +user2 stage/sql/Closing tables 4 +user2 stage/sql/Init 5 +user2 stage/sql/Init for update 1 user2 stage/sql/Opening tables 3 -user3 stage/sql/checking permissions 3 -user3 stage/sql/closing tables 3 -user3 stage/sql/init 6 +user3 stage/sql/Checking permissions 3 +user3 stage/sql/Closing tables 4 +user3 stage/sql/Init 5 +user3 stage/sql/Init for update 1 user3 stage/sql/Opening tables 3 execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 9 -localhost stage/sql/closing tables 9 -localhost stage/sql/init 18 +localhost stage/sql/Checking permissions 9 +localhost stage/sql/Closing tables 12 +localhost stage/sql/Init 15 +localhost stage/sql/Init for update 3 localhost stage/sql/Opening tables 9 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 9 -stage/sql/closing tables 9 -stage/sql/init 18 +stage/sql/Checking permissions 9 +stage/sql/Closing tables 12 +stage/sql/Init 15 +stage/sql/Init for update 3 stage/sql/Opening tables 9 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 9 -stage/sql/closing tables 9 -stage/sql/init 18 +stage/sql/Checking permissions 9 +stage/sql/Closing tables 12 +stage/sql/Init 15 +stage/sql/Init for update 3 stage/sql/Opening tables 9 execute dump_statements_account; user host event_name count_star @@ -832,39 +863,46 @@ execute dump_stages_account; user host event_name count_star execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 3 -user1 stage/sql/closing tables 3 -user1 stage/sql/init 6 +user1 stage/sql/Checking permissions 3 +user1 stage/sql/Closing tables 4 +user1 stage/sql/Init 5 +user1 stage/sql/Init for update 1 user1 stage/sql/Opening tables 3 -user2 stage/sql/checking permissions 3 -user2 stage/sql/closing tables 3 -user2 stage/sql/init 6 +user2 stage/sql/Checking permissions 3 +user2 stage/sql/Closing tables 4 +user2 stage/sql/Init 5 +user2 stage/sql/Init for update 1 user2 stage/sql/Opening tables 3 -user3 stage/sql/checking permissions 3 -user3 stage/sql/closing tables 3 -user3 stage/sql/init 6 +user3 stage/sql/Checking permissions 3 +user3 stage/sql/Closing tables 4 +user3 stage/sql/Init 5 +user3 stage/sql/Init for update 1 user3 stage/sql/Opening tables 3 -user4 stage/sql/checking permissions 0 -user4 stage/sql/closing tables 0 -user4 stage/sql/init 0 +user4 stage/sql/Checking permissions 0 +user4 stage/sql/Closing tables 0 +user4 stage/sql/Init 0 +user4 stage/sql/Init for update 0 user4 stage/sql/Opening tables 0 execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 9 -localhost stage/sql/closing tables 9 -localhost stage/sql/init 18 +localhost stage/sql/Checking permissions 9 +localhost stage/sql/Closing tables 12 +localhost stage/sql/Init 15 +localhost stage/sql/Init for update 3 localhost stage/sql/Opening tables 9 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 9 -stage/sql/closing tables 9 -stage/sql/init 18 +stage/sql/Checking permissions 9 +stage/sql/Closing tables 12 +stage/sql/Init 15 +stage/sql/Init for update 3 stage/sql/Opening tables 9 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 9 -stage/sql/closing tables 9 -stage/sql/init 18 +stage/sql/Checking permissions 9 +stage/sql/Closing tables 12 +stage/sql/Init 15 +stage/sql/Init for update 3 stage/sql/Opening tables 9 execute dump_statements_account; user host event_name count_star @@ -985,39 +1023,46 @@ execute dump_stages_account; user host event_name count_star execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 3 -user1 stage/sql/closing tables 3 -user1 stage/sql/init 6 +user1 stage/sql/Checking permissions 3 +user1 stage/sql/Closing tables 4 +user1 stage/sql/Init 5 +user1 stage/sql/Init for update 1 user1 stage/sql/Opening tables 3 -user2 stage/sql/checking permissions 3 -user2 stage/sql/closing tables 3 -user2 stage/sql/init 6 +user2 stage/sql/Checking permissions 3 +user2 stage/sql/Closing tables 4 +user2 stage/sql/Init 5 +user2 stage/sql/Init for update 1 user2 stage/sql/Opening tables 3 -user3 stage/sql/checking permissions 3 -user3 stage/sql/closing tables 3 -user3 stage/sql/init 6 +user3 stage/sql/Checking permissions 3 +user3 stage/sql/Closing tables 4 +user3 stage/sql/Init 5 +user3 stage/sql/Init for update 1 user3 stage/sql/Opening tables 3 -user4 stage/sql/checking permissions 3 -user4 stage/sql/closing tables 3 -user4 stage/sql/init 6 +user4 stage/sql/Checking permissions 3 +user4 stage/sql/Closing tables 4 +user4 stage/sql/Init 5 +user4 stage/sql/Init for update 1 user4 stage/sql/Opening tables 3 execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 12 -localhost stage/sql/closing tables 12 -localhost stage/sql/init 24 +localhost stage/sql/Checking permissions 12 +localhost stage/sql/Closing tables 16 +localhost stage/sql/Init 20 +localhost stage/sql/Init for update 4 localhost stage/sql/Opening tables 12 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 24 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 20 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 24 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 20 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -1129,39 +1174,46 @@ execute dump_stages_account; user host event_name count_star execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 3 -user1 stage/sql/closing tables 3 -user1 stage/sql/init 7 +user1 stage/sql/Checking permissions 3 +user1 stage/sql/Closing tables 4 +user1 stage/sql/Init 6 +user1 stage/sql/Init for update 1 user1 stage/sql/Opening tables 3 -user2 stage/sql/checking permissions 3 -user2 stage/sql/closing tables 3 -user2 stage/sql/init 6 +user2 stage/sql/Checking permissions 3 +user2 stage/sql/Closing tables 4 +user2 stage/sql/Init 5 +user2 stage/sql/Init for update 1 user2 stage/sql/Opening tables 3 -user3 stage/sql/checking permissions 3 -user3 stage/sql/closing tables 3 -user3 stage/sql/init 6 +user3 stage/sql/Checking permissions 3 +user3 stage/sql/Closing tables 4 +user3 stage/sql/Init 5 +user3 stage/sql/Init for update 1 user3 stage/sql/Opening tables 3 -user4 stage/sql/checking permissions 3 -user4 stage/sql/closing tables 3 -user4 stage/sql/init 6 +user4 stage/sql/Checking permissions 3 +user4 stage/sql/Closing tables 4 +user4 stage/sql/Init 5 +user4 stage/sql/Init for update 1 user4 stage/sql/Opening tables 3 execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 12 -localhost stage/sql/closing tables 12 -localhost stage/sql/init 25 +localhost stage/sql/Checking permissions 12 +localhost stage/sql/Closing tables 16 +localhost stage/sql/Init 21 +localhost stage/sql/Init for update 4 localhost stage/sql/Opening tables 12 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 25 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 21 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 25 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 21 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -1271,39 +1323,46 @@ execute dump_stages_account; user host event_name count_star execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 3 -user1 stage/sql/closing tables 3 -user1 stage/sql/init 7 +user1 stage/sql/Checking permissions 3 +user1 stage/sql/Closing tables 4 +user1 stage/sql/Init 6 +user1 stage/sql/Init for update 1 user1 stage/sql/Opening tables 3 -user2 stage/sql/checking permissions 3 -user2 stage/sql/closing tables 3 -user2 stage/sql/init 7 +user2 stage/sql/Checking permissions 3 +user2 stage/sql/Closing tables 4 +user2 stage/sql/Init 6 +user2 stage/sql/Init for update 1 user2 stage/sql/Opening tables 3 -user3 stage/sql/checking permissions 3 -user3 stage/sql/closing tables 3 -user3 stage/sql/init 6 +user3 stage/sql/Checking permissions 3 +user3 stage/sql/Closing tables 4 +user3 stage/sql/Init 5 +user3 stage/sql/Init for update 1 user3 stage/sql/Opening tables 3 -user4 stage/sql/checking permissions 3 -user4 stage/sql/closing tables 3 -user4 stage/sql/init 6 +user4 stage/sql/Checking permissions 3 +user4 stage/sql/Closing tables 4 +user4 stage/sql/Init 5 +user4 stage/sql/Init for update 1 user4 stage/sql/Opening tables 3 execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 12 -localhost stage/sql/closing tables 12 -localhost stage/sql/init 26 +localhost stage/sql/Checking permissions 12 +localhost stage/sql/Closing tables 16 +localhost stage/sql/Init 22 +localhost stage/sql/Init for update 4 localhost stage/sql/Opening tables 12 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 26 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 22 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 26 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 22 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -1410,39 +1469,46 @@ execute dump_stages_account; user host event_name count_star execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 3 -user1 stage/sql/closing tables 3 -user1 stage/sql/init 7 +user1 stage/sql/Checking permissions 3 +user1 stage/sql/Closing tables 4 +user1 stage/sql/Init 6 +user1 stage/sql/Init for update 1 user1 stage/sql/Opening tables 3 -user2 stage/sql/checking permissions 3 -user2 stage/sql/closing tables 3 -user2 stage/sql/init 7 +user2 stage/sql/Checking permissions 3 +user2 stage/sql/Closing tables 4 +user2 stage/sql/Init 6 +user2 stage/sql/Init for update 1 user2 stage/sql/Opening tables 3 -user3 stage/sql/checking permissions 3 -user3 stage/sql/closing tables 3 -user3 stage/sql/init 7 +user3 stage/sql/Checking permissions 3 +user3 stage/sql/Closing tables 4 +user3 stage/sql/Init 6 +user3 stage/sql/Init for update 1 user3 stage/sql/Opening tables 3 -user4 stage/sql/checking permissions 3 -user4 stage/sql/closing tables 3 -user4 stage/sql/init 6 +user4 stage/sql/Checking permissions 3 +user4 stage/sql/Closing tables 4 +user4 stage/sql/Init 5 +user4 stage/sql/Init for update 1 user4 stage/sql/Opening tables 3 execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 12 -localhost stage/sql/closing tables 12 -localhost stage/sql/init 27 +localhost stage/sql/Checking permissions 12 +localhost stage/sql/Closing tables 16 +localhost stage/sql/Init 23 +localhost stage/sql/Init for update 4 localhost stage/sql/Opening tables 12 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 27 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 23 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 27 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 23 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -1546,39 +1612,46 @@ execute dump_stages_account; user host event_name count_star execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 3 -user1 stage/sql/closing tables 3 -user1 stage/sql/init 7 +user1 stage/sql/Checking permissions 3 +user1 stage/sql/Closing tables 4 +user1 stage/sql/Init 6 +user1 stage/sql/Init for update 1 user1 stage/sql/Opening tables 3 -user2 stage/sql/checking permissions 3 -user2 stage/sql/closing tables 3 -user2 stage/sql/init 7 +user2 stage/sql/Checking permissions 3 +user2 stage/sql/Closing tables 4 +user2 stage/sql/Init 6 +user2 stage/sql/Init for update 1 user2 stage/sql/Opening tables 3 -user3 stage/sql/checking permissions 3 -user3 stage/sql/closing tables 3 -user3 stage/sql/init 7 +user3 stage/sql/Checking permissions 3 +user3 stage/sql/Closing tables 4 +user3 stage/sql/Init 6 +user3 stage/sql/Init for update 1 user3 stage/sql/Opening tables 3 -user4 stage/sql/checking permissions 3 -user4 stage/sql/closing tables 3 -user4 stage/sql/init 7 +user4 stage/sql/Checking permissions 3 +user4 stage/sql/Closing tables 4 +user4 stage/sql/Init 6 +user4 stage/sql/Init for update 1 user4 stage/sql/Opening tables 3 execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 12 -localhost stage/sql/closing tables 12 -localhost stage/sql/init 28 +localhost stage/sql/Checking permissions 12 +localhost stage/sql/Closing tables 16 +localhost stage/sql/Init 24 +localhost stage/sql/Init for update 4 localhost stage/sql/Opening tables 12 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -1683,39 +1756,46 @@ execute dump_stages_account; user host event_name count_star execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 3 -user1 stage/sql/closing tables 3 -user1 stage/sql/init 7 +user1 stage/sql/Checking permissions 3 +user1 stage/sql/Closing tables 4 +user1 stage/sql/Init 6 +user1 stage/sql/Init for update 1 user1 stage/sql/Opening tables 3 -user2 stage/sql/checking permissions 3 -user2 stage/sql/closing tables 3 -user2 stage/sql/init 7 +user2 stage/sql/Checking permissions 3 +user2 stage/sql/Closing tables 4 +user2 stage/sql/Init 6 +user2 stage/sql/Init for update 1 user2 stage/sql/Opening tables 3 -user3 stage/sql/checking permissions 3 -user3 stage/sql/closing tables 3 -user3 stage/sql/init 7 +user3 stage/sql/Checking permissions 3 +user3 stage/sql/Closing tables 4 +user3 stage/sql/Init 6 +user3 stage/sql/Init for update 1 user3 stage/sql/Opening tables 3 -user4 stage/sql/checking permissions 3 -user4 stage/sql/closing tables 3 -user4 stage/sql/init 7 +user4 stage/sql/Checking permissions 3 +user4 stage/sql/Closing tables 4 +user4 stage/sql/Init 6 +user4 stage/sql/Init for update 1 user4 stage/sql/Opening tables 3 execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 12 -localhost stage/sql/closing tables 12 -localhost stage/sql/init 28 +localhost stage/sql/Checking permissions 12 +localhost stage/sql/Closing tables 16 +localhost stage/sql/Init 24 +localhost stage/sql/Init for update 4 localhost stage/sql/Opening tables 12 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -1819,39 +1899,46 @@ execute dump_stages_account; user host event_name count_star execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 3 -user1 stage/sql/closing tables 3 -user1 stage/sql/init 7 +user1 stage/sql/Checking permissions 3 +user1 stage/sql/Closing tables 4 +user1 stage/sql/Init 6 +user1 stage/sql/Init for update 1 user1 stage/sql/Opening tables 3 -user2 stage/sql/checking permissions 3 -user2 stage/sql/closing tables 3 -user2 stage/sql/init 7 +user2 stage/sql/Checking permissions 3 +user2 stage/sql/Closing tables 4 +user2 stage/sql/Init 6 +user2 stage/sql/Init for update 1 user2 stage/sql/Opening tables 3 -user3 stage/sql/checking permissions 3 -user3 stage/sql/closing tables 3 -user3 stage/sql/init 7 +user3 stage/sql/Checking permissions 3 +user3 stage/sql/Closing tables 4 +user3 stage/sql/Init 6 +user3 stage/sql/Init for update 1 user3 stage/sql/Opening tables 3 -user4 stage/sql/checking permissions 3 -user4 stage/sql/closing tables 3 -user4 stage/sql/init 7 +user4 stage/sql/Checking permissions 3 +user4 stage/sql/Closing tables 4 +user4 stage/sql/Init 6 +user4 stage/sql/Init for update 1 user4 stage/sql/Opening tables 3 execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 12 -localhost stage/sql/closing tables 12 -localhost stage/sql/init 28 +localhost stage/sql/Checking permissions 12 +localhost stage/sql/Closing tables 16 +localhost stage/sql/Init 24 +localhost stage/sql/Init for update 4 localhost stage/sql/Opening tables 12 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -1955,39 +2042,46 @@ execute dump_stages_account; user host event_name count_star execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 3 -user1 stage/sql/closing tables 3 -user1 stage/sql/init 7 +user1 stage/sql/Checking permissions 3 +user1 stage/sql/Closing tables 4 +user1 stage/sql/Init 6 +user1 stage/sql/Init for update 1 user1 stage/sql/Opening tables 3 -user2 stage/sql/checking permissions 3 -user2 stage/sql/closing tables 3 -user2 stage/sql/init 7 +user2 stage/sql/Checking permissions 3 +user2 stage/sql/Closing tables 4 +user2 stage/sql/Init 6 +user2 stage/sql/Init for update 1 user2 stage/sql/Opening tables 3 -user3 stage/sql/checking permissions 3 -user3 stage/sql/closing tables 3 -user3 stage/sql/init 7 +user3 stage/sql/Checking permissions 3 +user3 stage/sql/Closing tables 4 +user3 stage/sql/Init 6 +user3 stage/sql/Init for update 1 user3 stage/sql/Opening tables 3 -user4 stage/sql/checking permissions 3 -user4 stage/sql/closing tables 3 -user4 stage/sql/init 7 +user4 stage/sql/Checking permissions 3 +user4 stage/sql/Closing tables 4 +user4 stage/sql/Init 6 +user4 stage/sql/Init for update 1 user4 stage/sql/Opening tables 3 execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 12 -localhost stage/sql/closing tables 12 -localhost stage/sql/init 28 +localhost stage/sql/Checking permissions 12 +localhost stage/sql/Closing tables 16 +localhost stage/sql/Init 24 +localhost stage/sql/Init for update 4 localhost stage/sql/Opening tables 12 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -2091,39 +2185,46 @@ execute dump_stages_account; user host event_name count_star execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 3 -user1 stage/sql/closing tables 3 -user1 stage/sql/init 7 +user1 stage/sql/Checking permissions 3 +user1 stage/sql/Closing tables 4 +user1 stage/sql/Init 6 +user1 stage/sql/Init for update 1 user1 stage/sql/Opening tables 3 -user2 stage/sql/checking permissions 3 -user2 stage/sql/closing tables 3 -user2 stage/sql/init 7 +user2 stage/sql/Checking permissions 3 +user2 stage/sql/Closing tables 4 +user2 stage/sql/Init 6 +user2 stage/sql/Init for update 1 user2 stage/sql/Opening tables 3 -user3 stage/sql/checking permissions 3 -user3 stage/sql/closing tables 3 -user3 stage/sql/init 7 +user3 stage/sql/Checking permissions 3 +user3 stage/sql/Closing tables 4 +user3 stage/sql/Init 6 +user3 stage/sql/Init for update 1 user3 stage/sql/Opening tables 3 -user4 stage/sql/checking permissions 3 -user4 stage/sql/closing tables 3 -user4 stage/sql/init 7 +user4 stage/sql/Checking permissions 3 +user4 stage/sql/Closing tables 4 +user4 stage/sql/Init 6 +user4 stage/sql/Init for update 1 user4 stage/sql/Opening tables 3 execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 12 -localhost stage/sql/closing tables 12 -localhost stage/sql/init 28 +localhost stage/sql/Checking permissions 12 +localhost stage/sql/Closing tables 16 +localhost stage/sql/Init 24 +localhost stage/sql/Init for update 4 localhost stage/sql/Opening tables 12 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -2227,39 +2328,46 @@ execute dump_stages_account; user host event_name count_star execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 3 -user1 stage/sql/closing tables 3 -user1 stage/sql/init 7 +user1 stage/sql/Checking permissions 3 +user1 stage/sql/Closing tables 4 +user1 stage/sql/Init 6 +user1 stage/sql/Init for update 1 user1 stage/sql/Opening tables 3 -user2 stage/sql/checking permissions 3 -user2 stage/sql/closing tables 3 -user2 stage/sql/init 7 +user2 stage/sql/Checking permissions 3 +user2 stage/sql/Closing tables 4 +user2 stage/sql/Init 6 +user2 stage/sql/Init for update 1 user2 stage/sql/Opening tables 3 -user3 stage/sql/checking permissions 3 -user3 stage/sql/closing tables 3 -user3 stage/sql/init 7 +user3 stage/sql/Checking permissions 3 +user3 stage/sql/Closing tables 4 +user3 stage/sql/Init 6 +user3 stage/sql/Init for update 1 user3 stage/sql/Opening tables 3 -user4 stage/sql/checking permissions 3 -user4 stage/sql/closing tables 3 -user4 stage/sql/init 7 +user4 stage/sql/Checking permissions 3 +user4 stage/sql/Closing tables 4 +user4 stage/sql/Init 6 +user4 stage/sql/Init for update 1 user4 stage/sql/Opening tables 3 execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 12 -localhost stage/sql/closing tables 12 -localhost stage/sql/init 28 +localhost stage/sql/Checking permissions 12 +localhost stage/sql/Closing tables 16 +localhost stage/sql/Init 24 +localhost stage/sql/Init for update 4 localhost stage/sql/Opening tables 12 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -2363,39 +2471,46 @@ execute dump_stages_account; user host event_name count_star execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 3 -user1 stage/sql/closing tables 3 -user1 stage/sql/init 7 +user1 stage/sql/Checking permissions 3 +user1 stage/sql/Closing tables 4 +user1 stage/sql/Init 6 +user1 stage/sql/Init for update 1 user1 stage/sql/Opening tables 3 -user2 stage/sql/checking permissions 3 -user2 stage/sql/closing tables 3 -user2 stage/sql/init 7 +user2 stage/sql/Checking permissions 3 +user2 stage/sql/Closing tables 4 +user2 stage/sql/Init 6 +user2 stage/sql/Init for update 1 user2 stage/sql/Opening tables 3 -user3 stage/sql/checking permissions 3 -user3 stage/sql/closing tables 3 -user3 stage/sql/init 7 +user3 stage/sql/Checking permissions 3 +user3 stage/sql/Closing tables 4 +user3 stage/sql/Init 6 +user3 stage/sql/Init for update 1 user3 stage/sql/Opening tables 3 -user4 stage/sql/checking permissions 3 -user4 stage/sql/closing tables 3 -user4 stage/sql/init 7 +user4 stage/sql/Checking permissions 3 +user4 stage/sql/Closing tables 4 +user4 stage/sql/Init 6 +user4 stage/sql/Init for update 1 user4 stage/sql/Opening tables 3 execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 12 -localhost stage/sql/closing tables 12 -localhost stage/sql/init 28 +localhost stage/sql/Checking permissions 12 +localhost stage/sql/Closing tables 16 +localhost stage/sql/Init 24 +localhost stage/sql/Init for update 4 localhost stage/sql/Opening tables 12 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -2499,39 +2614,46 @@ execute dump_stages_account; user host event_name count_star execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 3 -user1 stage/sql/closing tables 3 -user1 stage/sql/init 7 +user1 stage/sql/Checking permissions 3 +user1 stage/sql/Closing tables 4 +user1 stage/sql/Init 6 +user1 stage/sql/Init for update 1 user1 stage/sql/Opening tables 3 -user2 stage/sql/checking permissions 3 -user2 stage/sql/closing tables 3 -user2 stage/sql/init 7 +user2 stage/sql/Checking permissions 3 +user2 stage/sql/Closing tables 4 +user2 stage/sql/Init 6 +user2 stage/sql/Init for update 1 user2 stage/sql/Opening tables 3 -user3 stage/sql/checking permissions 3 -user3 stage/sql/closing tables 3 -user3 stage/sql/init 7 +user3 stage/sql/Checking permissions 3 +user3 stage/sql/Closing tables 4 +user3 stage/sql/Init 6 +user3 stage/sql/Init for update 1 user3 stage/sql/Opening tables 3 -user4 stage/sql/checking permissions 3 -user4 stage/sql/closing tables 3 -user4 stage/sql/init 7 +user4 stage/sql/Checking permissions 3 +user4 stage/sql/Closing tables 4 +user4 stage/sql/Init 6 +user4 stage/sql/Init for update 1 user4 stage/sql/Opening tables 3 execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 12 -localhost stage/sql/closing tables 12 -localhost stage/sql/init 28 +localhost stage/sql/Checking permissions 12 +localhost stage/sql/Closing tables 16 +localhost stage/sql/Init 24 +localhost stage/sql/Init for update 4 localhost stage/sql/Opening tables 12 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -2635,39 +2757,46 @@ execute dump_stages_account; user host event_name count_star execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 0 -user1 stage/sql/closing tables 0 -user1 stage/sql/init 0 +user1 stage/sql/Checking permissions 0 +user1 stage/sql/Closing tables 0 +user1 stage/sql/Init 0 +user1 stage/sql/Init for update 0 user1 stage/sql/Opening tables 0 -user2 stage/sql/checking permissions 0 -user2 stage/sql/closing tables 0 -user2 stage/sql/init 0 +user2 stage/sql/Checking permissions 0 +user2 stage/sql/Closing tables 0 +user2 stage/sql/Init 0 +user2 stage/sql/Init for update 0 user2 stage/sql/Opening tables 0 -user3 stage/sql/checking permissions 0 -user3 stage/sql/closing tables 0 -user3 stage/sql/init 0 +user3 stage/sql/Checking permissions 0 +user3 stage/sql/Closing tables 0 +user3 stage/sql/Init 0 +user3 stage/sql/Init for update 0 user3 stage/sql/Opening tables 0 -user4 stage/sql/checking permissions 0 -user4 stage/sql/closing tables 0 -user4 stage/sql/init 0 +user4 stage/sql/Checking permissions 0 +user4 stage/sql/Closing tables 0 +user4 stage/sql/Init 0 +user4 stage/sql/Init for update 0 user4 stage/sql/Opening tables 0 execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 12 -localhost stage/sql/closing tables 12 -localhost stage/sql/init 28 +localhost stage/sql/Checking permissions 12 +localhost stage/sql/Closing tables 16 +localhost stage/sql/Init 24 +localhost stage/sql/Init for update 4 localhost stage/sql/Opening tables 12 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -2771,39 +2900,46 @@ execute dump_stages_account; user host event_name count_star execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 0 -user1 stage/sql/closing tables 0 -user1 stage/sql/init 0 +user1 stage/sql/Checking permissions 0 +user1 stage/sql/Closing tables 0 +user1 stage/sql/Init 0 +user1 stage/sql/Init for update 0 user1 stage/sql/Opening tables 0 -user2 stage/sql/checking permissions 0 -user2 stage/sql/closing tables 0 -user2 stage/sql/init 0 +user2 stage/sql/Checking permissions 0 +user2 stage/sql/Closing tables 0 +user2 stage/sql/Init 0 +user2 stage/sql/Init for update 0 user2 stage/sql/Opening tables 0 -user3 stage/sql/checking permissions 0 -user3 stage/sql/closing tables 0 -user3 stage/sql/init 0 +user3 stage/sql/Checking permissions 0 +user3 stage/sql/Closing tables 0 +user3 stage/sql/Init 0 +user3 stage/sql/Init for update 0 user3 stage/sql/Opening tables 0 -user4 stage/sql/checking permissions 0 -user4 stage/sql/closing tables 0 -user4 stage/sql/init 0 +user4 stage/sql/Checking permissions 0 +user4 stage/sql/Closing tables 0 +user4 stage/sql/Init 0 +user4 stage/sql/Init for update 0 user4 stage/sql/Opening tables 0 execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 0 -localhost stage/sql/closing tables 0 -localhost stage/sql/init 0 +localhost stage/sql/Checking permissions 0 +localhost stage/sql/Closing tables 0 +localhost stage/sql/Init 0 +localhost stage/sql/Init for update 0 localhost stage/sql/Opening tables 0 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -2907,39 +3043,46 @@ execute dump_stages_account; user host event_name count_star execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 0 -user1 stage/sql/closing tables 0 -user1 stage/sql/init 0 +user1 stage/sql/Checking permissions 0 +user1 stage/sql/Closing tables 0 +user1 stage/sql/Init 0 +user1 stage/sql/Init for update 0 user1 stage/sql/Opening tables 0 -user2 stage/sql/checking permissions 0 -user2 stage/sql/closing tables 0 -user2 stage/sql/init 0 +user2 stage/sql/Checking permissions 0 +user2 stage/sql/Closing tables 0 +user2 stage/sql/Init 0 +user2 stage/sql/Init for update 0 user2 stage/sql/Opening tables 0 -user3 stage/sql/checking permissions 0 -user3 stage/sql/closing tables 0 -user3 stage/sql/init 0 +user3 stage/sql/Checking permissions 0 +user3 stage/sql/Closing tables 0 +user3 stage/sql/Init 0 +user3 stage/sql/Init for update 0 user3 stage/sql/Opening tables 0 -user4 stage/sql/checking permissions 0 -user4 stage/sql/closing tables 0 -user4 stage/sql/init 0 +user4 stage/sql/Checking permissions 0 +user4 stage/sql/Closing tables 0 +user4 stage/sql/Init 0 +user4 stage/sql/Init for update 0 user4 stage/sql/Opening tables 0 execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 0 -localhost stage/sql/closing tables 0 -localhost stage/sql/init 0 +localhost stage/sql/Checking permissions 0 +localhost stage/sql/Closing tables 0 +localhost stage/sql/Init 0 +localhost stage/sql/Init for update 0 localhost stage/sql/Opening tables 0 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 0 -stage/sql/closing tables 0 -stage/sql/init 0 +stage/sql/Checking permissions 0 +stage/sql/Closing tables 0 +stage/sql/Init 0 +stage/sql/Init for update 0 stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -3043,39 +3186,46 @@ execute dump_stages_account; user host event_name count_star execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 0 -user1 stage/sql/closing tables 0 -user1 stage/sql/init 0 +user1 stage/sql/Checking permissions 0 +user1 stage/sql/Closing tables 0 +user1 stage/sql/Init 0 +user1 stage/sql/Init for update 0 user1 stage/sql/Opening tables 0 -user2 stage/sql/checking permissions 0 -user2 stage/sql/closing tables 0 -user2 stage/sql/init 0 +user2 stage/sql/Checking permissions 0 +user2 stage/sql/Closing tables 0 +user2 stage/sql/Init 0 +user2 stage/sql/Init for update 0 user2 stage/sql/Opening tables 0 -user3 stage/sql/checking permissions 0 -user3 stage/sql/closing tables 0 -user3 stage/sql/init 0 +user3 stage/sql/Checking permissions 0 +user3 stage/sql/Closing tables 0 +user3 stage/sql/Init 0 +user3 stage/sql/Init for update 0 user3 stage/sql/Opening tables 0 -user4 stage/sql/checking permissions 0 -user4 stage/sql/closing tables 0 -user4 stage/sql/init 0 +user4 stage/sql/Checking permissions 0 +user4 stage/sql/Closing tables 0 +user4 stage/sql/Init 0 +user4 stage/sql/Init for update 0 user4 stage/sql/Opening tables 0 execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 0 -localhost stage/sql/closing tables 0 -localhost stage/sql/init 0 +localhost stage/sql/Checking permissions 0 +localhost stage/sql/Closing tables 0 +localhost stage/sql/Init 0 +localhost stage/sql/Init for update 0 localhost stage/sql/Opening tables 0 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 0 -stage/sql/closing tables 0 -stage/sql/init 0 +stage/sql/Checking permissions 0 +stage/sql/Closing tables 0 +stage/sql/Init 0 +stage/sql/Init for update 0 stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -3179,39 +3329,46 @@ execute dump_stages_account; user host event_name count_star execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 0 -user1 stage/sql/closing tables 0 -user1 stage/sql/init 0 +user1 stage/sql/Checking permissions 0 +user1 stage/sql/Closing tables 0 +user1 stage/sql/Init 0 +user1 stage/sql/Init for update 0 user1 stage/sql/Opening tables 0 -user2 stage/sql/checking permissions 0 -user2 stage/sql/closing tables 0 -user2 stage/sql/init 0 +user2 stage/sql/Checking permissions 0 +user2 stage/sql/Closing tables 0 +user2 stage/sql/Init 0 +user2 stage/sql/Init for update 0 user2 stage/sql/Opening tables 0 -user3 stage/sql/checking permissions 0 -user3 stage/sql/closing tables 0 -user3 stage/sql/init 0 +user3 stage/sql/Checking permissions 0 +user3 stage/sql/Closing tables 0 +user3 stage/sql/Init 0 +user3 stage/sql/Init for update 0 user3 stage/sql/Opening tables 0 -user4 stage/sql/checking permissions 0 -user4 stage/sql/closing tables 0 -user4 stage/sql/init 0 +user4 stage/sql/Checking permissions 0 +user4 stage/sql/Closing tables 0 +user4 stage/sql/Init 0 +user4 stage/sql/Init for update 0 user4 stage/sql/Opening tables 0 execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 0 -localhost stage/sql/closing tables 0 -localhost stage/sql/init 0 +localhost stage/sql/Checking permissions 0 +localhost stage/sql/Closing tables 0 +localhost stage/sql/Init 0 +localhost stage/sql/Init for update 0 localhost stage/sql/Opening tables 0 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 0 -stage/sql/closing tables 0 -stage/sql/init 0 +stage/sql/Checking permissions 0 +stage/sql/Closing tables 0 +stage/sql/Init 0 +stage/sql/Init for update 0 stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -3315,39 +3472,46 @@ execute dump_stages_account; user host event_name count_star execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 0 -user1 stage/sql/closing tables 0 -user1 stage/sql/init 0 +user1 stage/sql/Checking permissions 0 +user1 stage/sql/Closing tables 0 +user1 stage/sql/Init 0 +user1 stage/sql/Init for update 0 user1 stage/sql/Opening tables 0 -user2 stage/sql/checking permissions 0 -user2 stage/sql/closing tables 0 -user2 stage/sql/init 0 +user2 stage/sql/Checking permissions 0 +user2 stage/sql/Closing tables 0 +user2 stage/sql/Init 0 +user2 stage/sql/Init for update 0 user2 stage/sql/Opening tables 0 -user3 stage/sql/checking permissions 0 -user3 stage/sql/closing tables 0 -user3 stage/sql/init 0 +user3 stage/sql/Checking permissions 0 +user3 stage/sql/Closing tables 0 +user3 stage/sql/Init 0 +user3 stage/sql/Init for update 0 user3 stage/sql/Opening tables 0 -user4 stage/sql/checking permissions 0 -user4 stage/sql/closing tables 0 -user4 stage/sql/init 0 +user4 stage/sql/Checking permissions 0 +user4 stage/sql/Closing tables 0 +user4 stage/sql/Init 0 +user4 stage/sql/Init for update 0 user4 stage/sql/Opening tables 0 execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 0 -localhost stage/sql/closing tables 0 -localhost stage/sql/init 0 +localhost stage/sql/Checking permissions 0 +localhost stage/sql/Closing tables 0 +localhost stage/sql/Init 0 +localhost stage/sql/Init for update 0 localhost stage/sql/Opening tables 0 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 0 -stage/sql/closing tables 0 -stage/sql/init 0 +stage/sql/Checking permissions 0 +stage/sql/Closing tables 0 +stage/sql/Init 0 +stage/sql/Init for update 0 stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -3451,39 +3615,46 @@ execute dump_stages_account; user host event_name count_star execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 0 -user1 stage/sql/closing tables 0 -user1 stage/sql/init 0 +user1 stage/sql/Checking permissions 0 +user1 stage/sql/Closing tables 0 +user1 stage/sql/Init 0 +user1 stage/sql/Init for update 0 user1 stage/sql/Opening tables 0 -user2 stage/sql/checking permissions 0 -user2 stage/sql/closing tables 0 -user2 stage/sql/init 0 +user2 stage/sql/Checking permissions 0 +user2 stage/sql/Closing tables 0 +user2 stage/sql/Init 0 +user2 stage/sql/Init for update 0 user2 stage/sql/Opening tables 0 -user3 stage/sql/checking permissions 0 -user3 stage/sql/closing tables 0 -user3 stage/sql/init 0 +user3 stage/sql/Checking permissions 0 +user3 stage/sql/Closing tables 0 +user3 stage/sql/Init 0 +user3 stage/sql/Init for update 0 user3 stage/sql/Opening tables 0 -user4 stage/sql/checking permissions 0 -user4 stage/sql/closing tables 0 -user4 stage/sql/init 0 +user4 stage/sql/Checking permissions 0 +user4 stage/sql/Closing tables 0 +user4 stage/sql/Init 0 +user4 stage/sql/Init for update 0 user4 stage/sql/Opening tables 0 execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 0 -localhost stage/sql/closing tables 0 -localhost stage/sql/init 0 +localhost stage/sql/Checking permissions 0 +localhost stage/sql/Closing tables 0 +localhost stage/sql/Init 0 +localhost stage/sql/Init for update 0 localhost stage/sql/Opening tables 0 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 0 -stage/sql/closing tables 0 -stage/sql/init 0 +stage/sql/Checking permissions 0 +stage/sql/Closing tables 0 +stage/sql/Init 0 +stage/sql/Init for update 0 stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -3587,39 +3758,46 @@ execute dump_stages_account; user host event_name count_star execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 0 -user1 stage/sql/closing tables 0 -user1 stage/sql/init 0 +user1 stage/sql/Checking permissions 0 +user1 stage/sql/Closing tables 0 +user1 stage/sql/Init 0 +user1 stage/sql/Init for update 0 user1 stage/sql/Opening tables 0 -user2 stage/sql/checking permissions 0 -user2 stage/sql/closing tables 0 -user2 stage/sql/init 0 +user2 stage/sql/Checking permissions 0 +user2 stage/sql/Closing tables 0 +user2 stage/sql/Init 0 +user2 stage/sql/Init for update 0 user2 stage/sql/Opening tables 0 -user3 stage/sql/checking permissions 0 -user3 stage/sql/closing tables 0 -user3 stage/sql/init 0 +user3 stage/sql/Checking permissions 0 +user3 stage/sql/Closing tables 0 +user3 stage/sql/Init 0 +user3 stage/sql/Init for update 0 user3 stage/sql/Opening tables 0 -user4 stage/sql/checking permissions 0 -user4 stage/sql/closing tables 0 -user4 stage/sql/init 0 +user4 stage/sql/Checking permissions 0 +user4 stage/sql/Closing tables 0 +user4 stage/sql/Init 0 +user4 stage/sql/Init for update 0 user4 stage/sql/Opening tables 0 execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 0 -localhost stage/sql/closing tables 0 -localhost stage/sql/init 0 +localhost stage/sql/Checking permissions 0 +localhost stage/sql/Closing tables 0 +localhost stage/sql/Init 0 +localhost stage/sql/Init for update 0 localhost stage/sql/Opening tables 0 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 0 -stage/sql/closing tables 0 -stage/sql/init 0 +stage/sql/Checking permissions 0 +stage/sql/Closing tables 0 +stage/sql/Init 0 +stage/sql/Init for update 0 stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -3723,39 +3901,46 @@ execute dump_stages_account; user host event_name count_star execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 0 -user1 stage/sql/closing tables 0 -user1 stage/sql/init 0 +user1 stage/sql/Checking permissions 0 +user1 stage/sql/Closing tables 0 +user1 stage/sql/Init 0 +user1 stage/sql/Init for update 0 user1 stage/sql/Opening tables 0 -user2 stage/sql/checking permissions 0 -user2 stage/sql/closing tables 0 -user2 stage/sql/init 0 +user2 stage/sql/Checking permissions 0 +user2 stage/sql/Closing tables 0 +user2 stage/sql/Init 0 +user2 stage/sql/Init for update 0 user2 stage/sql/Opening tables 0 -user3 stage/sql/checking permissions 0 -user3 stage/sql/closing tables 0 -user3 stage/sql/init 0 +user3 stage/sql/Checking permissions 0 +user3 stage/sql/Closing tables 0 +user3 stage/sql/Init 0 +user3 stage/sql/Init for update 0 user3 stage/sql/Opening tables 0 -user4 stage/sql/checking permissions 0 -user4 stage/sql/closing tables 0 -user4 stage/sql/init 0 +user4 stage/sql/Checking permissions 0 +user4 stage/sql/Closing tables 0 +user4 stage/sql/Init 0 +user4 stage/sql/Init for update 0 user4 stage/sql/Opening tables 0 execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 0 -localhost stage/sql/closing tables 0 -localhost stage/sql/init 0 +localhost stage/sql/Checking permissions 0 +localhost stage/sql/Closing tables 0 +localhost stage/sql/Init 0 +localhost stage/sql/Init for update 0 localhost stage/sql/Opening tables 0 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 0 -stage/sql/closing tables 0 -stage/sql/init 0 +stage/sql/Checking permissions 0 +stage/sql/Closing tables 0 +stage/sql/Init 0 +stage/sql/Init for update 0 stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -3845,21 +4030,24 @@ execute dump_stages_user; user event_name count_star execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 0 -localhost stage/sql/closing tables 0 -localhost stage/sql/init 0 +localhost stage/sql/Checking permissions 0 +localhost stage/sql/Closing tables 0 +localhost stage/sql/Init 0 +localhost stage/sql/Init for update 0 localhost stage/sql/Opening tables 0 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 0 -stage/sql/closing tables 0 -stage/sql/init 0 +stage/sql/Checking permissions 0 +stage/sql/Closing tables 0 +stage/sql/Init 0 +stage/sql/Init for update 0 stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -3929,21 +4117,24 @@ execute dump_stages_user; user event_name count_star execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 0 -localhost stage/sql/closing tables 0 -localhost stage/sql/init 0 +localhost stage/sql/Checking permissions 0 +localhost stage/sql/Closing tables 0 +localhost stage/sql/Init 0 +localhost stage/sql/Init for update 0 localhost stage/sql/Opening tables 0 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 0 -stage/sql/closing tables 0 -stage/sql/init 0 +stage/sql/Checking permissions 0 +stage/sql/Closing tables 0 +stage/sql/Init 0 +stage/sql/Init for update 0 stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star 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 c8a9233e2a6..083e1bffdd2 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 @@ -30,9 +30,10 @@ execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/checking permissions 0 -stage/sql/closing tables 0 -stage/sql/init 0 +stage/sql/Checking permissions 0 +stage/sql/Closing tables 0 +stage/sql/Init 0 +stage/sql/Init for update 0 stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) @@ -95,17 +96,19 @@ execute dump_stages_account; user host event_name count_star execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 0 -user1 stage/sql/closing tables 0 -user1 stage/sql/init 0 +user1 stage/sql/Checking permissions 0 +user1 stage/sql/Closing tables 0 +user1 stage/sql/Init 0 +user1 stage/sql/Init for update 0 user1 stage/sql/Opening tables 0 execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/checking permissions 0 -stage/sql/closing tables 0 -stage/sql/init 0 +stage/sql/Checking permissions 0 +stage/sql/Closing tables 0 +stage/sql/Init 0 +stage/sql/Init for update 0 stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) @@ -181,23 +184,26 @@ execute dump_stages_account; user host event_name count_star execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 3 -user1 stage/sql/closing tables 3 -user1 stage/sql/init 6 +user1 stage/sql/Checking permissions 3 +user1 stage/sql/Closing tables 4 +user1 stage/sql/Init 5 +user1 stage/sql/Init for update 1 user1 stage/sql/Opening tables 3 execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/checking permissions 3 -stage/sql/closing tables 3 -stage/sql/init 6 +stage/sql/Checking permissions 3 +stage/sql/Closing tables 4 +stage/sql/Init 5 +stage/sql/Init for update 1 stage/sql/Opening tables 3 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 3 -stage/sql/closing tables 3 -stage/sql/init 6 +stage/sql/Checking permissions 3 +stage/sql/Closing tables 4 +stage/sql/Init 5 +stage/sql/Init for update 1 stage/sql/Opening tables 3 execute dump_statements_account; user host event_name count_star @@ -273,27 +279,31 @@ execute dump_stages_account; user host event_name count_star execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 3 -user1 stage/sql/closing tables 3 -user1 stage/sql/init 6 +user1 stage/sql/Checking permissions 3 +user1 stage/sql/Closing tables 4 +user1 stage/sql/Init 5 +user1 stage/sql/Init for update 1 user1 stage/sql/Opening tables 3 -user2 stage/sql/checking permissions 0 -user2 stage/sql/closing tables 0 -user2 stage/sql/init 0 +user2 stage/sql/Checking permissions 0 +user2 stage/sql/Closing tables 0 +user2 stage/sql/Init 0 +user2 stage/sql/Init for update 0 user2 stage/sql/Opening tables 0 execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/checking permissions 3 -stage/sql/closing tables 3 -stage/sql/init 6 +stage/sql/Checking permissions 3 +stage/sql/Closing tables 4 +stage/sql/Init 5 +stage/sql/Init for update 1 stage/sql/Opening tables 3 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 3 -stage/sql/closing tables 3 -stage/sql/init 6 +stage/sql/Checking permissions 3 +stage/sql/Closing tables 4 +stage/sql/Init 5 +stage/sql/Init for update 1 stage/sql/Opening tables 3 execute dump_statements_account; user host event_name count_star @@ -381,27 +391,31 @@ execute dump_stages_account; user host event_name count_star execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 3 -user1 stage/sql/closing tables 3 -user1 stage/sql/init 6 +user1 stage/sql/Checking permissions 3 +user1 stage/sql/Closing tables 4 +user1 stage/sql/Init 5 +user1 stage/sql/Init for update 1 user1 stage/sql/Opening tables 3 -user2 stage/sql/checking permissions 3 -user2 stage/sql/closing tables 3 -user2 stage/sql/init 6 +user2 stage/sql/Checking permissions 3 +user2 stage/sql/Closing tables 4 +user2 stage/sql/Init 5 +user2 stage/sql/Init for update 1 user2 stage/sql/Opening tables 3 execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/checking permissions 6 -stage/sql/closing tables 6 -stage/sql/init 12 +stage/sql/Checking permissions 6 +stage/sql/Closing tables 8 +stage/sql/Init 10 +stage/sql/Init for update 2 stage/sql/Opening tables 6 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 6 -stage/sql/closing tables 6 -stage/sql/init 12 +stage/sql/Checking permissions 6 +stage/sql/Closing tables 8 +stage/sql/Init 10 +stage/sql/Init for update 2 stage/sql/Opening tables 6 execute dump_statements_account; user host event_name count_star @@ -489,31 +503,36 @@ execute dump_stages_account; user host event_name count_star execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 3 -user1 stage/sql/closing tables 3 -user1 stage/sql/init 6 +user1 stage/sql/Checking permissions 3 +user1 stage/sql/Closing tables 4 +user1 stage/sql/Init 5 +user1 stage/sql/Init for update 1 user1 stage/sql/Opening tables 3 -user2 stage/sql/checking permissions 3 -user2 stage/sql/closing tables 3 -user2 stage/sql/init 6 +user2 stage/sql/Checking permissions 3 +user2 stage/sql/Closing tables 4 +user2 stage/sql/Init 5 +user2 stage/sql/Init for update 1 user2 stage/sql/Opening tables 3 -user3 stage/sql/checking permissions 0 -user3 stage/sql/closing tables 0 -user3 stage/sql/init 0 +user3 stage/sql/Checking permissions 0 +user3 stage/sql/Closing tables 0 +user3 stage/sql/Init 0 +user3 stage/sql/Init for update 0 user3 stage/sql/Opening tables 0 execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/checking permissions 6 -stage/sql/closing tables 6 -stage/sql/init 12 +stage/sql/Checking permissions 6 +stage/sql/Closing tables 8 +stage/sql/Init 10 +stage/sql/Init for update 2 stage/sql/Opening tables 6 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 6 -stage/sql/closing tables 6 -stage/sql/init 12 +stage/sql/Checking permissions 6 +stage/sql/Closing tables 8 +stage/sql/Init 10 +stage/sql/Init for update 2 stage/sql/Opening tables 6 execute dump_statements_account; user host event_name count_star @@ -613,31 +632,36 @@ execute dump_stages_account; user host event_name count_star execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 3 -user1 stage/sql/closing tables 3 -user1 stage/sql/init 6 +user1 stage/sql/Checking permissions 3 +user1 stage/sql/Closing tables 4 +user1 stage/sql/Init 5 +user1 stage/sql/Init for update 1 user1 stage/sql/Opening tables 3 -user2 stage/sql/checking permissions 3 -user2 stage/sql/closing tables 3 -user2 stage/sql/init 6 +user2 stage/sql/Checking permissions 3 +user2 stage/sql/Closing tables 4 +user2 stage/sql/Init 5 +user2 stage/sql/Init for update 1 user2 stage/sql/Opening tables 3 -user3 stage/sql/checking permissions 3 -user3 stage/sql/closing tables 3 -user3 stage/sql/init 6 +user3 stage/sql/Checking permissions 3 +user3 stage/sql/Closing tables 4 +user3 stage/sql/Init 5 +user3 stage/sql/Init for update 1 user3 stage/sql/Opening tables 3 execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/checking permissions 9 -stage/sql/closing tables 9 -stage/sql/init 18 +stage/sql/Checking permissions 9 +stage/sql/Closing tables 12 +stage/sql/Init 15 +stage/sql/Init for update 3 stage/sql/Opening tables 9 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 9 -stage/sql/closing tables 9 -stage/sql/init 18 +stage/sql/Checking permissions 9 +stage/sql/Closing tables 12 +stage/sql/Init 15 +stage/sql/Init for update 3 stage/sql/Opening tables 9 execute dump_statements_account; user host event_name count_star @@ -737,35 +761,41 @@ execute dump_stages_account; user host event_name count_star execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 3 -user1 stage/sql/closing tables 3 -user1 stage/sql/init 6 +user1 stage/sql/Checking permissions 3 +user1 stage/sql/Closing tables 4 +user1 stage/sql/Init 5 +user1 stage/sql/Init for update 1 user1 stage/sql/Opening tables 3 -user2 stage/sql/checking permissions 3 -user2 stage/sql/closing tables 3 -user2 stage/sql/init 6 +user2 stage/sql/Checking permissions 3 +user2 stage/sql/Closing tables 4 +user2 stage/sql/Init 5 +user2 stage/sql/Init for update 1 user2 stage/sql/Opening tables 3 -user3 stage/sql/checking permissions 3 -user3 stage/sql/closing tables 3 -user3 stage/sql/init 6 +user3 stage/sql/Checking permissions 3 +user3 stage/sql/Closing tables 4 +user3 stage/sql/Init 5 +user3 stage/sql/Init for update 1 user3 stage/sql/Opening tables 3 -user4 stage/sql/checking permissions 0 -user4 stage/sql/closing tables 0 -user4 stage/sql/init 0 +user4 stage/sql/Checking permissions 0 +user4 stage/sql/Closing tables 0 +user4 stage/sql/Init 0 +user4 stage/sql/Init for update 0 user4 stage/sql/Opening tables 0 execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/checking permissions 9 -stage/sql/closing tables 9 -stage/sql/init 18 +stage/sql/Checking permissions 9 +stage/sql/Closing tables 12 +stage/sql/Init 15 +stage/sql/Init for update 3 stage/sql/Opening tables 9 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 9 -stage/sql/closing tables 9 -stage/sql/init 18 +stage/sql/Checking permissions 9 +stage/sql/Closing tables 12 +stage/sql/Init 15 +stage/sql/Init for update 3 stage/sql/Opening tables 9 execute dump_statements_account; user host event_name count_star @@ -877,35 +907,41 @@ execute dump_stages_account; user host event_name count_star execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 3 -user1 stage/sql/closing tables 3 -user1 stage/sql/init 6 +user1 stage/sql/Checking permissions 3 +user1 stage/sql/Closing tables 4 +user1 stage/sql/Init 5 +user1 stage/sql/Init for update 1 user1 stage/sql/Opening tables 3 -user2 stage/sql/checking permissions 3 -user2 stage/sql/closing tables 3 -user2 stage/sql/init 6 +user2 stage/sql/Checking permissions 3 +user2 stage/sql/Closing tables 4 +user2 stage/sql/Init 5 +user2 stage/sql/Init for update 1 user2 stage/sql/Opening tables 3 -user3 stage/sql/checking permissions 3 -user3 stage/sql/closing tables 3 -user3 stage/sql/init 6 +user3 stage/sql/Checking permissions 3 +user3 stage/sql/Closing tables 4 +user3 stage/sql/Init 5 +user3 stage/sql/Init for update 1 user3 stage/sql/Opening tables 3 -user4 stage/sql/checking permissions 3 -user4 stage/sql/closing tables 3 -user4 stage/sql/init 6 +user4 stage/sql/Checking permissions 3 +user4 stage/sql/Closing tables 4 +user4 stage/sql/Init 5 +user4 stage/sql/Init for update 1 user4 stage/sql/Opening tables 3 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 12 -stage/sql/init 24 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 20 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 24 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 20 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -1008,35 +1044,41 @@ execute dump_stages_account; user host event_name count_star execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 3 -user1 stage/sql/closing tables 3 -user1 stage/sql/init 7 +user1 stage/sql/Checking permissions 3 +user1 stage/sql/Closing tables 4 +user1 stage/sql/Init 6 +user1 stage/sql/Init for update 1 user1 stage/sql/Opening tables 3 -user2 stage/sql/checking permissions 3 -user2 stage/sql/closing tables 3 -user2 stage/sql/init 6 +user2 stage/sql/Checking permissions 3 +user2 stage/sql/Closing tables 4 +user2 stage/sql/Init 5 +user2 stage/sql/Init for update 1 user2 stage/sql/Opening tables 3 -user3 stage/sql/checking permissions 3 -user3 stage/sql/closing tables 3 -user3 stage/sql/init 6 +user3 stage/sql/Checking permissions 3 +user3 stage/sql/Closing tables 4 +user3 stage/sql/Init 5 +user3 stage/sql/Init for update 1 user3 stage/sql/Opening tables 3 -user4 stage/sql/checking permissions 3 -user4 stage/sql/closing tables 3 -user4 stage/sql/init 6 +user4 stage/sql/Checking permissions 3 +user4 stage/sql/Closing tables 4 +user4 stage/sql/Init 5 +user4 stage/sql/Init for update 1 user4 stage/sql/Opening tables 3 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 12 -stage/sql/init 25 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 21 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 25 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 21 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -1137,35 +1179,41 @@ execute dump_stages_account; user host event_name count_star execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 3 -user1 stage/sql/closing tables 3 -user1 stage/sql/init 7 +user1 stage/sql/Checking permissions 3 +user1 stage/sql/Closing tables 4 +user1 stage/sql/Init 6 +user1 stage/sql/Init for update 1 user1 stage/sql/Opening tables 3 -user2 stage/sql/checking permissions 3 -user2 stage/sql/closing tables 3 -user2 stage/sql/init 7 +user2 stage/sql/Checking permissions 3 +user2 stage/sql/Closing tables 4 +user2 stage/sql/Init 6 +user2 stage/sql/Init for update 1 user2 stage/sql/Opening tables 3 -user3 stage/sql/checking permissions 3 -user3 stage/sql/closing tables 3 -user3 stage/sql/init 6 +user3 stage/sql/Checking permissions 3 +user3 stage/sql/Closing tables 4 +user3 stage/sql/Init 5 +user3 stage/sql/Init for update 1 user3 stage/sql/Opening tables 3 -user4 stage/sql/checking permissions 3 -user4 stage/sql/closing tables 3 -user4 stage/sql/init 6 +user4 stage/sql/Checking permissions 3 +user4 stage/sql/Closing tables 4 +user4 stage/sql/Init 5 +user4 stage/sql/Init for update 1 user4 stage/sql/Opening tables 3 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 12 -stage/sql/init 26 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 22 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 26 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 22 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -1263,35 +1311,41 @@ execute dump_stages_account; user host event_name count_star execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 3 -user1 stage/sql/closing tables 3 -user1 stage/sql/init 7 +user1 stage/sql/Checking permissions 3 +user1 stage/sql/Closing tables 4 +user1 stage/sql/Init 6 +user1 stage/sql/Init for update 1 user1 stage/sql/Opening tables 3 -user2 stage/sql/checking permissions 3 -user2 stage/sql/closing tables 3 -user2 stage/sql/init 7 +user2 stage/sql/Checking permissions 3 +user2 stage/sql/Closing tables 4 +user2 stage/sql/Init 6 +user2 stage/sql/Init for update 1 user2 stage/sql/Opening tables 3 -user3 stage/sql/checking permissions 3 -user3 stage/sql/closing tables 3 -user3 stage/sql/init 7 +user3 stage/sql/Checking permissions 3 +user3 stage/sql/Closing tables 4 +user3 stage/sql/Init 6 +user3 stage/sql/Init for update 1 user3 stage/sql/Opening tables 3 -user4 stage/sql/checking permissions 3 -user4 stage/sql/closing tables 3 -user4 stage/sql/init 6 +user4 stage/sql/Checking permissions 3 +user4 stage/sql/Closing tables 4 +user4 stage/sql/Init 5 +user4 stage/sql/Init for update 1 user4 stage/sql/Opening tables 3 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 12 -stage/sql/init 27 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 23 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 27 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 23 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -1386,35 +1440,41 @@ execute dump_stages_account; user host event_name count_star execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 3 -user1 stage/sql/closing tables 3 -user1 stage/sql/init 7 +user1 stage/sql/Checking permissions 3 +user1 stage/sql/Closing tables 4 +user1 stage/sql/Init 6 +user1 stage/sql/Init for update 1 user1 stage/sql/Opening tables 3 -user2 stage/sql/checking permissions 3 -user2 stage/sql/closing tables 3 -user2 stage/sql/init 7 +user2 stage/sql/Checking permissions 3 +user2 stage/sql/Closing tables 4 +user2 stage/sql/Init 6 +user2 stage/sql/Init for update 1 user2 stage/sql/Opening tables 3 -user3 stage/sql/checking permissions 3 -user3 stage/sql/closing tables 3 -user3 stage/sql/init 7 +user3 stage/sql/Checking permissions 3 +user3 stage/sql/Closing tables 4 +user3 stage/sql/Init 6 +user3 stage/sql/Init for update 1 user3 stage/sql/Opening tables 3 -user4 stage/sql/checking permissions 3 -user4 stage/sql/closing tables 3 -user4 stage/sql/init 7 +user4 stage/sql/Checking permissions 3 +user4 stage/sql/Closing tables 4 +user4 stage/sql/Init 6 +user4 stage/sql/Init for update 1 user4 stage/sql/Opening tables 3 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 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -1510,35 +1570,41 @@ execute dump_stages_account; user host event_name count_star execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 3 -user1 stage/sql/closing tables 3 -user1 stage/sql/init 7 +user1 stage/sql/Checking permissions 3 +user1 stage/sql/Closing tables 4 +user1 stage/sql/Init 6 +user1 stage/sql/Init for update 1 user1 stage/sql/Opening tables 3 -user2 stage/sql/checking permissions 3 -user2 stage/sql/closing tables 3 -user2 stage/sql/init 7 +user2 stage/sql/Checking permissions 3 +user2 stage/sql/Closing tables 4 +user2 stage/sql/Init 6 +user2 stage/sql/Init for update 1 user2 stage/sql/Opening tables 3 -user3 stage/sql/checking permissions 3 -user3 stage/sql/closing tables 3 -user3 stage/sql/init 7 +user3 stage/sql/Checking permissions 3 +user3 stage/sql/Closing tables 4 +user3 stage/sql/Init 6 +user3 stage/sql/Init for update 1 user3 stage/sql/Opening tables 3 -user4 stage/sql/checking permissions 3 -user4 stage/sql/closing tables 3 -user4 stage/sql/init 7 +user4 stage/sql/Checking permissions 3 +user4 stage/sql/Closing tables 4 +user4 stage/sql/Init 6 +user4 stage/sql/Init for update 1 user4 stage/sql/Opening tables 3 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 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -1633,35 +1699,41 @@ execute dump_stages_account; user host event_name count_star execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 3 -user1 stage/sql/closing tables 3 -user1 stage/sql/init 7 +user1 stage/sql/Checking permissions 3 +user1 stage/sql/Closing tables 4 +user1 stage/sql/Init 6 +user1 stage/sql/Init for update 1 user1 stage/sql/Opening tables 3 -user2 stage/sql/checking permissions 3 -user2 stage/sql/closing tables 3 -user2 stage/sql/init 7 +user2 stage/sql/Checking permissions 3 +user2 stage/sql/Closing tables 4 +user2 stage/sql/Init 6 +user2 stage/sql/Init for update 1 user2 stage/sql/Opening tables 3 -user3 stage/sql/checking permissions 3 -user3 stage/sql/closing tables 3 -user3 stage/sql/init 7 +user3 stage/sql/Checking permissions 3 +user3 stage/sql/Closing tables 4 +user3 stage/sql/Init 6 +user3 stage/sql/Init for update 1 user3 stage/sql/Opening tables 3 -user4 stage/sql/checking permissions 3 -user4 stage/sql/closing tables 3 -user4 stage/sql/init 7 +user4 stage/sql/Checking permissions 3 +user4 stage/sql/Closing tables 4 +user4 stage/sql/Init 6 +user4 stage/sql/Init for update 1 user4 stage/sql/Opening tables 3 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 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -1756,35 +1828,41 @@ execute dump_stages_account; user host event_name count_star execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 3 -user1 stage/sql/closing tables 3 -user1 stage/sql/init 7 +user1 stage/sql/Checking permissions 3 +user1 stage/sql/Closing tables 4 +user1 stage/sql/Init 6 +user1 stage/sql/Init for update 1 user1 stage/sql/Opening tables 3 -user2 stage/sql/checking permissions 3 -user2 stage/sql/closing tables 3 -user2 stage/sql/init 7 +user2 stage/sql/Checking permissions 3 +user2 stage/sql/Closing tables 4 +user2 stage/sql/Init 6 +user2 stage/sql/Init for update 1 user2 stage/sql/Opening tables 3 -user3 stage/sql/checking permissions 3 -user3 stage/sql/closing tables 3 -user3 stage/sql/init 7 +user3 stage/sql/Checking permissions 3 +user3 stage/sql/Closing tables 4 +user3 stage/sql/Init 6 +user3 stage/sql/Init for update 1 user3 stage/sql/Opening tables 3 -user4 stage/sql/checking permissions 3 -user4 stage/sql/closing tables 3 -user4 stage/sql/init 7 +user4 stage/sql/Checking permissions 3 +user4 stage/sql/Closing tables 4 +user4 stage/sql/Init 6 +user4 stage/sql/Init for update 1 user4 stage/sql/Opening tables 3 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 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -1879,35 +1957,41 @@ execute dump_stages_account; user host event_name count_star execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 3 -user1 stage/sql/closing tables 3 -user1 stage/sql/init 7 +user1 stage/sql/Checking permissions 3 +user1 stage/sql/Closing tables 4 +user1 stage/sql/Init 6 +user1 stage/sql/Init for update 1 user1 stage/sql/Opening tables 3 -user2 stage/sql/checking permissions 3 -user2 stage/sql/closing tables 3 -user2 stage/sql/init 7 +user2 stage/sql/Checking permissions 3 +user2 stage/sql/Closing tables 4 +user2 stage/sql/Init 6 +user2 stage/sql/Init for update 1 user2 stage/sql/Opening tables 3 -user3 stage/sql/checking permissions 3 -user3 stage/sql/closing tables 3 -user3 stage/sql/init 7 +user3 stage/sql/Checking permissions 3 +user3 stage/sql/Closing tables 4 +user3 stage/sql/Init 6 +user3 stage/sql/Init for update 1 user3 stage/sql/Opening tables 3 -user4 stage/sql/checking permissions 3 -user4 stage/sql/closing tables 3 -user4 stage/sql/init 7 +user4 stage/sql/Checking permissions 3 +user4 stage/sql/Closing tables 4 +user4 stage/sql/Init 6 +user4 stage/sql/Init for update 1 user4 stage/sql/Opening tables 3 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 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -2002,35 +2086,41 @@ execute dump_stages_account; user host event_name count_star execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 3 -user1 stage/sql/closing tables 3 -user1 stage/sql/init 7 +user1 stage/sql/Checking permissions 3 +user1 stage/sql/Closing tables 4 +user1 stage/sql/Init 6 +user1 stage/sql/Init for update 1 user1 stage/sql/Opening tables 3 -user2 stage/sql/checking permissions 3 -user2 stage/sql/closing tables 3 -user2 stage/sql/init 7 +user2 stage/sql/Checking permissions 3 +user2 stage/sql/Closing tables 4 +user2 stage/sql/Init 6 +user2 stage/sql/Init for update 1 user2 stage/sql/Opening tables 3 -user3 stage/sql/checking permissions 3 -user3 stage/sql/closing tables 3 -user3 stage/sql/init 7 +user3 stage/sql/Checking permissions 3 +user3 stage/sql/Closing tables 4 +user3 stage/sql/Init 6 +user3 stage/sql/Init for update 1 user3 stage/sql/Opening tables 3 -user4 stage/sql/checking permissions 3 -user4 stage/sql/closing tables 3 -user4 stage/sql/init 7 +user4 stage/sql/Checking permissions 3 +user4 stage/sql/Closing tables 4 +user4 stage/sql/Init 6 +user4 stage/sql/Init for update 1 user4 stage/sql/Opening tables 3 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 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -2125,35 +2215,41 @@ execute dump_stages_account; user host event_name count_star execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 3 -user1 stage/sql/closing tables 3 -user1 stage/sql/init 7 +user1 stage/sql/Checking permissions 3 +user1 stage/sql/Closing tables 4 +user1 stage/sql/Init 6 +user1 stage/sql/Init for update 1 user1 stage/sql/Opening tables 3 -user2 stage/sql/checking permissions 3 -user2 stage/sql/closing tables 3 -user2 stage/sql/init 7 +user2 stage/sql/Checking permissions 3 +user2 stage/sql/Closing tables 4 +user2 stage/sql/Init 6 +user2 stage/sql/Init for update 1 user2 stage/sql/Opening tables 3 -user3 stage/sql/checking permissions 3 -user3 stage/sql/closing tables 3 -user3 stage/sql/init 7 +user3 stage/sql/Checking permissions 3 +user3 stage/sql/Closing tables 4 +user3 stage/sql/Init 6 +user3 stage/sql/Init for update 1 user3 stage/sql/Opening tables 3 -user4 stage/sql/checking permissions 3 -user4 stage/sql/closing tables 3 -user4 stage/sql/init 7 +user4 stage/sql/Checking permissions 3 +user4 stage/sql/Closing tables 4 +user4 stage/sql/Init 6 +user4 stage/sql/Init for update 1 user4 stage/sql/Opening tables 3 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 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -2248,35 +2344,41 @@ execute dump_stages_account; user host event_name count_star execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 3 -user1 stage/sql/closing tables 3 -user1 stage/sql/init 7 +user1 stage/sql/Checking permissions 3 +user1 stage/sql/Closing tables 4 +user1 stage/sql/Init 6 +user1 stage/sql/Init for update 1 user1 stage/sql/Opening tables 3 -user2 stage/sql/checking permissions 3 -user2 stage/sql/closing tables 3 -user2 stage/sql/init 7 +user2 stage/sql/Checking permissions 3 +user2 stage/sql/Closing tables 4 +user2 stage/sql/Init 6 +user2 stage/sql/Init for update 1 user2 stage/sql/Opening tables 3 -user3 stage/sql/checking permissions 3 -user3 stage/sql/closing tables 3 -user3 stage/sql/init 7 +user3 stage/sql/Checking permissions 3 +user3 stage/sql/Closing tables 4 +user3 stage/sql/Init 6 +user3 stage/sql/Init for update 1 user3 stage/sql/Opening tables 3 -user4 stage/sql/checking permissions 3 -user4 stage/sql/closing tables 3 -user4 stage/sql/init 7 +user4 stage/sql/Checking permissions 3 +user4 stage/sql/Closing tables 4 +user4 stage/sql/Init 6 +user4 stage/sql/Init for update 1 user4 stage/sql/Opening tables 3 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 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -2371,35 +2473,41 @@ execute dump_stages_account; user host event_name count_star execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 0 -user1 stage/sql/closing tables 0 -user1 stage/sql/init 0 +user1 stage/sql/Checking permissions 0 +user1 stage/sql/Closing tables 0 +user1 stage/sql/Init 0 +user1 stage/sql/Init for update 0 user1 stage/sql/Opening tables 0 -user2 stage/sql/checking permissions 0 -user2 stage/sql/closing tables 0 -user2 stage/sql/init 0 +user2 stage/sql/Checking permissions 0 +user2 stage/sql/Closing tables 0 +user2 stage/sql/Init 0 +user2 stage/sql/Init for update 0 user2 stage/sql/Opening tables 0 -user3 stage/sql/checking permissions 0 -user3 stage/sql/closing tables 0 -user3 stage/sql/init 0 +user3 stage/sql/Checking permissions 0 +user3 stage/sql/Closing tables 0 +user3 stage/sql/Init 0 +user3 stage/sql/Init for update 0 user3 stage/sql/Opening tables 0 -user4 stage/sql/checking permissions 0 -user4 stage/sql/closing tables 0 -user4 stage/sql/init 0 +user4 stage/sql/Checking permissions 0 +user4 stage/sql/Closing tables 0 +user4 stage/sql/Init 0 +user4 stage/sql/Init for update 0 user4 stage/sql/Opening tables 0 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 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -2494,35 +2602,41 @@ execute dump_stages_account; user host event_name count_star execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 0 -user1 stage/sql/closing tables 0 -user1 stage/sql/init 0 +user1 stage/sql/Checking permissions 0 +user1 stage/sql/Closing tables 0 +user1 stage/sql/Init 0 +user1 stage/sql/Init for update 0 user1 stage/sql/Opening tables 0 -user2 stage/sql/checking permissions 0 -user2 stage/sql/closing tables 0 -user2 stage/sql/init 0 +user2 stage/sql/Checking permissions 0 +user2 stage/sql/Closing tables 0 +user2 stage/sql/Init 0 +user2 stage/sql/Init for update 0 user2 stage/sql/Opening tables 0 -user3 stage/sql/checking permissions 0 -user3 stage/sql/closing tables 0 -user3 stage/sql/init 0 +user3 stage/sql/Checking permissions 0 +user3 stage/sql/Closing tables 0 +user3 stage/sql/Init 0 +user3 stage/sql/Init for update 0 user3 stage/sql/Opening tables 0 -user4 stage/sql/checking permissions 0 -user4 stage/sql/closing tables 0 -user4 stage/sql/init 0 +user4 stage/sql/Checking permissions 0 +user4 stage/sql/Closing tables 0 +user4 stage/sql/Init 0 +user4 stage/sql/Init for update 0 user4 stage/sql/Opening tables 0 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 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -2617,35 +2731,41 @@ execute dump_stages_account; user host event_name count_star execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 0 -user1 stage/sql/closing tables 0 -user1 stage/sql/init 0 +user1 stage/sql/Checking permissions 0 +user1 stage/sql/Closing tables 0 +user1 stage/sql/Init 0 +user1 stage/sql/Init for update 0 user1 stage/sql/Opening tables 0 -user2 stage/sql/checking permissions 0 -user2 stage/sql/closing tables 0 -user2 stage/sql/init 0 +user2 stage/sql/Checking permissions 0 +user2 stage/sql/Closing tables 0 +user2 stage/sql/Init 0 +user2 stage/sql/Init for update 0 user2 stage/sql/Opening tables 0 -user3 stage/sql/checking permissions 0 -user3 stage/sql/closing tables 0 -user3 stage/sql/init 0 +user3 stage/sql/Checking permissions 0 +user3 stage/sql/Closing tables 0 +user3 stage/sql/Init 0 +user3 stage/sql/Init for update 0 user3 stage/sql/Opening tables 0 -user4 stage/sql/checking permissions 0 -user4 stage/sql/closing tables 0 -user4 stage/sql/init 0 +user4 stage/sql/Checking permissions 0 +user4 stage/sql/Closing tables 0 +user4 stage/sql/Init 0 +user4 stage/sql/Init for update 0 user4 stage/sql/Opening tables 0 execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/checking permissions 0 -stage/sql/closing tables 0 -stage/sql/init 0 +stage/sql/Checking permissions 0 +stage/sql/Closing tables 0 +stage/sql/Init 0 +stage/sql/Init for update 0 stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -2740,35 +2860,41 @@ execute dump_stages_account; user host event_name count_star execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 0 -user1 stage/sql/closing tables 0 -user1 stage/sql/init 0 +user1 stage/sql/Checking permissions 0 +user1 stage/sql/Closing tables 0 +user1 stage/sql/Init 0 +user1 stage/sql/Init for update 0 user1 stage/sql/Opening tables 0 -user2 stage/sql/checking permissions 0 -user2 stage/sql/closing tables 0 -user2 stage/sql/init 0 +user2 stage/sql/Checking permissions 0 +user2 stage/sql/Closing tables 0 +user2 stage/sql/Init 0 +user2 stage/sql/Init for update 0 user2 stage/sql/Opening tables 0 -user3 stage/sql/checking permissions 0 -user3 stage/sql/closing tables 0 -user3 stage/sql/init 0 +user3 stage/sql/Checking permissions 0 +user3 stage/sql/Closing tables 0 +user3 stage/sql/Init 0 +user3 stage/sql/Init for update 0 user3 stage/sql/Opening tables 0 -user4 stage/sql/checking permissions 0 -user4 stage/sql/closing tables 0 -user4 stage/sql/init 0 +user4 stage/sql/Checking permissions 0 +user4 stage/sql/Closing tables 0 +user4 stage/sql/Init 0 +user4 stage/sql/Init for update 0 user4 stage/sql/Opening tables 0 execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/checking permissions 0 -stage/sql/closing tables 0 -stage/sql/init 0 +stage/sql/Checking permissions 0 +stage/sql/Closing tables 0 +stage/sql/Init 0 +stage/sql/Init for update 0 stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -2863,35 +2989,41 @@ execute dump_stages_account; user host event_name count_star execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 0 -user1 stage/sql/closing tables 0 -user1 stage/sql/init 0 +user1 stage/sql/Checking permissions 0 +user1 stage/sql/Closing tables 0 +user1 stage/sql/Init 0 +user1 stage/sql/Init for update 0 user1 stage/sql/Opening tables 0 -user2 stage/sql/checking permissions 0 -user2 stage/sql/closing tables 0 -user2 stage/sql/init 0 +user2 stage/sql/Checking permissions 0 +user2 stage/sql/Closing tables 0 +user2 stage/sql/Init 0 +user2 stage/sql/Init for update 0 user2 stage/sql/Opening tables 0 -user3 stage/sql/checking permissions 0 -user3 stage/sql/closing tables 0 -user3 stage/sql/init 0 +user3 stage/sql/Checking permissions 0 +user3 stage/sql/Closing tables 0 +user3 stage/sql/Init 0 +user3 stage/sql/Init for update 0 user3 stage/sql/Opening tables 0 -user4 stage/sql/checking permissions 0 -user4 stage/sql/closing tables 0 -user4 stage/sql/init 0 +user4 stage/sql/Checking permissions 0 +user4 stage/sql/Closing tables 0 +user4 stage/sql/Init 0 +user4 stage/sql/Init for update 0 user4 stage/sql/Opening tables 0 execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/checking permissions 0 -stage/sql/closing tables 0 -stage/sql/init 0 +stage/sql/Checking permissions 0 +stage/sql/Closing tables 0 +stage/sql/Init 0 +stage/sql/Init for update 0 stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -2986,35 +3118,41 @@ execute dump_stages_account; user host event_name count_star execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 0 -user1 stage/sql/closing tables 0 -user1 stage/sql/init 0 +user1 stage/sql/Checking permissions 0 +user1 stage/sql/Closing tables 0 +user1 stage/sql/Init 0 +user1 stage/sql/Init for update 0 user1 stage/sql/Opening tables 0 -user2 stage/sql/checking permissions 0 -user2 stage/sql/closing tables 0 -user2 stage/sql/init 0 +user2 stage/sql/Checking permissions 0 +user2 stage/sql/Closing tables 0 +user2 stage/sql/Init 0 +user2 stage/sql/Init for update 0 user2 stage/sql/Opening tables 0 -user3 stage/sql/checking permissions 0 -user3 stage/sql/closing tables 0 -user3 stage/sql/init 0 +user3 stage/sql/Checking permissions 0 +user3 stage/sql/Closing tables 0 +user3 stage/sql/Init 0 +user3 stage/sql/Init for update 0 user3 stage/sql/Opening tables 0 -user4 stage/sql/checking permissions 0 -user4 stage/sql/closing tables 0 -user4 stage/sql/init 0 +user4 stage/sql/Checking permissions 0 +user4 stage/sql/Closing tables 0 +user4 stage/sql/Init 0 +user4 stage/sql/Init for update 0 user4 stage/sql/Opening tables 0 execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/checking permissions 0 -stage/sql/closing tables 0 -stage/sql/init 0 +stage/sql/Checking permissions 0 +stage/sql/Closing tables 0 +stage/sql/Init 0 +stage/sql/Init for update 0 stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -3109,35 +3247,41 @@ execute dump_stages_account; user host event_name count_star execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 0 -user1 stage/sql/closing tables 0 -user1 stage/sql/init 0 +user1 stage/sql/Checking permissions 0 +user1 stage/sql/Closing tables 0 +user1 stage/sql/Init 0 +user1 stage/sql/Init for update 0 user1 stage/sql/Opening tables 0 -user2 stage/sql/checking permissions 0 -user2 stage/sql/closing tables 0 -user2 stage/sql/init 0 +user2 stage/sql/Checking permissions 0 +user2 stage/sql/Closing tables 0 +user2 stage/sql/Init 0 +user2 stage/sql/Init for update 0 user2 stage/sql/Opening tables 0 -user3 stage/sql/checking permissions 0 -user3 stage/sql/closing tables 0 -user3 stage/sql/init 0 +user3 stage/sql/Checking permissions 0 +user3 stage/sql/Closing tables 0 +user3 stage/sql/Init 0 +user3 stage/sql/Init for update 0 user3 stage/sql/Opening tables 0 -user4 stage/sql/checking permissions 0 -user4 stage/sql/closing tables 0 -user4 stage/sql/init 0 +user4 stage/sql/Checking permissions 0 +user4 stage/sql/Closing tables 0 +user4 stage/sql/Init 0 +user4 stage/sql/Init for update 0 user4 stage/sql/Opening tables 0 execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/checking permissions 0 -stage/sql/closing tables 0 -stage/sql/init 0 +stage/sql/Checking permissions 0 +stage/sql/Closing tables 0 +stage/sql/Init 0 +stage/sql/Init for update 0 stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -3232,35 +3376,41 @@ execute dump_stages_account; user host event_name count_star execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 0 -user1 stage/sql/closing tables 0 -user1 stage/sql/init 0 +user1 stage/sql/Checking permissions 0 +user1 stage/sql/Closing tables 0 +user1 stage/sql/Init 0 +user1 stage/sql/Init for update 0 user1 stage/sql/Opening tables 0 -user2 stage/sql/checking permissions 0 -user2 stage/sql/closing tables 0 -user2 stage/sql/init 0 +user2 stage/sql/Checking permissions 0 +user2 stage/sql/Closing tables 0 +user2 stage/sql/Init 0 +user2 stage/sql/Init for update 0 user2 stage/sql/Opening tables 0 -user3 stage/sql/checking permissions 0 -user3 stage/sql/closing tables 0 -user3 stage/sql/init 0 +user3 stage/sql/Checking permissions 0 +user3 stage/sql/Closing tables 0 +user3 stage/sql/Init 0 +user3 stage/sql/Init for update 0 user3 stage/sql/Opening tables 0 -user4 stage/sql/checking permissions 0 -user4 stage/sql/closing tables 0 -user4 stage/sql/init 0 +user4 stage/sql/Checking permissions 0 +user4 stage/sql/Closing tables 0 +user4 stage/sql/Init 0 +user4 stage/sql/Init for update 0 user4 stage/sql/Opening tables 0 execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/checking permissions 0 -stage/sql/closing tables 0 -stage/sql/init 0 +stage/sql/Checking permissions 0 +stage/sql/Closing tables 0 +stage/sql/Init 0 +stage/sql/Init for update 0 stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -3355,35 +3505,41 @@ execute dump_stages_account; user host event_name count_star execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 0 -user1 stage/sql/closing tables 0 -user1 stage/sql/init 0 +user1 stage/sql/Checking permissions 0 +user1 stage/sql/Closing tables 0 +user1 stage/sql/Init 0 +user1 stage/sql/Init for update 0 user1 stage/sql/Opening tables 0 -user2 stage/sql/checking permissions 0 -user2 stage/sql/closing tables 0 -user2 stage/sql/init 0 +user2 stage/sql/Checking permissions 0 +user2 stage/sql/Closing tables 0 +user2 stage/sql/Init 0 +user2 stage/sql/Init for update 0 user2 stage/sql/Opening tables 0 -user3 stage/sql/checking permissions 0 -user3 stage/sql/closing tables 0 -user3 stage/sql/init 0 +user3 stage/sql/Checking permissions 0 +user3 stage/sql/Closing tables 0 +user3 stage/sql/Init 0 +user3 stage/sql/Init for update 0 user3 stage/sql/Opening tables 0 -user4 stage/sql/checking permissions 0 -user4 stage/sql/closing tables 0 -user4 stage/sql/init 0 +user4 stage/sql/Checking permissions 0 +user4 stage/sql/Closing tables 0 +user4 stage/sql/Init 0 +user4 stage/sql/Init for update 0 user4 stage/sql/Opening tables 0 execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/checking permissions 0 -stage/sql/closing tables 0 -stage/sql/init 0 +stage/sql/Checking permissions 0 +stage/sql/Closing tables 0 +stage/sql/Init 0 +stage/sql/Init for update 0 stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -3466,15 +3622,17 @@ execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/checking permissions 0 -stage/sql/closing tables 0 -stage/sql/init 0 +stage/sql/Checking permissions 0 +stage/sql/Closing tables 0 +stage/sql/Init 0 +stage/sql/Init for update 0 stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -3537,15 +3695,17 @@ execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/checking permissions 0 -stage/sql/closing tables 0 -stage/sql/init 0 +stage/sql/Checking permissions 0 +stage/sql/Closing tables 0 +stage/sql/Init 0 +stage/sql/Init for update 0 stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star 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 95b46de4b57..c9b2b768691 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 @@ -32,15 +32,17 @@ execute dump_stages_user; user event_name count_star execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 0 -localhost stage/sql/closing tables 0 -localhost stage/sql/init 0 +localhost stage/sql/Checking permissions 0 +localhost stage/sql/Closing tables 0 +localhost stage/sql/Init 0 +localhost stage/sql/Init for update 0 localhost stage/sql/Opening tables 0 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 0 -stage/sql/closing tables 0 -stage/sql/init 0 +stage/sql/Checking permissions 0 +stage/sql/Closing tables 0 +stage/sql/Init 0 +stage/sql/Init for update 0 stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) @@ -109,15 +111,17 @@ execute dump_stages_user; user event_name count_star execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 0 -localhost stage/sql/closing tables 0 -localhost stage/sql/init 0 +localhost stage/sql/Checking permissions 0 +localhost stage/sql/Closing tables 0 +localhost stage/sql/Init 0 +localhost stage/sql/Init for update 0 localhost stage/sql/Opening tables 0 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 0 -stage/sql/closing tables 0 -stage/sql/init 0 +stage/sql/Checking permissions 0 +stage/sql/Closing tables 0 +stage/sql/Init 0 +stage/sql/Init for update 0 stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) @@ -194,21 +198,24 @@ execute dump_stages_user; user event_name count_star execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 3 -localhost stage/sql/closing tables 3 -localhost stage/sql/init 6 +localhost stage/sql/Checking permissions 3 +localhost stage/sql/Closing tables 4 +localhost stage/sql/Init 5 +localhost stage/sql/Init for update 1 localhost stage/sql/Opening tables 3 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 3 -stage/sql/closing tables 3 -stage/sql/init 6 +stage/sql/Checking permissions 3 +stage/sql/Closing tables 4 +stage/sql/Init 5 +stage/sql/Init for update 1 stage/sql/Opening tables 3 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 3 -stage/sql/closing tables 3 -stage/sql/init 6 +stage/sql/Checking permissions 3 +stage/sql/Closing tables 4 +stage/sql/Init 5 +stage/sql/Init for update 1 stage/sql/Opening tables 3 execute dump_statements_account; user host event_name count_star @@ -281,21 +288,24 @@ execute dump_stages_user; user event_name count_star execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 3 -localhost stage/sql/closing tables 3 -localhost stage/sql/init 6 +localhost stage/sql/Checking permissions 3 +localhost stage/sql/Closing tables 4 +localhost stage/sql/Init 5 +localhost stage/sql/Init for update 1 localhost stage/sql/Opening tables 3 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 3 -stage/sql/closing tables 3 -stage/sql/init 6 +stage/sql/Checking permissions 3 +stage/sql/Closing tables 4 +stage/sql/Init 5 +stage/sql/Init for update 1 stage/sql/Opening tables 3 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 3 -stage/sql/closing tables 3 -stage/sql/init 6 +stage/sql/Checking permissions 3 +stage/sql/Closing tables 4 +stage/sql/Init 5 +stage/sql/Init for update 1 stage/sql/Opening tables 3 execute dump_statements_account; user host event_name count_star @@ -375,21 +385,24 @@ execute dump_stages_user; user event_name count_star execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 6 -localhost stage/sql/closing tables 6 -localhost stage/sql/init 12 +localhost stage/sql/Checking permissions 6 +localhost stage/sql/Closing tables 8 +localhost stage/sql/Init 10 +localhost stage/sql/Init for update 2 localhost stage/sql/Opening tables 6 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 6 -stage/sql/closing tables 6 -stage/sql/init 12 +stage/sql/Checking permissions 6 +stage/sql/Closing tables 8 +stage/sql/Init 10 +stage/sql/Init for update 2 stage/sql/Opening tables 6 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 6 -stage/sql/closing tables 6 -stage/sql/init 12 +stage/sql/Checking permissions 6 +stage/sql/Closing tables 8 +stage/sql/Init 10 +stage/sql/Init for update 2 stage/sql/Opening tables 6 execute dump_statements_account; user host event_name count_star @@ -465,21 +478,24 @@ execute dump_stages_user; user event_name count_star execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 6 -localhost stage/sql/closing tables 6 -localhost stage/sql/init 12 +localhost stage/sql/Checking permissions 6 +localhost stage/sql/Closing tables 8 +localhost stage/sql/Init 10 +localhost stage/sql/Init for update 2 localhost stage/sql/Opening tables 6 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 6 -stage/sql/closing tables 6 -stage/sql/init 12 +stage/sql/Checking permissions 6 +stage/sql/Closing tables 8 +stage/sql/Init 10 +stage/sql/Init for update 2 stage/sql/Opening tables 6 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 6 -stage/sql/closing tables 6 -stage/sql/init 12 +stage/sql/Checking permissions 6 +stage/sql/Closing tables 8 +stage/sql/Init 10 +stage/sql/Init for update 2 stage/sql/Opening tables 6 execute dump_statements_account; user host event_name count_star @@ -562,21 +578,24 @@ execute dump_stages_user; user event_name count_star execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 9 -localhost stage/sql/closing tables 9 -localhost stage/sql/init 18 +localhost stage/sql/Checking permissions 9 +localhost stage/sql/Closing tables 12 +localhost stage/sql/Init 15 +localhost stage/sql/Init for update 3 localhost stage/sql/Opening tables 9 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 9 -stage/sql/closing tables 9 -stage/sql/init 18 +stage/sql/Checking permissions 9 +stage/sql/Closing tables 12 +stage/sql/Init 15 +stage/sql/Init for update 3 stage/sql/Opening tables 9 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 9 -stage/sql/closing tables 9 -stage/sql/init 18 +stage/sql/Checking permissions 9 +stage/sql/Closing tables 12 +stage/sql/Init 15 +stage/sql/Init for update 3 stage/sql/Opening tables 9 execute dump_statements_account; user host event_name count_star @@ -655,21 +674,24 @@ execute dump_stages_user; user event_name count_star execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 9 -localhost stage/sql/closing tables 9 -localhost stage/sql/init 18 +localhost stage/sql/Checking permissions 9 +localhost stage/sql/Closing tables 12 +localhost stage/sql/Init 15 +localhost stage/sql/Init for update 3 localhost stage/sql/Opening tables 9 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 9 -stage/sql/closing tables 9 -stage/sql/init 18 +stage/sql/Checking permissions 9 +stage/sql/Closing tables 12 +stage/sql/Init 15 +stage/sql/Init for update 3 stage/sql/Opening tables 9 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 9 -stage/sql/closing tables 9 -stage/sql/init 18 +stage/sql/Checking permissions 9 +stage/sql/Closing tables 12 +stage/sql/Init 15 +stage/sql/Init for update 3 stage/sql/Opening tables 9 execute dump_statements_account; user host event_name count_star @@ -755,21 +777,24 @@ 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 12 -localhost stage/sql/init 24 +localhost stage/sql/Checking permissions 12 +localhost stage/sql/Closing tables 16 +localhost stage/sql/Init 20 +localhost stage/sql/Init for update 4 localhost stage/sql/Opening tables 12 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 24 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 20 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 24 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 20 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -846,21 +871,24 @@ 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 12 -localhost stage/sql/init 25 +localhost stage/sql/Checking permissions 12 +localhost stage/sql/Closing tables 16 +localhost stage/sql/Init 21 +localhost stage/sql/Init for update 4 localhost stage/sql/Opening tables 12 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 25 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 21 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 25 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 21 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -935,21 +963,24 @@ 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 12 -localhost stage/sql/init 26 +localhost stage/sql/Checking permissions 12 +localhost stage/sql/Closing tables 16 +localhost stage/sql/Init 22 +localhost stage/sql/Init for update 4 localhost stage/sql/Opening tables 12 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 26 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 22 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 26 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 22 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -1021,21 +1052,24 @@ 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 12 -localhost stage/sql/init 27 +localhost stage/sql/Checking permissions 12 +localhost stage/sql/Closing tables 16 +localhost stage/sql/Init 23 +localhost stage/sql/Init for update 4 localhost stage/sql/Opening tables 12 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 27 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 23 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 27 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 23 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -1104,21 +1138,24 @@ 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 12 -localhost stage/sql/init 28 +localhost stage/sql/Checking permissions 12 +localhost stage/sql/Closing tables 16 +localhost stage/sql/Init 24 +localhost stage/sql/Init for update 4 localhost stage/sql/Opening tables 12 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -1188,21 +1225,24 @@ 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 12 -localhost stage/sql/init 28 +localhost stage/sql/Checking permissions 12 +localhost stage/sql/Closing tables 16 +localhost stage/sql/Init 24 +localhost stage/sql/Init for update 4 localhost stage/sql/Opening tables 12 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -1271,21 +1311,24 @@ 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 12 -localhost stage/sql/init 28 +localhost stage/sql/Checking permissions 12 +localhost stage/sql/Closing tables 16 +localhost stage/sql/Init 24 +localhost stage/sql/Init for update 4 localhost stage/sql/Opening tables 12 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -1354,21 +1397,24 @@ 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 12 -localhost stage/sql/init 28 +localhost stage/sql/Checking permissions 12 +localhost stage/sql/Closing tables 16 +localhost stage/sql/Init 24 +localhost stage/sql/Init for update 4 localhost stage/sql/Opening tables 12 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -1437,21 +1483,24 @@ 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 12 -localhost stage/sql/init 28 +localhost stage/sql/Checking permissions 12 +localhost stage/sql/Closing tables 16 +localhost stage/sql/Init 24 +localhost stage/sql/Init for update 4 localhost stage/sql/Opening tables 12 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -1520,21 +1569,24 @@ 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 12 -localhost stage/sql/init 28 +localhost stage/sql/Checking permissions 12 +localhost stage/sql/Closing tables 16 +localhost stage/sql/Init 24 +localhost stage/sql/Init for update 4 localhost stage/sql/Opening tables 12 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -1603,21 +1655,24 @@ 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 12 -localhost stage/sql/init 28 +localhost stage/sql/Checking permissions 12 +localhost stage/sql/Closing tables 16 +localhost stage/sql/Init 24 +localhost stage/sql/Init for update 4 localhost stage/sql/Opening tables 12 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -1686,21 +1741,24 @@ 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 12 -localhost stage/sql/init 28 +localhost stage/sql/Checking permissions 12 +localhost stage/sql/Closing tables 16 +localhost stage/sql/Init 24 +localhost stage/sql/Init for update 4 localhost stage/sql/Opening tables 12 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -1769,21 +1827,24 @@ 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 12 -localhost stage/sql/init 28 +localhost stage/sql/Checking permissions 12 +localhost stage/sql/Closing tables 16 +localhost stage/sql/Init 24 +localhost stage/sql/Init for update 4 localhost stage/sql/Opening tables 12 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -1852,21 +1913,24 @@ execute dump_stages_user; user event_name count_star execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 0 -localhost stage/sql/closing tables 0 -localhost stage/sql/init 0 +localhost stage/sql/Checking permissions 0 +localhost stage/sql/Closing tables 0 +localhost stage/sql/Init 0 +localhost stage/sql/Init for update 0 localhost stage/sql/Opening tables 0 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -1935,21 +1999,24 @@ execute dump_stages_user; user event_name count_star execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 0 -localhost stage/sql/closing tables 0 -localhost stage/sql/init 0 +localhost stage/sql/Checking permissions 0 +localhost stage/sql/Closing tables 0 +localhost stage/sql/Init 0 +localhost stage/sql/Init for update 0 localhost stage/sql/Opening tables 0 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 0 -stage/sql/closing tables 0 -stage/sql/init 0 +stage/sql/Checking permissions 0 +stage/sql/Closing tables 0 +stage/sql/Init 0 +stage/sql/Init for update 0 stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -2018,21 +2085,24 @@ execute dump_stages_user; user event_name count_star execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 0 -localhost stage/sql/closing tables 0 -localhost stage/sql/init 0 +localhost stage/sql/Checking permissions 0 +localhost stage/sql/Closing tables 0 +localhost stage/sql/Init 0 +localhost stage/sql/Init for update 0 localhost stage/sql/Opening tables 0 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 0 -stage/sql/closing tables 0 -stage/sql/init 0 +stage/sql/Checking permissions 0 +stage/sql/Closing tables 0 +stage/sql/Init 0 +stage/sql/Init for update 0 stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -2101,21 +2171,24 @@ execute dump_stages_user; user event_name count_star execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 0 -localhost stage/sql/closing tables 0 -localhost stage/sql/init 0 +localhost stage/sql/Checking permissions 0 +localhost stage/sql/Closing tables 0 +localhost stage/sql/Init 0 +localhost stage/sql/Init for update 0 localhost stage/sql/Opening tables 0 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 0 -stage/sql/closing tables 0 -stage/sql/init 0 +stage/sql/Checking permissions 0 +stage/sql/Closing tables 0 +stage/sql/Init 0 +stage/sql/Init for update 0 stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -2184,21 +2257,24 @@ execute dump_stages_user; user event_name count_star execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 0 -localhost stage/sql/closing tables 0 -localhost stage/sql/init 0 +localhost stage/sql/Checking permissions 0 +localhost stage/sql/Closing tables 0 +localhost stage/sql/Init 0 +localhost stage/sql/Init for update 0 localhost stage/sql/Opening tables 0 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 0 -stage/sql/closing tables 0 -stage/sql/init 0 +stage/sql/Checking permissions 0 +stage/sql/Closing tables 0 +stage/sql/Init 0 +stage/sql/Init for update 0 stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -2267,21 +2343,24 @@ execute dump_stages_user; user event_name count_star execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 0 -localhost stage/sql/closing tables 0 -localhost stage/sql/init 0 +localhost stage/sql/Checking permissions 0 +localhost stage/sql/Closing tables 0 +localhost stage/sql/Init 0 +localhost stage/sql/Init for update 0 localhost stage/sql/Opening tables 0 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 0 -stage/sql/closing tables 0 -stage/sql/init 0 +stage/sql/Checking permissions 0 +stage/sql/Closing tables 0 +stage/sql/Init 0 +stage/sql/Init for update 0 stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -2350,21 +2429,24 @@ execute dump_stages_user; user event_name count_star execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 0 -localhost stage/sql/closing tables 0 -localhost stage/sql/init 0 +localhost stage/sql/Checking permissions 0 +localhost stage/sql/Closing tables 0 +localhost stage/sql/Init 0 +localhost stage/sql/Init for update 0 localhost stage/sql/Opening tables 0 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 0 -stage/sql/closing tables 0 -stage/sql/init 0 +stage/sql/Checking permissions 0 +stage/sql/Closing tables 0 +stage/sql/Init 0 +stage/sql/Init for update 0 stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -2433,21 +2515,24 @@ execute dump_stages_user; user event_name count_star execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 0 -localhost stage/sql/closing tables 0 -localhost stage/sql/init 0 +localhost stage/sql/Checking permissions 0 +localhost stage/sql/Closing tables 0 +localhost stage/sql/Init 0 +localhost stage/sql/Init for update 0 localhost stage/sql/Opening tables 0 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 0 -stage/sql/closing tables 0 -stage/sql/init 0 +stage/sql/Checking permissions 0 +stage/sql/Closing tables 0 +stage/sql/Init 0 +stage/sql/Init for update 0 stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -2516,21 +2601,24 @@ execute dump_stages_user; user event_name count_star execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 0 -localhost stage/sql/closing tables 0 -localhost stage/sql/init 0 +localhost stage/sql/Checking permissions 0 +localhost stage/sql/Closing tables 0 +localhost stage/sql/Init 0 +localhost stage/sql/Init for update 0 localhost stage/sql/Opening tables 0 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 0 -stage/sql/closing tables 0 -stage/sql/init 0 +stage/sql/Checking permissions 0 +stage/sql/Closing tables 0 +stage/sql/Init 0 +stage/sql/Init for update 0 stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -2599,21 +2687,24 @@ execute dump_stages_user; user event_name count_star execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 0 -localhost stage/sql/closing tables 0 -localhost stage/sql/init 0 +localhost stage/sql/Checking permissions 0 +localhost stage/sql/Closing tables 0 +localhost stage/sql/Init 0 +localhost stage/sql/Init for update 0 localhost stage/sql/Opening tables 0 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 0 -stage/sql/closing tables 0 -stage/sql/init 0 +stage/sql/Checking permissions 0 +stage/sql/Closing tables 0 +stage/sql/Init 0 +stage/sql/Init for update 0 stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star 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 2dda100704f..89443515f31 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 @@ -30,9 +30,10 @@ execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/checking permissions 0 -stage/sql/closing tables 0 -stage/sql/init 0 +stage/sql/Checking permissions 0 +stage/sql/Closing tables 0 +stage/sql/Init 0 +stage/sql/Init for update 0 stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) @@ -94,9 +95,10 @@ execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/checking permissions 0 -stage/sql/closing tables 0 -stage/sql/init 0 +stage/sql/Checking permissions 0 +stage/sql/Closing tables 0 +stage/sql/Init 0 +stage/sql/Init for update 0 stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) @@ -166,15 +168,17 @@ execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/checking permissions 3 -stage/sql/closing tables 3 -stage/sql/init 6 +stage/sql/Checking permissions 3 +stage/sql/Closing tables 4 +stage/sql/Init 5 +stage/sql/Init for update 1 stage/sql/Opening tables 3 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 3 -stage/sql/closing tables 3 -stage/sql/init 6 +stage/sql/Checking permissions 3 +stage/sql/Closing tables 4 +stage/sql/Init 5 +stage/sql/Init for update 1 stage/sql/Opening tables 3 execute dump_statements_account; user host event_name count_star @@ -240,15 +244,17 @@ execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/checking permissions 3 -stage/sql/closing tables 3 -stage/sql/init 6 +stage/sql/Checking permissions 3 +stage/sql/Closing tables 4 +stage/sql/Init 5 +stage/sql/Init for update 1 stage/sql/Opening tables 3 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 3 -stage/sql/closing tables 3 -stage/sql/init 6 +stage/sql/Checking permissions 3 +stage/sql/Closing tables 4 +stage/sql/Init 5 +stage/sql/Init for update 1 stage/sql/Opening tables 3 execute dump_statements_account; user host event_name count_star @@ -321,15 +327,17 @@ execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/checking permissions 6 -stage/sql/closing tables 6 -stage/sql/init 12 +stage/sql/Checking permissions 6 +stage/sql/Closing tables 8 +stage/sql/Init 10 +stage/sql/Init for update 2 stage/sql/Opening tables 6 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 6 -stage/sql/closing tables 6 -stage/sql/init 12 +stage/sql/Checking permissions 6 +stage/sql/Closing tables 8 +stage/sql/Init 10 +stage/sql/Init for update 2 stage/sql/Opening tables 6 execute dump_statements_account; user host event_name count_star @@ -398,15 +406,17 @@ execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/checking permissions 6 -stage/sql/closing tables 6 -stage/sql/init 12 +stage/sql/Checking permissions 6 +stage/sql/Closing tables 8 +stage/sql/Init 10 +stage/sql/Init for update 2 stage/sql/Opening tables 6 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 6 -stage/sql/closing tables 6 -stage/sql/init 12 +stage/sql/Checking permissions 6 +stage/sql/Closing tables 8 +stage/sql/Init 10 +stage/sql/Init for update 2 stage/sql/Opening tables 6 execute dump_statements_account; user host event_name count_star @@ -482,15 +492,17 @@ execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/checking permissions 9 -stage/sql/closing tables 9 -stage/sql/init 18 +stage/sql/Checking permissions 9 +stage/sql/Closing tables 12 +stage/sql/Init 15 +stage/sql/Init for update 3 stage/sql/Opening tables 9 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 9 -stage/sql/closing tables 9 -stage/sql/init 18 +stage/sql/Checking permissions 9 +stage/sql/Closing tables 12 +stage/sql/Init 15 +stage/sql/Init for update 3 stage/sql/Opening tables 9 execute dump_statements_account; user host event_name count_star @@ -562,15 +574,17 @@ execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/checking permissions 9 -stage/sql/closing tables 9 -stage/sql/init 18 +stage/sql/Checking permissions 9 +stage/sql/Closing tables 12 +stage/sql/Init 15 +stage/sql/Init for update 3 stage/sql/Opening tables 9 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 9 -stage/sql/closing tables 9 -stage/sql/init 18 +stage/sql/Checking permissions 9 +stage/sql/Closing tables 12 +stage/sql/Init 15 +stage/sql/Init for update 3 stage/sql/Opening tables 9 execute dump_statements_account; user host event_name count_star @@ -649,15 +663,17 @@ 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 12 -stage/sql/init 24 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 20 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 24 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 20 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -727,15 +743,17 @@ 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 12 -stage/sql/init 25 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 21 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 25 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 21 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -803,15 +821,17 @@ 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 12 -stage/sql/init 26 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 22 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 26 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 22 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -876,15 +896,17 @@ 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 12 -stage/sql/init 27 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 23 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 27 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 23 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -946,15 +968,17 @@ 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 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -1017,15 +1041,17 @@ 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 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -1087,15 +1113,17 @@ 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 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -1157,15 +1185,17 @@ 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 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -1227,15 +1257,17 @@ 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 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -1297,15 +1329,17 @@ 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 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -1367,15 +1401,17 @@ 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 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -1437,15 +1473,17 @@ 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 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -1507,15 +1545,17 @@ 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 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -1577,15 +1617,17 @@ 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 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -1647,15 +1689,17 @@ execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/checking permissions 0 -stage/sql/closing tables 0 -stage/sql/init 0 +stage/sql/Checking permissions 0 +stage/sql/Closing tables 0 +stage/sql/Init 0 +stage/sql/Init for update 0 stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -1717,15 +1761,17 @@ execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/checking permissions 0 -stage/sql/closing tables 0 -stage/sql/init 0 +stage/sql/Checking permissions 0 +stage/sql/Closing tables 0 +stage/sql/Init 0 +stage/sql/Init for update 0 stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -1787,15 +1833,17 @@ execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/checking permissions 0 -stage/sql/closing tables 0 -stage/sql/init 0 +stage/sql/Checking permissions 0 +stage/sql/Closing tables 0 +stage/sql/Init 0 +stage/sql/Init for update 0 stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -1857,15 +1905,17 @@ execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/checking permissions 0 -stage/sql/closing tables 0 -stage/sql/init 0 +stage/sql/Checking permissions 0 +stage/sql/Closing tables 0 +stage/sql/Init 0 +stage/sql/Init for update 0 stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -1927,15 +1977,17 @@ execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/checking permissions 0 -stage/sql/closing tables 0 -stage/sql/init 0 +stage/sql/Checking permissions 0 +stage/sql/Closing tables 0 +stage/sql/Init 0 +stage/sql/Init for update 0 stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -1997,15 +2049,17 @@ execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/checking permissions 0 -stage/sql/closing tables 0 -stage/sql/init 0 +stage/sql/Checking permissions 0 +stage/sql/Closing tables 0 +stage/sql/Init 0 +stage/sql/Init for update 0 stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -2067,15 +2121,17 @@ execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/checking permissions 0 -stage/sql/closing tables 0 -stage/sql/init 0 +stage/sql/Checking permissions 0 +stage/sql/Closing tables 0 +stage/sql/Init 0 +stage/sql/Init for update 0 stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -2137,15 +2193,17 @@ execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/checking permissions 0 -stage/sql/closing tables 0 -stage/sql/init 0 +stage/sql/Checking permissions 0 +stage/sql/Closing tables 0 +stage/sql/Init 0 +stage/sql/Init for update 0 stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -2207,15 +2265,17 @@ execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/checking permissions 0 -stage/sql/closing tables 0 -stage/sql/init 0 +stage/sql/Checking permissions 0 +stage/sql/Closing tables 0 +stage/sql/Init 0 +stage/sql/Init for update 0 stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star 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 86edcf225c7..0ea5d90ea41 100644 --- a/mysql-test/suite/perfschema/r/event_aggregate_no_h.result +++ b/mysql-test/suite/perfschema/r/event_aggregate_no_h.result @@ -30,9 +30,10 @@ execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/checking permissions 0 -stage/sql/closing tables 0 -stage/sql/init 0 +stage/sql/Checking permissions 0 +stage/sql/Closing tables 0 +stage/sql/Init 0 +stage/sql/Init for update 0 stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) @@ -98,23 +99,26 @@ event_name count(event_name) wait/io/file/sql/query_log 1 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 0 -user1 localhost stage/sql/closing tables 0 -user1 localhost stage/sql/init 0 +user1 localhost stage/sql/Checking permissions 0 +user1 localhost stage/sql/Closing tables 0 +user1 localhost stage/sql/Init 0 +user1 localhost stage/sql/Init for update 0 user1 localhost stage/sql/Opening tables 0 execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 0 -user1 stage/sql/closing tables 0 -user1 stage/sql/init 0 +user1 stage/sql/Checking permissions 0 +user1 stage/sql/Closing tables 0 +user1 stage/sql/Init 0 +user1 stage/sql/Init for update 0 user1 stage/sql/Opening tables 0 execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/checking permissions 0 -stage/sql/closing tables 0 -stage/sql/init 0 +stage/sql/Checking permissions 0 +stage/sql/Closing tables 0 +stage/sql/Init 0 +stage/sql/Init for update 0 stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) @@ -198,29 +202,33 @@ wait/io/file/sql/query_log 4 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 3 -user1 localhost stage/sql/closing tables 3 -user1 localhost stage/sql/init 6 +user1 localhost stage/sql/Checking permissions 3 +user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Init 5 +user1 localhost stage/sql/Init for update 1 user1 localhost stage/sql/Opening tables 3 execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 3 -user1 stage/sql/closing tables 3 -user1 stage/sql/init 6 +user1 stage/sql/Checking permissions 3 +user1 stage/sql/Closing tables 4 +user1 stage/sql/Init 5 +user1 stage/sql/Init for update 1 user1 stage/sql/Opening tables 3 execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/checking permissions 3 -stage/sql/closing tables 3 -stage/sql/init 6 +stage/sql/Checking permissions 3 +stage/sql/Closing tables 4 +stage/sql/Init 5 +stage/sql/Init for update 1 stage/sql/Opening tables 3 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 3 -stage/sql/closing tables 3 -stage/sql/init 6 +stage/sql/Checking permissions 3 +stage/sql/Closing tables 4 +stage/sql/Init 5 +stage/sql/Init for update 1 stage/sql/Opening tables 3 execute dump_statements_account; user host event_name count_star @@ -308,37 +316,43 @@ wait/io/file/sql/query_log 5 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 3 -user1 localhost stage/sql/closing tables 3 -user1 localhost stage/sql/init 6 +user1 localhost stage/sql/Checking permissions 3 +user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Init 5 +user1 localhost stage/sql/Init for update 1 user1 localhost stage/sql/Opening tables 3 -user2 localhost stage/sql/checking permissions 0 -user2 localhost stage/sql/closing tables 0 -user2 localhost stage/sql/init 0 +user2 localhost stage/sql/Checking permissions 0 +user2 localhost stage/sql/Closing tables 0 +user2 localhost stage/sql/Init 0 +user2 localhost stage/sql/Init for update 0 user2 localhost stage/sql/Opening tables 0 execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 3 -user1 stage/sql/closing tables 3 -user1 stage/sql/init 6 +user1 stage/sql/Checking permissions 3 +user1 stage/sql/Closing tables 4 +user1 stage/sql/Init 5 +user1 stage/sql/Init for update 1 user1 stage/sql/Opening tables 3 -user2 stage/sql/checking permissions 0 -user2 stage/sql/closing tables 0 -user2 stage/sql/init 0 +user2 stage/sql/Checking permissions 0 +user2 stage/sql/Closing tables 0 +user2 stage/sql/Init 0 +user2 stage/sql/Init for update 0 user2 stage/sql/Opening tables 0 execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/checking permissions 3 -stage/sql/closing tables 3 -stage/sql/init 6 +stage/sql/Checking permissions 3 +stage/sql/Closing tables 4 +stage/sql/Init 5 +stage/sql/Init for update 1 stage/sql/Opening tables 3 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 3 -stage/sql/closing tables 3 -stage/sql/init 6 +stage/sql/Checking permissions 3 +stage/sql/Closing tables 4 +stage/sql/Init 5 +stage/sql/Init for update 1 stage/sql/Opening tables 3 execute dump_statements_account; user host event_name count_star @@ -443,37 +457,43 @@ wait/io/file/sql/query_log 8 wait/synch/rwlock/sql/LOCK_grant 2 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 3 -user1 localhost stage/sql/closing tables 3 -user1 localhost stage/sql/init 6 +user1 localhost stage/sql/Checking permissions 3 +user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Init 5 +user1 localhost stage/sql/Init for update 1 user1 localhost stage/sql/Opening tables 3 -user2 localhost stage/sql/checking permissions 3 -user2 localhost stage/sql/closing tables 3 -user2 localhost stage/sql/init 6 +user2 localhost stage/sql/Checking permissions 3 +user2 localhost stage/sql/Closing tables 4 +user2 localhost stage/sql/Init 5 +user2 localhost stage/sql/Init for update 1 user2 localhost stage/sql/Opening tables 3 execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 3 -user1 stage/sql/closing tables 3 -user1 stage/sql/init 6 +user1 stage/sql/Checking permissions 3 +user1 stage/sql/Closing tables 4 +user1 stage/sql/Init 5 +user1 stage/sql/Init for update 1 user1 stage/sql/Opening tables 3 -user2 stage/sql/checking permissions 3 -user2 stage/sql/closing tables 3 -user2 stage/sql/init 6 +user2 stage/sql/Checking permissions 3 +user2 stage/sql/Closing tables 4 +user2 stage/sql/Init 5 +user2 stage/sql/Init for update 1 user2 stage/sql/Opening tables 3 execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/checking permissions 6 -stage/sql/closing tables 6 -stage/sql/init 12 +stage/sql/Checking permissions 6 +stage/sql/Closing tables 8 +stage/sql/Init 10 +stage/sql/Init for update 2 stage/sql/Opening tables 6 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 6 -stage/sql/closing tables 6 -stage/sql/init 12 +stage/sql/Checking permissions 6 +stage/sql/Closing tables 8 +stage/sql/Init 10 +stage/sql/Init for update 2 stage/sql/Opening tables 6 execute dump_statements_account; user host event_name count_star @@ -582,45 +602,53 @@ wait/io/file/sql/query_log 9 wait/synch/rwlock/sql/LOCK_grant 2 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 3 -user1 localhost stage/sql/closing tables 3 -user1 localhost stage/sql/init 6 +user1 localhost stage/sql/Checking permissions 3 +user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Init 5 +user1 localhost stage/sql/Init for update 1 user1 localhost stage/sql/Opening tables 3 -user2 localhost stage/sql/checking permissions 3 -user2 localhost stage/sql/closing tables 3 -user2 localhost stage/sql/init 6 +user2 localhost stage/sql/Checking permissions 3 +user2 localhost stage/sql/Closing tables 4 +user2 localhost stage/sql/Init 5 +user2 localhost stage/sql/Init for update 1 user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/checking permissions 0 -user3 localhost stage/sql/closing tables 0 -user3 localhost stage/sql/init 0 +user3 localhost stage/sql/Checking permissions 0 +user3 localhost stage/sql/Closing tables 0 +user3 localhost stage/sql/Init 0 +user3 localhost stage/sql/Init for update 0 user3 localhost stage/sql/Opening tables 0 execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 3 -user1 stage/sql/closing tables 3 -user1 stage/sql/init 6 +user1 stage/sql/Checking permissions 3 +user1 stage/sql/Closing tables 4 +user1 stage/sql/Init 5 +user1 stage/sql/Init for update 1 user1 stage/sql/Opening tables 3 -user2 stage/sql/checking permissions 3 -user2 stage/sql/closing tables 3 -user2 stage/sql/init 6 +user2 stage/sql/Checking permissions 3 +user2 stage/sql/Closing tables 4 +user2 stage/sql/Init 5 +user2 stage/sql/Init for update 1 user2 stage/sql/Opening tables 3 -user3 stage/sql/checking permissions 0 -user3 stage/sql/closing tables 0 -user3 stage/sql/init 0 +user3 stage/sql/Checking permissions 0 +user3 stage/sql/Closing tables 0 +user3 stage/sql/Init 0 +user3 stage/sql/Init for update 0 user3 stage/sql/Opening tables 0 execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/checking permissions 6 -stage/sql/closing tables 6 -stage/sql/init 12 +stage/sql/Checking permissions 6 +stage/sql/Closing tables 8 +stage/sql/Init 10 +stage/sql/Init for update 2 stage/sql/Opening tables 6 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 6 -stage/sql/closing tables 6 -stage/sql/init 12 +stage/sql/Checking permissions 6 +stage/sql/Closing tables 8 +stage/sql/Init 10 +stage/sql/Init for update 2 stage/sql/Opening tables 6 execute dump_statements_account; user host event_name count_star @@ -746,45 +774,53 @@ wait/io/file/sql/query_log 12 wait/synch/rwlock/sql/LOCK_grant 3 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 3 -user1 localhost stage/sql/closing tables 3 -user1 localhost stage/sql/init 6 +user1 localhost stage/sql/Checking permissions 3 +user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Init 5 +user1 localhost stage/sql/Init for update 1 user1 localhost stage/sql/Opening tables 3 -user2 localhost stage/sql/checking permissions 3 -user2 localhost stage/sql/closing tables 3 -user2 localhost stage/sql/init 6 +user2 localhost stage/sql/Checking permissions 3 +user2 localhost stage/sql/Closing tables 4 +user2 localhost stage/sql/Init 5 +user2 localhost stage/sql/Init for update 1 user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/checking permissions 3 -user3 localhost stage/sql/closing tables 3 -user3 localhost stage/sql/init 6 +user3 localhost stage/sql/Checking permissions 3 +user3 localhost stage/sql/Closing tables 4 +user3 localhost stage/sql/Init 5 +user3 localhost stage/sql/Init for update 1 user3 localhost stage/sql/Opening tables 3 execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 3 -user1 stage/sql/closing tables 3 -user1 stage/sql/init 6 +user1 stage/sql/Checking permissions 3 +user1 stage/sql/Closing tables 4 +user1 stage/sql/Init 5 +user1 stage/sql/Init for update 1 user1 stage/sql/Opening tables 3 -user2 stage/sql/checking permissions 3 -user2 stage/sql/closing tables 3 -user2 stage/sql/init 6 +user2 stage/sql/Checking permissions 3 +user2 stage/sql/Closing tables 4 +user2 stage/sql/Init 5 +user2 stage/sql/Init for update 1 user2 stage/sql/Opening tables 3 -user3 stage/sql/checking permissions 3 -user3 stage/sql/closing tables 3 -user3 stage/sql/init 6 +user3 stage/sql/Checking permissions 3 +user3 stage/sql/Closing tables 4 +user3 stage/sql/Init 5 +user3 stage/sql/Init for update 1 user3 stage/sql/Opening tables 3 execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/checking permissions 9 -stage/sql/closing tables 9 -stage/sql/init 18 +stage/sql/Checking permissions 9 +stage/sql/Closing tables 12 +stage/sql/Init 15 +stage/sql/Init for update 3 stage/sql/Opening tables 9 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 9 -stage/sql/closing tables 9 -stage/sql/init 18 +stage/sql/Checking permissions 9 +stage/sql/Closing tables 12 +stage/sql/Init 15 +stage/sql/Init for update 3 stage/sql/Opening tables 9 execute dump_statements_account; user host event_name count_star @@ -914,53 +950,63 @@ wait/io/file/sql/query_log 13 wait/synch/rwlock/sql/LOCK_grant 3 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 3 -user1 localhost stage/sql/closing tables 3 -user1 localhost stage/sql/init 6 +user1 localhost stage/sql/Checking permissions 3 +user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Init 5 +user1 localhost stage/sql/Init for update 1 user1 localhost stage/sql/Opening tables 3 -user2 localhost stage/sql/checking permissions 3 -user2 localhost stage/sql/closing tables 3 -user2 localhost stage/sql/init 6 +user2 localhost stage/sql/Checking permissions 3 +user2 localhost stage/sql/Closing tables 4 +user2 localhost stage/sql/Init 5 +user2 localhost stage/sql/Init for update 1 user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/checking permissions 3 -user3 localhost stage/sql/closing tables 3 -user3 localhost stage/sql/init 6 +user3 localhost stage/sql/Checking permissions 3 +user3 localhost stage/sql/Closing tables 4 +user3 localhost stage/sql/Init 5 +user3 localhost stage/sql/Init for update 1 user3 localhost stage/sql/Opening tables 3 -user4 localhost stage/sql/checking permissions 0 -user4 localhost stage/sql/closing tables 0 -user4 localhost stage/sql/init 0 +user4 localhost stage/sql/Checking permissions 0 +user4 localhost stage/sql/Closing tables 0 +user4 localhost stage/sql/Init 0 +user4 localhost stage/sql/Init for update 0 user4 localhost stage/sql/Opening tables 0 execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 3 -user1 stage/sql/closing tables 3 -user1 stage/sql/init 6 +user1 stage/sql/Checking permissions 3 +user1 stage/sql/Closing tables 4 +user1 stage/sql/Init 5 +user1 stage/sql/Init for update 1 user1 stage/sql/Opening tables 3 -user2 stage/sql/checking permissions 3 -user2 stage/sql/closing tables 3 -user2 stage/sql/init 6 +user2 stage/sql/Checking permissions 3 +user2 stage/sql/Closing tables 4 +user2 stage/sql/Init 5 +user2 stage/sql/Init for update 1 user2 stage/sql/Opening tables 3 -user3 stage/sql/checking permissions 3 -user3 stage/sql/closing tables 3 -user3 stage/sql/init 6 +user3 stage/sql/Checking permissions 3 +user3 stage/sql/Closing tables 4 +user3 stage/sql/Init 5 +user3 stage/sql/Init for update 1 user3 stage/sql/Opening tables 3 -user4 stage/sql/checking permissions 0 -user4 stage/sql/closing tables 0 -user4 stage/sql/init 0 +user4 stage/sql/Checking permissions 0 +user4 stage/sql/Closing tables 0 +user4 stage/sql/Init 0 +user4 stage/sql/Init for update 0 user4 stage/sql/Opening tables 0 execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/checking permissions 9 -stage/sql/closing tables 9 -stage/sql/init 18 +stage/sql/Checking permissions 9 +stage/sql/Closing tables 12 +stage/sql/Init 15 +stage/sql/Init for update 3 stage/sql/Opening tables 9 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 9 -stage/sql/closing tables 9 -stage/sql/init 18 +stage/sql/Checking permissions 9 +stage/sql/Closing tables 12 +stage/sql/Init 15 +stage/sql/Init for update 3 stage/sql/Opening tables 9 execute dump_statements_account; user host event_name count_star @@ -1107,53 +1153,63 @@ wait/io/file/sql/query_log 16 wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 3 -user1 localhost stage/sql/closing tables 3 -user1 localhost stage/sql/init 6 +user1 localhost stage/sql/Checking permissions 3 +user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Init 5 +user1 localhost stage/sql/Init for update 1 user1 localhost stage/sql/Opening tables 3 -user2 localhost stage/sql/checking permissions 3 -user2 localhost stage/sql/closing tables 3 -user2 localhost stage/sql/init 6 +user2 localhost stage/sql/Checking permissions 3 +user2 localhost stage/sql/Closing tables 4 +user2 localhost stage/sql/Init 5 +user2 localhost stage/sql/Init for update 1 user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/checking permissions 3 -user3 localhost stage/sql/closing tables 3 -user3 localhost stage/sql/init 6 +user3 localhost stage/sql/Checking permissions 3 +user3 localhost stage/sql/Closing tables 4 +user3 localhost stage/sql/Init 5 +user3 localhost stage/sql/Init for update 1 user3 localhost stage/sql/Opening tables 3 -user4 localhost stage/sql/checking permissions 3 -user4 localhost stage/sql/closing tables 3 -user4 localhost stage/sql/init 6 +user4 localhost stage/sql/Checking permissions 3 +user4 localhost stage/sql/Closing tables 4 +user4 localhost stage/sql/Init 5 +user4 localhost stage/sql/Init for update 1 user4 localhost stage/sql/Opening tables 3 execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 3 -user1 stage/sql/closing tables 3 -user1 stage/sql/init 6 +user1 stage/sql/Checking permissions 3 +user1 stage/sql/Closing tables 4 +user1 stage/sql/Init 5 +user1 stage/sql/Init for update 1 user1 stage/sql/Opening tables 3 -user2 stage/sql/checking permissions 3 -user2 stage/sql/closing tables 3 -user2 stage/sql/init 6 +user2 stage/sql/Checking permissions 3 +user2 stage/sql/Closing tables 4 +user2 stage/sql/Init 5 +user2 stage/sql/Init for update 1 user2 stage/sql/Opening tables 3 -user3 stage/sql/checking permissions 3 -user3 stage/sql/closing tables 3 -user3 stage/sql/init 6 +user3 stage/sql/Checking permissions 3 +user3 stage/sql/Closing tables 4 +user3 stage/sql/Init 5 +user3 stage/sql/Init for update 1 user3 stage/sql/Opening tables 3 -user4 stage/sql/checking permissions 3 -user4 stage/sql/closing tables 3 -user4 stage/sql/init 6 +user4 stage/sql/Checking permissions 3 +user4 stage/sql/Closing tables 4 +user4 stage/sql/Init 5 +user4 stage/sql/Init for update 1 user4 stage/sql/Opening tables 3 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 12 -stage/sql/init 24 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 20 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 24 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 20 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -1291,53 +1347,63 @@ wait/synch/mutex/sql/LOCK_connection_count 1 wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 3 -user1 localhost stage/sql/closing tables 3 -user1 localhost stage/sql/init 7 +user1 localhost stage/sql/Checking permissions 3 +user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Init 6 +user1 localhost stage/sql/Init for update 1 user1 localhost stage/sql/Opening tables 3 -user2 localhost stage/sql/checking permissions 3 -user2 localhost stage/sql/closing tables 3 -user2 localhost stage/sql/init 6 +user2 localhost stage/sql/Checking permissions 3 +user2 localhost stage/sql/Closing tables 4 +user2 localhost stage/sql/Init 5 +user2 localhost stage/sql/Init for update 1 user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/checking permissions 3 -user3 localhost stage/sql/closing tables 3 -user3 localhost stage/sql/init 6 +user3 localhost stage/sql/Checking permissions 3 +user3 localhost stage/sql/Closing tables 4 +user3 localhost stage/sql/Init 5 +user3 localhost stage/sql/Init for update 1 user3 localhost stage/sql/Opening tables 3 -user4 localhost stage/sql/checking permissions 3 -user4 localhost stage/sql/closing tables 3 -user4 localhost stage/sql/init 6 +user4 localhost stage/sql/Checking permissions 3 +user4 localhost stage/sql/Closing tables 4 +user4 localhost stage/sql/Init 5 +user4 localhost stage/sql/Init for update 1 user4 localhost stage/sql/Opening tables 3 execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 3 -user1 stage/sql/closing tables 3 -user1 stage/sql/init 7 +user1 stage/sql/Checking permissions 3 +user1 stage/sql/Closing tables 4 +user1 stage/sql/Init 6 +user1 stage/sql/Init for update 1 user1 stage/sql/Opening tables 3 -user2 stage/sql/checking permissions 3 -user2 stage/sql/closing tables 3 -user2 stage/sql/init 6 +user2 stage/sql/Checking permissions 3 +user2 stage/sql/Closing tables 4 +user2 stage/sql/Init 5 +user2 stage/sql/Init for update 1 user2 stage/sql/Opening tables 3 -user3 stage/sql/checking permissions 3 -user3 stage/sql/closing tables 3 -user3 stage/sql/init 6 +user3 stage/sql/Checking permissions 3 +user3 stage/sql/Closing tables 4 +user3 stage/sql/Init 5 +user3 stage/sql/Init for update 1 user3 stage/sql/Opening tables 3 -user4 stage/sql/checking permissions 3 -user4 stage/sql/closing tables 3 -user4 stage/sql/init 6 +user4 stage/sql/Checking permissions 3 +user4 stage/sql/Closing tables 4 +user4 stage/sql/Init 5 +user4 stage/sql/Init for update 1 user4 stage/sql/Opening tables 3 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 12 -stage/sql/init 25 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 21 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 25 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 21 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -1473,53 +1539,63 @@ wait/synch/mutex/sql/LOCK_connection_count 2 wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 3 -user1 localhost stage/sql/closing tables 3 -user1 localhost stage/sql/init 7 +user1 localhost stage/sql/Checking permissions 3 +user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Init 6 +user1 localhost stage/sql/Init for update 1 user1 localhost stage/sql/Opening tables 3 -user2 localhost stage/sql/checking permissions 3 -user2 localhost stage/sql/closing tables 3 -user2 localhost stage/sql/init 7 +user2 localhost stage/sql/Checking permissions 3 +user2 localhost stage/sql/Closing tables 4 +user2 localhost stage/sql/Init 6 +user2 localhost stage/sql/Init for update 1 user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/checking permissions 3 -user3 localhost stage/sql/closing tables 3 -user3 localhost stage/sql/init 6 +user3 localhost stage/sql/Checking permissions 3 +user3 localhost stage/sql/Closing tables 4 +user3 localhost stage/sql/Init 5 +user3 localhost stage/sql/Init for update 1 user3 localhost stage/sql/Opening tables 3 -user4 localhost stage/sql/checking permissions 3 -user4 localhost stage/sql/closing tables 3 -user4 localhost stage/sql/init 6 +user4 localhost stage/sql/Checking permissions 3 +user4 localhost stage/sql/Closing tables 4 +user4 localhost stage/sql/Init 5 +user4 localhost stage/sql/Init for update 1 user4 localhost stage/sql/Opening tables 3 execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 3 -user1 stage/sql/closing tables 3 -user1 stage/sql/init 7 +user1 stage/sql/Checking permissions 3 +user1 stage/sql/Closing tables 4 +user1 stage/sql/Init 6 +user1 stage/sql/Init for update 1 user1 stage/sql/Opening tables 3 -user2 stage/sql/checking permissions 3 -user2 stage/sql/closing tables 3 -user2 stage/sql/init 7 +user2 stage/sql/Checking permissions 3 +user2 stage/sql/Closing tables 4 +user2 stage/sql/Init 6 +user2 stage/sql/Init for update 1 user2 stage/sql/Opening tables 3 -user3 stage/sql/checking permissions 3 -user3 stage/sql/closing tables 3 -user3 stage/sql/init 6 +user3 stage/sql/Checking permissions 3 +user3 stage/sql/Closing tables 4 +user3 stage/sql/Init 5 +user3 stage/sql/Init for update 1 user3 stage/sql/Opening tables 3 -user4 stage/sql/checking permissions 3 -user4 stage/sql/closing tables 3 -user4 stage/sql/init 6 +user4 stage/sql/Checking permissions 3 +user4 stage/sql/Closing tables 4 +user4 stage/sql/Init 5 +user4 stage/sql/Init for update 1 user4 stage/sql/Opening tables 3 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 12 -stage/sql/init 26 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 22 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 26 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 22 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -1652,53 +1728,63 @@ wait/synch/mutex/sql/LOCK_connection_count 3 wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 3 -user1 localhost stage/sql/closing tables 3 -user1 localhost stage/sql/init 7 +user1 localhost stage/sql/Checking permissions 3 +user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Init 6 +user1 localhost stage/sql/Init for update 1 user1 localhost stage/sql/Opening tables 3 -user2 localhost stage/sql/checking permissions 3 -user2 localhost stage/sql/closing tables 3 -user2 localhost stage/sql/init 7 +user2 localhost stage/sql/Checking permissions 3 +user2 localhost stage/sql/Closing tables 4 +user2 localhost stage/sql/Init 6 +user2 localhost stage/sql/Init for update 1 user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/checking permissions 3 -user3 localhost stage/sql/closing tables 3 -user3 localhost stage/sql/init 7 +user3 localhost stage/sql/Checking permissions 3 +user3 localhost stage/sql/Closing tables 4 +user3 localhost stage/sql/Init 6 +user3 localhost stage/sql/Init for update 1 user3 localhost stage/sql/Opening tables 3 -user4 localhost stage/sql/checking permissions 3 -user4 localhost stage/sql/closing tables 3 -user4 localhost stage/sql/init 6 +user4 localhost stage/sql/Checking permissions 3 +user4 localhost stage/sql/Closing tables 4 +user4 localhost stage/sql/Init 5 +user4 localhost stage/sql/Init for update 1 user4 localhost stage/sql/Opening tables 3 execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 3 -user1 stage/sql/closing tables 3 -user1 stage/sql/init 7 +user1 stage/sql/Checking permissions 3 +user1 stage/sql/Closing tables 4 +user1 stage/sql/Init 6 +user1 stage/sql/Init for update 1 user1 stage/sql/Opening tables 3 -user2 stage/sql/checking permissions 3 -user2 stage/sql/closing tables 3 -user2 stage/sql/init 7 +user2 stage/sql/Checking permissions 3 +user2 stage/sql/Closing tables 4 +user2 stage/sql/Init 6 +user2 stage/sql/Init for update 1 user2 stage/sql/Opening tables 3 -user3 stage/sql/checking permissions 3 -user3 stage/sql/closing tables 3 -user3 stage/sql/init 7 +user3 stage/sql/Checking permissions 3 +user3 stage/sql/Closing tables 4 +user3 stage/sql/Init 6 +user3 stage/sql/Init for update 1 user3 stage/sql/Opening tables 3 -user4 stage/sql/checking permissions 3 -user4 stage/sql/closing tables 3 -user4 stage/sql/init 6 +user4 stage/sql/Checking permissions 3 +user4 stage/sql/Closing tables 4 +user4 stage/sql/Init 5 +user4 stage/sql/Init for update 1 user4 stage/sql/Opening tables 3 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 12 -stage/sql/init 27 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 23 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 27 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 23 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -1828,53 +1914,63 @@ wait/synch/mutex/sql/LOCK_connection_count 4 wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 3 -user1 localhost stage/sql/closing tables 3 -user1 localhost stage/sql/init 7 +user1 localhost stage/sql/Checking permissions 3 +user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Init 6 +user1 localhost stage/sql/Init for update 1 user1 localhost stage/sql/Opening tables 3 -user2 localhost stage/sql/checking permissions 3 -user2 localhost stage/sql/closing tables 3 -user2 localhost stage/sql/init 7 +user2 localhost stage/sql/Checking permissions 3 +user2 localhost stage/sql/Closing tables 4 +user2 localhost stage/sql/Init 6 +user2 localhost stage/sql/Init for update 1 user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/checking permissions 3 -user3 localhost stage/sql/closing tables 3 -user3 localhost stage/sql/init 7 +user3 localhost stage/sql/Checking permissions 3 +user3 localhost stage/sql/Closing tables 4 +user3 localhost stage/sql/Init 6 +user3 localhost stage/sql/Init for update 1 user3 localhost stage/sql/Opening tables 3 -user4 localhost stage/sql/checking permissions 3 -user4 localhost stage/sql/closing tables 3 -user4 localhost stage/sql/init 7 +user4 localhost stage/sql/Checking permissions 3 +user4 localhost stage/sql/Closing tables 4 +user4 localhost stage/sql/Init 6 +user4 localhost stage/sql/Init for update 1 user4 localhost stage/sql/Opening tables 3 execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 3 -user1 stage/sql/closing tables 3 -user1 stage/sql/init 7 +user1 stage/sql/Checking permissions 3 +user1 stage/sql/Closing tables 4 +user1 stage/sql/Init 6 +user1 stage/sql/Init for update 1 user1 stage/sql/Opening tables 3 -user2 stage/sql/checking permissions 3 -user2 stage/sql/closing tables 3 -user2 stage/sql/init 7 +user2 stage/sql/Checking permissions 3 +user2 stage/sql/Closing tables 4 +user2 stage/sql/Init 6 +user2 stage/sql/Init for update 1 user2 stage/sql/Opening tables 3 -user3 stage/sql/checking permissions 3 -user3 stage/sql/closing tables 3 -user3 stage/sql/init 7 +user3 stage/sql/Checking permissions 3 +user3 stage/sql/Closing tables 4 +user3 stage/sql/Init 6 +user3 stage/sql/Init for update 1 user3 stage/sql/Opening tables 3 -user4 stage/sql/checking permissions 3 -user4 stage/sql/closing tables 3 -user4 stage/sql/init 7 +user4 stage/sql/Checking permissions 3 +user4 stage/sql/Closing tables 4 +user4 stage/sql/Init 6 +user4 stage/sql/Init for update 1 user4 stage/sql/Opening tables 3 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 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -2005,53 +2101,63 @@ wait/synch/mutex/sql/LOCK_connection_count 4 wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 3 -user1 localhost stage/sql/closing tables 3 -user1 localhost stage/sql/init 7 +user1 localhost stage/sql/Checking permissions 3 +user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Init 6 +user1 localhost stage/sql/Init for update 1 user1 localhost stage/sql/Opening tables 3 -user2 localhost stage/sql/checking permissions 3 -user2 localhost stage/sql/closing tables 3 -user2 localhost stage/sql/init 7 +user2 localhost stage/sql/Checking permissions 3 +user2 localhost stage/sql/Closing tables 4 +user2 localhost stage/sql/Init 6 +user2 localhost stage/sql/Init for update 1 user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/checking permissions 3 -user3 localhost stage/sql/closing tables 3 -user3 localhost stage/sql/init 7 +user3 localhost stage/sql/Checking permissions 3 +user3 localhost stage/sql/Closing tables 4 +user3 localhost stage/sql/Init 6 +user3 localhost stage/sql/Init for update 1 user3 localhost stage/sql/Opening tables 3 -user4 localhost stage/sql/checking permissions 3 -user4 localhost stage/sql/closing tables 3 -user4 localhost stage/sql/init 7 +user4 localhost stage/sql/Checking permissions 3 +user4 localhost stage/sql/Closing tables 4 +user4 localhost stage/sql/Init 6 +user4 localhost stage/sql/Init for update 1 user4 localhost stage/sql/Opening tables 3 execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 3 -user1 stage/sql/closing tables 3 -user1 stage/sql/init 7 +user1 stage/sql/Checking permissions 3 +user1 stage/sql/Closing tables 4 +user1 stage/sql/Init 6 +user1 stage/sql/Init for update 1 user1 stage/sql/Opening tables 3 -user2 stage/sql/checking permissions 3 -user2 stage/sql/closing tables 3 -user2 stage/sql/init 7 +user2 stage/sql/Checking permissions 3 +user2 stage/sql/Closing tables 4 +user2 stage/sql/Init 6 +user2 stage/sql/Init for update 1 user2 stage/sql/Opening tables 3 -user3 stage/sql/checking permissions 3 -user3 stage/sql/closing tables 3 -user3 stage/sql/init 7 +user3 stage/sql/Checking permissions 3 +user3 stage/sql/Closing tables 4 +user3 stage/sql/Init 6 +user3 stage/sql/Init for update 1 user3 stage/sql/Opening tables 3 -user4 stage/sql/checking permissions 3 -user4 stage/sql/closing tables 3 -user4 stage/sql/init 7 +user4 stage/sql/Checking permissions 3 +user4 stage/sql/Closing tables 4 +user4 stage/sql/Init 6 +user4 stage/sql/Init for update 1 user4 stage/sql/Opening tables 3 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 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -2181,53 +2287,63 @@ wait/synch/mutex/sql/LOCK_connection_count 4 wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 3 -user1 localhost stage/sql/closing tables 3 -user1 localhost stage/sql/init 7 +user1 localhost stage/sql/Checking permissions 3 +user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Init 6 +user1 localhost stage/sql/Init for update 1 user1 localhost stage/sql/Opening tables 3 -user2 localhost stage/sql/checking permissions 3 -user2 localhost stage/sql/closing tables 3 -user2 localhost stage/sql/init 7 +user2 localhost stage/sql/Checking permissions 3 +user2 localhost stage/sql/Closing tables 4 +user2 localhost stage/sql/Init 6 +user2 localhost stage/sql/Init for update 1 user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/checking permissions 3 -user3 localhost stage/sql/closing tables 3 -user3 localhost stage/sql/init 7 +user3 localhost stage/sql/Checking permissions 3 +user3 localhost stage/sql/Closing tables 4 +user3 localhost stage/sql/Init 6 +user3 localhost stage/sql/Init for update 1 user3 localhost stage/sql/Opening tables 3 -user4 localhost stage/sql/checking permissions 3 -user4 localhost stage/sql/closing tables 3 -user4 localhost stage/sql/init 7 +user4 localhost stage/sql/Checking permissions 3 +user4 localhost stage/sql/Closing tables 4 +user4 localhost stage/sql/Init 6 +user4 localhost stage/sql/Init for update 1 user4 localhost stage/sql/Opening tables 3 execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 3 -user1 stage/sql/closing tables 3 -user1 stage/sql/init 7 +user1 stage/sql/Checking permissions 3 +user1 stage/sql/Closing tables 4 +user1 stage/sql/Init 6 +user1 stage/sql/Init for update 1 user1 stage/sql/Opening tables 3 -user2 stage/sql/checking permissions 3 -user2 stage/sql/closing tables 3 -user2 stage/sql/init 7 +user2 stage/sql/Checking permissions 3 +user2 stage/sql/Closing tables 4 +user2 stage/sql/Init 6 +user2 stage/sql/Init for update 1 user2 stage/sql/Opening tables 3 -user3 stage/sql/checking permissions 3 -user3 stage/sql/closing tables 3 -user3 stage/sql/init 7 +user3 stage/sql/Checking permissions 3 +user3 stage/sql/Closing tables 4 +user3 stage/sql/Init 6 +user3 stage/sql/Init for update 1 user3 stage/sql/Opening tables 3 -user4 stage/sql/checking permissions 3 -user4 stage/sql/closing tables 3 -user4 stage/sql/init 7 +user4 stage/sql/Checking permissions 3 +user4 stage/sql/Closing tables 4 +user4 stage/sql/Init 6 +user4 stage/sql/Init for update 1 user4 stage/sql/Opening tables 3 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 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -2357,53 +2473,63 @@ wait/synch/mutex/sql/LOCK_connection_count 4 wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 3 -user1 localhost stage/sql/closing tables 3 -user1 localhost stage/sql/init 7 +user1 localhost stage/sql/Checking permissions 3 +user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Init 6 +user1 localhost stage/sql/Init for update 1 user1 localhost stage/sql/Opening tables 3 -user2 localhost stage/sql/checking permissions 3 -user2 localhost stage/sql/closing tables 3 -user2 localhost stage/sql/init 7 +user2 localhost stage/sql/Checking permissions 3 +user2 localhost stage/sql/Closing tables 4 +user2 localhost stage/sql/Init 6 +user2 localhost stage/sql/Init for update 1 user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/checking permissions 3 -user3 localhost stage/sql/closing tables 3 -user3 localhost stage/sql/init 7 +user3 localhost stage/sql/Checking permissions 3 +user3 localhost stage/sql/Closing tables 4 +user3 localhost stage/sql/Init 6 +user3 localhost stage/sql/Init for update 1 user3 localhost stage/sql/Opening tables 3 -user4 localhost stage/sql/checking permissions 3 -user4 localhost stage/sql/closing tables 3 -user4 localhost stage/sql/init 7 +user4 localhost stage/sql/Checking permissions 3 +user4 localhost stage/sql/Closing tables 4 +user4 localhost stage/sql/Init 6 +user4 localhost stage/sql/Init for update 1 user4 localhost stage/sql/Opening tables 3 execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 3 -user1 stage/sql/closing tables 3 -user1 stage/sql/init 7 +user1 stage/sql/Checking permissions 3 +user1 stage/sql/Closing tables 4 +user1 stage/sql/Init 6 +user1 stage/sql/Init for update 1 user1 stage/sql/Opening tables 3 -user2 stage/sql/checking permissions 3 -user2 stage/sql/closing tables 3 -user2 stage/sql/init 7 +user2 stage/sql/Checking permissions 3 +user2 stage/sql/Closing tables 4 +user2 stage/sql/Init 6 +user2 stage/sql/Init for update 1 user2 stage/sql/Opening tables 3 -user3 stage/sql/checking permissions 3 -user3 stage/sql/closing tables 3 -user3 stage/sql/init 7 +user3 stage/sql/Checking permissions 3 +user3 stage/sql/Closing tables 4 +user3 stage/sql/Init 6 +user3 stage/sql/Init for update 1 user3 stage/sql/Opening tables 3 -user4 stage/sql/checking permissions 3 -user4 stage/sql/closing tables 3 -user4 stage/sql/init 7 +user4 stage/sql/Checking permissions 3 +user4 stage/sql/Closing tables 4 +user4 stage/sql/Init 6 +user4 stage/sql/Init for update 1 user4 stage/sql/Opening tables 3 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 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -2533,53 +2659,63 @@ wait/synch/mutex/sql/LOCK_connection_count 4 wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 3 -user1 localhost stage/sql/closing tables 3 -user1 localhost stage/sql/init 7 +user1 localhost stage/sql/Checking permissions 3 +user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Init 6 +user1 localhost stage/sql/Init for update 1 user1 localhost stage/sql/Opening tables 3 -user2 localhost stage/sql/checking permissions 3 -user2 localhost stage/sql/closing tables 3 -user2 localhost stage/sql/init 7 +user2 localhost stage/sql/Checking permissions 3 +user2 localhost stage/sql/Closing tables 4 +user2 localhost stage/sql/Init 6 +user2 localhost stage/sql/Init for update 1 user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/checking permissions 3 -user3 localhost stage/sql/closing tables 3 -user3 localhost stage/sql/init 7 +user3 localhost stage/sql/Checking permissions 3 +user3 localhost stage/sql/Closing tables 4 +user3 localhost stage/sql/Init 6 +user3 localhost stage/sql/Init for update 1 user3 localhost stage/sql/Opening tables 3 -user4 localhost stage/sql/checking permissions 3 -user4 localhost stage/sql/closing tables 3 -user4 localhost stage/sql/init 7 +user4 localhost stage/sql/Checking permissions 3 +user4 localhost stage/sql/Closing tables 4 +user4 localhost stage/sql/Init 6 +user4 localhost stage/sql/Init for update 1 user4 localhost stage/sql/Opening tables 3 execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 3 -user1 stage/sql/closing tables 3 -user1 stage/sql/init 7 +user1 stage/sql/Checking permissions 3 +user1 stage/sql/Closing tables 4 +user1 stage/sql/Init 6 +user1 stage/sql/Init for update 1 user1 stage/sql/Opening tables 3 -user2 stage/sql/checking permissions 3 -user2 stage/sql/closing tables 3 -user2 stage/sql/init 7 +user2 stage/sql/Checking permissions 3 +user2 stage/sql/Closing tables 4 +user2 stage/sql/Init 6 +user2 stage/sql/Init for update 1 user2 stage/sql/Opening tables 3 -user3 stage/sql/checking permissions 3 -user3 stage/sql/closing tables 3 -user3 stage/sql/init 7 +user3 stage/sql/Checking permissions 3 +user3 stage/sql/Closing tables 4 +user3 stage/sql/Init 6 +user3 stage/sql/Init for update 1 user3 stage/sql/Opening tables 3 -user4 stage/sql/checking permissions 3 -user4 stage/sql/closing tables 3 -user4 stage/sql/init 7 +user4 stage/sql/Checking permissions 3 +user4 stage/sql/Closing tables 4 +user4 stage/sql/Init 6 +user4 stage/sql/Init for update 1 user4 stage/sql/Opening tables 3 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 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -2709,53 +2845,63 @@ wait/synch/mutex/sql/LOCK_connection_count 4 wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 3 -user1 localhost stage/sql/closing tables 3 -user1 localhost stage/sql/init 7 +user1 localhost stage/sql/Checking permissions 3 +user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Init 6 +user1 localhost stage/sql/Init for update 1 user1 localhost stage/sql/Opening tables 3 -user2 localhost stage/sql/checking permissions 3 -user2 localhost stage/sql/closing tables 3 -user2 localhost stage/sql/init 7 +user2 localhost stage/sql/Checking permissions 3 +user2 localhost stage/sql/Closing tables 4 +user2 localhost stage/sql/Init 6 +user2 localhost stage/sql/Init for update 1 user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/checking permissions 3 -user3 localhost stage/sql/closing tables 3 -user3 localhost stage/sql/init 7 +user3 localhost stage/sql/Checking permissions 3 +user3 localhost stage/sql/Closing tables 4 +user3 localhost stage/sql/Init 6 +user3 localhost stage/sql/Init for update 1 user3 localhost stage/sql/Opening tables 3 -user4 localhost stage/sql/checking permissions 3 -user4 localhost stage/sql/closing tables 3 -user4 localhost stage/sql/init 7 +user4 localhost stage/sql/Checking permissions 3 +user4 localhost stage/sql/Closing tables 4 +user4 localhost stage/sql/Init 6 +user4 localhost stage/sql/Init for update 1 user4 localhost stage/sql/Opening tables 3 execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 3 -user1 stage/sql/closing tables 3 -user1 stage/sql/init 7 +user1 stage/sql/Checking permissions 3 +user1 stage/sql/Closing tables 4 +user1 stage/sql/Init 6 +user1 stage/sql/Init for update 1 user1 stage/sql/Opening tables 3 -user2 stage/sql/checking permissions 3 -user2 stage/sql/closing tables 3 -user2 stage/sql/init 7 +user2 stage/sql/Checking permissions 3 +user2 stage/sql/Closing tables 4 +user2 stage/sql/Init 6 +user2 stage/sql/Init for update 1 user2 stage/sql/Opening tables 3 -user3 stage/sql/checking permissions 3 -user3 stage/sql/closing tables 3 -user3 stage/sql/init 7 +user3 stage/sql/Checking permissions 3 +user3 stage/sql/Closing tables 4 +user3 stage/sql/Init 6 +user3 stage/sql/Init for update 1 user3 stage/sql/Opening tables 3 -user4 stage/sql/checking permissions 3 -user4 stage/sql/closing tables 3 -user4 stage/sql/init 7 +user4 stage/sql/Checking permissions 3 +user4 stage/sql/Closing tables 4 +user4 stage/sql/Init 6 +user4 stage/sql/Init for update 1 user4 stage/sql/Opening tables 3 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 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -2885,53 +3031,63 @@ wait/synch/mutex/sql/LOCK_connection_count 4 wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 3 -user1 localhost stage/sql/closing tables 3 -user1 localhost stage/sql/init 7 +user1 localhost stage/sql/Checking permissions 3 +user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Init 6 +user1 localhost stage/sql/Init for update 1 user1 localhost stage/sql/Opening tables 3 -user2 localhost stage/sql/checking permissions 3 -user2 localhost stage/sql/closing tables 3 -user2 localhost stage/sql/init 7 +user2 localhost stage/sql/Checking permissions 3 +user2 localhost stage/sql/Closing tables 4 +user2 localhost stage/sql/Init 6 +user2 localhost stage/sql/Init for update 1 user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/checking permissions 3 -user3 localhost stage/sql/closing tables 3 -user3 localhost stage/sql/init 7 +user3 localhost stage/sql/Checking permissions 3 +user3 localhost stage/sql/Closing tables 4 +user3 localhost stage/sql/Init 6 +user3 localhost stage/sql/Init for update 1 user3 localhost stage/sql/Opening tables 3 -user4 localhost stage/sql/checking permissions 3 -user4 localhost stage/sql/closing tables 3 -user4 localhost stage/sql/init 7 +user4 localhost stage/sql/Checking permissions 3 +user4 localhost stage/sql/Closing tables 4 +user4 localhost stage/sql/Init 6 +user4 localhost stage/sql/Init for update 1 user4 localhost stage/sql/Opening tables 3 execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 3 -user1 stage/sql/closing tables 3 -user1 stage/sql/init 7 +user1 stage/sql/Checking permissions 3 +user1 stage/sql/Closing tables 4 +user1 stage/sql/Init 6 +user1 stage/sql/Init for update 1 user1 stage/sql/Opening tables 3 -user2 stage/sql/checking permissions 3 -user2 stage/sql/closing tables 3 -user2 stage/sql/init 7 +user2 stage/sql/Checking permissions 3 +user2 stage/sql/Closing tables 4 +user2 stage/sql/Init 6 +user2 stage/sql/Init for update 1 user2 stage/sql/Opening tables 3 -user3 stage/sql/checking permissions 3 -user3 stage/sql/closing tables 3 -user3 stage/sql/init 7 +user3 stage/sql/Checking permissions 3 +user3 stage/sql/Closing tables 4 +user3 stage/sql/Init 6 +user3 stage/sql/Init for update 1 user3 stage/sql/Opening tables 3 -user4 stage/sql/checking permissions 3 -user4 stage/sql/closing tables 3 -user4 stage/sql/init 7 +user4 stage/sql/Checking permissions 3 +user4 stage/sql/Closing tables 4 +user4 stage/sql/Init 6 +user4 stage/sql/Init for update 1 user4 stage/sql/Opening tables 3 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 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -3061,53 +3217,63 @@ wait/synch/mutex/sql/LOCK_connection_count 4 wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 0 -user1 localhost stage/sql/closing tables 0 -user1 localhost stage/sql/init 0 +user1 localhost stage/sql/Checking permissions 0 +user1 localhost stage/sql/Closing tables 0 +user1 localhost stage/sql/Init 0 +user1 localhost stage/sql/Init for update 0 user1 localhost stage/sql/Opening tables 0 -user2 localhost stage/sql/checking permissions 0 -user2 localhost stage/sql/closing tables 0 -user2 localhost stage/sql/init 0 +user2 localhost stage/sql/Checking permissions 0 +user2 localhost stage/sql/Closing tables 0 +user2 localhost stage/sql/Init 0 +user2 localhost stage/sql/Init for update 0 user2 localhost stage/sql/Opening tables 0 -user3 localhost stage/sql/checking permissions 0 -user3 localhost stage/sql/closing tables 0 -user3 localhost stage/sql/init 0 +user3 localhost stage/sql/Checking permissions 0 +user3 localhost stage/sql/Closing tables 0 +user3 localhost stage/sql/Init 0 +user3 localhost stage/sql/Init for update 0 user3 localhost stage/sql/Opening tables 0 -user4 localhost stage/sql/checking permissions 0 -user4 localhost stage/sql/closing tables 0 -user4 localhost stage/sql/init 0 +user4 localhost stage/sql/Checking permissions 0 +user4 localhost stage/sql/Closing tables 0 +user4 localhost stage/sql/Init 0 +user4 localhost stage/sql/Init for update 0 user4 localhost stage/sql/Opening tables 0 execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 3 -user1 stage/sql/closing tables 3 -user1 stage/sql/init 7 +user1 stage/sql/Checking permissions 3 +user1 stage/sql/Closing tables 4 +user1 stage/sql/Init 6 +user1 stage/sql/Init for update 1 user1 stage/sql/Opening tables 3 -user2 stage/sql/checking permissions 3 -user2 stage/sql/closing tables 3 -user2 stage/sql/init 7 +user2 stage/sql/Checking permissions 3 +user2 stage/sql/Closing tables 4 +user2 stage/sql/Init 6 +user2 stage/sql/Init for update 1 user2 stage/sql/Opening tables 3 -user3 stage/sql/checking permissions 3 -user3 stage/sql/closing tables 3 -user3 stage/sql/init 7 +user3 stage/sql/Checking permissions 3 +user3 stage/sql/Closing tables 4 +user3 stage/sql/Init 6 +user3 stage/sql/Init for update 1 user3 stage/sql/Opening tables 3 -user4 stage/sql/checking permissions 3 -user4 stage/sql/closing tables 3 -user4 stage/sql/init 7 +user4 stage/sql/Checking permissions 3 +user4 stage/sql/Closing tables 4 +user4 stage/sql/Init 6 +user4 stage/sql/Init for update 1 user4 stage/sql/Opening tables 3 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 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -3237,53 +3403,63 @@ wait/synch/mutex/sql/LOCK_connection_count 4 wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 0 -user1 localhost stage/sql/closing tables 0 -user1 localhost stage/sql/init 0 +user1 localhost stage/sql/Checking permissions 0 +user1 localhost stage/sql/Closing tables 0 +user1 localhost stage/sql/Init 0 +user1 localhost stage/sql/Init for update 0 user1 localhost stage/sql/Opening tables 0 -user2 localhost stage/sql/checking permissions 0 -user2 localhost stage/sql/closing tables 0 -user2 localhost stage/sql/init 0 +user2 localhost stage/sql/Checking permissions 0 +user2 localhost stage/sql/Closing tables 0 +user2 localhost stage/sql/Init 0 +user2 localhost stage/sql/Init for update 0 user2 localhost stage/sql/Opening tables 0 -user3 localhost stage/sql/checking permissions 0 -user3 localhost stage/sql/closing tables 0 -user3 localhost stage/sql/init 0 +user3 localhost stage/sql/Checking permissions 0 +user3 localhost stage/sql/Closing tables 0 +user3 localhost stage/sql/Init 0 +user3 localhost stage/sql/Init for update 0 user3 localhost stage/sql/Opening tables 0 -user4 localhost stage/sql/checking permissions 0 -user4 localhost stage/sql/closing tables 0 -user4 localhost stage/sql/init 0 +user4 localhost stage/sql/Checking permissions 0 +user4 localhost stage/sql/Closing tables 0 +user4 localhost stage/sql/Init 0 +user4 localhost stage/sql/Init for update 0 user4 localhost stage/sql/Opening tables 0 execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 0 -user1 stage/sql/closing tables 0 -user1 stage/sql/init 0 +user1 stage/sql/Checking permissions 0 +user1 stage/sql/Closing tables 0 +user1 stage/sql/Init 0 +user1 stage/sql/Init for update 0 user1 stage/sql/Opening tables 0 -user2 stage/sql/checking permissions 0 -user2 stage/sql/closing tables 0 -user2 stage/sql/init 0 +user2 stage/sql/Checking permissions 0 +user2 stage/sql/Closing tables 0 +user2 stage/sql/Init 0 +user2 stage/sql/Init for update 0 user2 stage/sql/Opening tables 0 -user3 stage/sql/checking permissions 0 -user3 stage/sql/closing tables 0 -user3 stage/sql/init 0 +user3 stage/sql/Checking permissions 0 +user3 stage/sql/Closing tables 0 +user3 stage/sql/Init 0 +user3 stage/sql/Init for update 0 user3 stage/sql/Opening tables 0 -user4 stage/sql/checking permissions 0 -user4 stage/sql/closing tables 0 -user4 stage/sql/init 0 +user4 stage/sql/Checking permissions 0 +user4 stage/sql/Closing tables 0 +user4 stage/sql/Init 0 +user4 stage/sql/Init for update 0 user4 stage/sql/Opening tables 0 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 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -3413,53 +3589,63 @@ wait/synch/mutex/sql/LOCK_connection_count 4 wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 0 -user1 localhost stage/sql/closing tables 0 -user1 localhost stage/sql/init 0 +user1 localhost stage/sql/Checking permissions 0 +user1 localhost stage/sql/Closing tables 0 +user1 localhost stage/sql/Init 0 +user1 localhost stage/sql/Init for update 0 user1 localhost stage/sql/Opening tables 0 -user2 localhost stage/sql/checking permissions 0 -user2 localhost stage/sql/closing tables 0 -user2 localhost stage/sql/init 0 +user2 localhost stage/sql/Checking permissions 0 +user2 localhost stage/sql/Closing tables 0 +user2 localhost stage/sql/Init 0 +user2 localhost stage/sql/Init for update 0 user2 localhost stage/sql/Opening tables 0 -user3 localhost stage/sql/checking permissions 0 -user3 localhost stage/sql/closing tables 0 -user3 localhost stage/sql/init 0 +user3 localhost stage/sql/Checking permissions 0 +user3 localhost stage/sql/Closing tables 0 +user3 localhost stage/sql/Init 0 +user3 localhost stage/sql/Init for update 0 user3 localhost stage/sql/Opening tables 0 -user4 localhost stage/sql/checking permissions 0 -user4 localhost stage/sql/closing tables 0 -user4 localhost stage/sql/init 0 +user4 localhost stage/sql/Checking permissions 0 +user4 localhost stage/sql/Closing tables 0 +user4 localhost stage/sql/Init 0 +user4 localhost stage/sql/Init for update 0 user4 localhost stage/sql/Opening tables 0 execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 0 -user1 stage/sql/closing tables 0 -user1 stage/sql/init 0 +user1 stage/sql/Checking permissions 0 +user1 stage/sql/Closing tables 0 +user1 stage/sql/Init 0 +user1 stage/sql/Init for update 0 user1 stage/sql/Opening tables 0 -user2 stage/sql/checking permissions 0 -user2 stage/sql/closing tables 0 -user2 stage/sql/init 0 +user2 stage/sql/Checking permissions 0 +user2 stage/sql/Closing tables 0 +user2 stage/sql/Init 0 +user2 stage/sql/Init for update 0 user2 stage/sql/Opening tables 0 -user3 stage/sql/checking permissions 0 -user3 stage/sql/closing tables 0 -user3 stage/sql/init 0 +user3 stage/sql/Checking permissions 0 +user3 stage/sql/Closing tables 0 +user3 stage/sql/Init 0 +user3 stage/sql/Init for update 0 user3 stage/sql/Opening tables 0 -user4 stage/sql/checking permissions 0 -user4 stage/sql/closing tables 0 -user4 stage/sql/init 0 +user4 stage/sql/Checking permissions 0 +user4 stage/sql/Closing tables 0 +user4 stage/sql/Init 0 +user4 stage/sql/Init for update 0 user4 stage/sql/Opening tables 0 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 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -3589,53 +3775,63 @@ wait/synch/mutex/sql/LOCK_connection_count 4 wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 0 -user1 localhost stage/sql/closing tables 0 -user1 localhost stage/sql/init 0 +user1 localhost stage/sql/Checking permissions 0 +user1 localhost stage/sql/Closing tables 0 +user1 localhost stage/sql/Init 0 +user1 localhost stage/sql/Init for update 0 user1 localhost stage/sql/Opening tables 0 -user2 localhost stage/sql/checking permissions 0 -user2 localhost stage/sql/closing tables 0 -user2 localhost stage/sql/init 0 +user2 localhost stage/sql/Checking permissions 0 +user2 localhost stage/sql/Closing tables 0 +user2 localhost stage/sql/Init 0 +user2 localhost stage/sql/Init for update 0 user2 localhost stage/sql/Opening tables 0 -user3 localhost stage/sql/checking permissions 0 -user3 localhost stage/sql/closing tables 0 -user3 localhost stage/sql/init 0 +user3 localhost stage/sql/Checking permissions 0 +user3 localhost stage/sql/Closing tables 0 +user3 localhost stage/sql/Init 0 +user3 localhost stage/sql/Init for update 0 user3 localhost stage/sql/Opening tables 0 -user4 localhost stage/sql/checking permissions 0 -user4 localhost stage/sql/closing tables 0 -user4 localhost stage/sql/init 0 +user4 localhost stage/sql/Checking permissions 0 +user4 localhost stage/sql/Closing tables 0 +user4 localhost stage/sql/Init 0 +user4 localhost stage/sql/Init for update 0 user4 localhost stage/sql/Opening tables 0 execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 0 -user1 stage/sql/closing tables 0 -user1 stage/sql/init 0 +user1 stage/sql/Checking permissions 0 +user1 stage/sql/Closing tables 0 +user1 stage/sql/Init 0 +user1 stage/sql/Init for update 0 user1 stage/sql/Opening tables 0 -user2 stage/sql/checking permissions 0 -user2 stage/sql/closing tables 0 -user2 stage/sql/init 0 +user2 stage/sql/Checking permissions 0 +user2 stage/sql/Closing tables 0 +user2 stage/sql/Init 0 +user2 stage/sql/Init for update 0 user2 stage/sql/Opening tables 0 -user3 stage/sql/checking permissions 0 -user3 stage/sql/closing tables 0 -user3 stage/sql/init 0 +user3 stage/sql/Checking permissions 0 +user3 stage/sql/Closing tables 0 +user3 stage/sql/Init 0 +user3 stage/sql/Init for update 0 user3 stage/sql/Opening tables 0 -user4 stage/sql/checking permissions 0 -user4 stage/sql/closing tables 0 -user4 stage/sql/init 0 +user4 stage/sql/Checking permissions 0 +user4 stage/sql/Closing tables 0 +user4 stage/sql/Init 0 +user4 stage/sql/Init for update 0 user4 stage/sql/Opening tables 0 execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/checking permissions 0 -stage/sql/closing tables 0 -stage/sql/init 0 +stage/sql/Checking permissions 0 +stage/sql/Closing tables 0 +stage/sql/Init 0 +stage/sql/Init for update 0 stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -3765,53 +3961,63 @@ wait/synch/mutex/sql/LOCK_connection_count 4 wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 0 -user1 localhost stage/sql/closing tables 0 -user1 localhost stage/sql/init 0 +user1 localhost stage/sql/Checking permissions 0 +user1 localhost stage/sql/Closing tables 0 +user1 localhost stage/sql/Init 0 +user1 localhost stage/sql/Init for update 0 user1 localhost stage/sql/Opening tables 0 -user2 localhost stage/sql/checking permissions 0 -user2 localhost stage/sql/closing tables 0 -user2 localhost stage/sql/init 0 +user2 localhost stage/sql/Checking permissions 0 +user2 localhost stage/sql/Closing tables 0 +user2 localhost stage/sql/Init 0 +user2 localhost stage/sql/Init for update 0 user2 localhost stage/sql/Opening tables 0 -user3 localhost stage/sql/checking permissions 0 -user3 localhost stage/sql/closing tables 0 -user3 localhost stage/sql/init 0 +user3 localhost stage/sql/Checking permissions 0 +user3 localhost stage/sql/Closing tables 0 +user3 localhost stage/sql/Init 0 +user3 localhost stage/sql/Init for update 0 user3 localhost stage/sql/Opening tables 0 -user4 localhost stage/sql/checking permissions 0 -user4 localhost stage/sql/closing tables 0 -user4 localhost stage/sql/init 0 +user4 localhost stage/sql/Checking permissions 0 +user4 localhost stage/sql/Closing tables 0 +user4 localhost stage/sql/Init 0 +user4 localhost stage/sql/Init for update 0 user4 localhost stage/sql/Opening tables 0 execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 0 -user1 stage/sql/closing tables 0 -user1 stage/sql/init 0 +user1 stage/sql/Checking permissions 0 +user1 stage/sql/Closing tables 0 +user1 stage/sql/Init 0 +user1 stage/sql/Init for update 0 user1 stage/sql/Opening tables 0 -user2 stage/sql/checking permissions 0 -user2 stage/sql/closing tables 0 -user2 stage/sql/init 0 +user2 stage/sql/Checking permissions 0 +user2 stage/sql/Closing tables 0 +user2 stage/sql/Init 0 +user2 stage/sql/Init for update 0 user2 stage/sql/Opening tables 0 -user3 stage/sql/checking permissions 0 -user3 stage/sql/closing tables 0 -user3 stage/sql/init 0 +user3 stage/sql/Checking permissions 0 +user3 stage/sql/Closing tables 0 +user3 stage/sql/Init 0 +user3 stage/sql/Init for update 0 user3 stage/sql/Opening tables 0 -user4 stage/sql/checking permissions 0 -user4 stage/sql/closing tables 0 -user4 stage/sql/init 0 +user4 stage/sql/Checking permissions 0 +user4 stage/sql/Closing tables 0 +user4 stage/sql/Init 0 +user4 stage/sql/Init for update 0 user4 stage/sql/Opening tables 0 execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/checking permissions 0 -stage/sql/closing tables 0 -stage/sql/init 0 +stage/sql/Checking permissions 0 +stage/sql/Closing tables 0 +stage/sql/Init 0 +stage/sql/Init for update 0 stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -3941,53 +4147,63 @@ wait/synch/mutex/sql/LOCK_connection_count 4 wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 0 -user1 localhost stage/sql/closing tables 0 -user1 localhost stage/sql/init 0 +user1 localhost stage/sql/Checking permissions 0 +user1 localhost stage/sql/Closing tables 0 +user1 localhost stage/sql/Init 0 +user1 localhost stage/sql/Init for update 0 user1 localhost stage/sql/Opening tables 0 -user2 localhost stage/sql/checking permissions 0 -user2 localhost stage/sql/closing tables 0 -user2 localhost stage/sql/init 0 +user2 localhost stage/sql/Checking permissions 0 +user2 localhost stage/sql/Closing tables 0 +user2 localhost stage/sql/Init 0 +user2 localhost stage/sql/Init for update 0 user2 localhost stage/sql/Opening tables 0 -user3 localhost stage/sql/checking permissions 0 -user3 localhost stage/sql/closing tables 0 -user3 localhost stage/sql/init 0 +user3 localhost stage/sql/Checking permissions 0 +user3 localhost stage/sql/Closing tables 0 +user3 localhost stage/sql/Init 0 +user3 localhost stage/sql/Init for update 0 user3 localhost stage/sql/Opening tables 0 -user4 localhost stage/sql/checking permissions 0 -user4 localhost stage/sql/closing tables 0 -user4 localhost stage/sql/init 0 +user4 localhost stage/sql/Checking permissions 0 +user4 localhost stage/sql/Closing tables 0 +user4 localhost stage/sql/Init 0 +user4 localhost stage/sql/Init for update 0 user4 localhost stage/sql/Opening tables 0 execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 0 -user1 stage/sql/closing tables 0 -user1 stage/sql/init 0 +user1 stage/sql/Checking permissions 0 +user1 stage/sql/Closing tables 0 +user1 stage/sql/Init 0 +user1 stage/sql/Init for update 0 user1 stage/sql/Opening tables 0 -user2 stage/sql/checking permissions 0 -user2 stage/sql/closing tables 0 -user2 stage/sql/init 0 +user2 stage/sql/Checking permissions 0 +user2 stage/sql/Closing tables 0 +user2 stage/sql/Init 0 +user2 stage/sql/Init for update 0 user2 stage/sql/Opening tables 0 -user3 stage/sql/checking permissions 0 -user3 stage/sql/closing tables 0 -user3 stage/sql/init 0 +user3 stage/sql/Checking permissions 0 +user3 stage/sql/Closing tables 0 +user3 stage/sql/Init 0 +user3 stage/sql/Init for update 0 user3 stage/sql/Opening tables 0 -user4 stage/sql/checking permissions 0 -user4 stage/sql/closing tables 0 -user4 stage/sql/init 0 +user4 stage/sql/Checking permissions 0 +user4 stage/sql/Closing tables 0 +user4 stage/sql/Init 0 +user4 stage/sql/Init for update 0 user4 stage/sql/Opening tables 0 execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/checking permissions 0 -stage/sql/closing tables 0 -stage/sql/init 0 +stage/sql/Checking permissions 0 +stage/sql/Closing tables 0 +stage/sql/Init 0 +stage/sql/Init for update 0 stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -4117,53 +4333,63 @@ wait/synch/mutex/sql/LOCK_connection_count 4 wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 0 -user1 localhost stage/sql/closing tables 0 -user1 localhost stage/sql/init 0 +user1 localhost stage/sql/Checking permissions 0 +user1 localhost stage/sql/Closing tables 0 +user1 localhost stage/sql/Init 0 +user1 localhost stage/sql/Init for update 0 user1 localhost stage/sql/Opening tables 0 -user2 localhost stage/sql/checking permissions 0 -user2 localhost stage/sql/closing tables 0 -user2 localhost stage/sql/init 0 +user2 localhost stage/sql/Checking permissions 0 +user2 localhost stage/sql/Closing tables 0 +user2 localhost stage/sql/Init 0 +user2 localhost stage/sql/Init for update 0 user2 localhost stage/sql/Opening tables 0 -user3 localhost stage/sql/checking permissions 0 -user3 localhost stage/sql/closing tables 0 -user3 localhost stage/sql/init 0 +user3 localhost stage/sql/Checking permissions 0 +user3 localhost stage/sql/Closing tables 0 +user3 localhost stage/sql/Init 0 +user3 localhost stage/sql/Init for update 0 user3 localhost stage/sql/Opening tables 0 -user4 localhost stage/sql/checking permissions 0 -user4 localhost stage/sql/closing tables 0 -user4 localhost stage/sql/init 0 +user4 localhost stage/sql/Checking permissions 0 +user4 localhost stage/sql/Closing tables 0 +user4 localhost stage/sql/Init 0 +user4 localhost stage/sql/Init for update 0 user4 localhost stage/sql/Opening tables 0 execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 0 -user1 stage/sql/closing tables 0 -user1 stage/sql/init 0 +user1 stage/sql/Checking permissions 0 +user1 stage/sql/Closing tables 0 +user1 stage/sql/Init 0 +user1 stage/sql/Init for update 0 user1 stage/sql/Opening tables 0 -user2 stage/sql/checking permissions 0 -user2 stage/sql/closing tables 0 -user2 stage/sql/init 0 +user2 stage/sql/Checking permissions 0 +user2 stage/sql/Closing tables 0 +user2 stage/sql/Init 0 +user2 stage/sql/Init for update 0 user2 stage/sql/Opening tables 0 -user3 stage/sql/checking permissions 0 -user3 stage/sql/closing tables 0 -user3 stage/sql/init 0 +user3 stage/sql/Checking permissions 0 +user3 stage/sql/Closing tables 0 +user3 stage/sql/Init 0 +user3 stage/sql/Init for update 0 user3 stage/sql/Opening tables 0 -user4 stage/sql/checking permissions 0 -user4 stage/sql/closing tables 0 -user4 stage/sql/init 0 +user4 stage/sql/Checking permissions 0 +user4 stage/sql/Closing tables 0 +user4 stage/sql/Init 0 +user4 stage/sql/Init for update 0 user4 stage/sql/Opening tables 0 execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/checking permissions 0 -stage/sql/closing tables 0 -stage/sql/init 0 +stage/sql/Checking permissions 0 +stage/sql/Closing tables 0 +stage/sql/Init 0 +stage/sql/Init for update 0 stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -4293,53 +4519,63 @@ wait/synch/mutex/sql/LOCK_connection_count 4 wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 0 -user1 localhost stage/sql/closing tables 0 -user1 localhost stage/sql/init 0 +user1 localhost stage/sql/Checking permissions 0 +user1 localhost stage/sql/Closing tables 0 +user1 localhost stage/sql/Init 0 +user1 localhost stage/sql/Init for update 0 user1 localhost stage/sql/Opening tables 0 -user2 localhost stage/sql/checking permissions 0 -user2 localhost stage/sql/closing tables 0 -user2 localhost stage/sql/init 0 +user2 localhost stage/sql/Checking permissions 0 +user2 localhost stage/sql/Closing tables 0 +user2 localhost stage/sql/Init 0 +user2 localhost stage/sql/Init for update 0 user2 localhost stage/sql/Opening tables 0 -user3 localhost stage/sql/checking permissions 0 -user3 localhost stage/sql/closing tables 0 -user3 localhost stage/sql/init 0 +user3 localhost stage/sql/Checking permissions 0 +user3 localhost stage/sql/Closing tables 0 +user3 localhost stage/sql/Init 0 +user3 localhost stage/sql/Init for update 0 user3 localhost stage/sql/Opening tables 0 -user4 localhost stage/sql/checking permissions 0 -user4 localhost stage/sql/closing tables 0 -user4 localhost stage/sql/init 0 +user4 localhost stage/sql/Checking permissions 0 +user4 localhost stage/sql/Closing tables 0 +user4 localhost stage/sql/Init 0 +user4 localhost stage/sql/Init for update 0 user4 localhost stage/sql/Opening tables 0 execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 0 -user1 stage/sql/closing tables 0 -user1 stage/sql/init 0 +user1 stage/sql/Checking permissions 0 +user1 stage/sql/Closing tables 0 +user1 stage/sql/Init 0 +user1 stage/sql/Init for update 0 user1 stage/sql/Opening tables 0 -user2 stage/sql/checking permissions 0 -user2 stage/sql/closing tables 0 -user2 stage/sql/init 0 +user2 stage/sql/Checking permissions 0 +user2 stage/sql/Closing tables 0 +user2 stage/sql/Init 0 +user2 stage/sql/Init for update 0 user2 stage/sql/Opening tables 0 -user3 stage/sql/checking permissions 0 -user3 stage/sql/closing tables 0 -user3 stage/sql/init 0 +user3 stage/sql/Checking permissions 0 +user3 stage/sql/Closing tables 0 +user3 stage/sql/Init 0 +user3 stage/sql/Init for update 0 user3 stage/sql/Opening tables 0 -user4 stage/sql/checking permissions 0 -user4 stage/sql/closing tables 0 -user4 stage/sql/init 0 +user4 stage/sql/Checking permissions 0 +user4 stage/sql/Closing tables 0 +user4 stage/sql/Init 0 +user4 stage/sql/Init for update 0 user4 stage/sql/Opening tables 0 execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/checking permissions 0 -stage/sql/closing tables 0 -stage/sql/init 0 +stage/sql/Checking permissions 0 +stage/sql/Closing tables 0 +stage/sql/Init 0 +stage/sql/Init for update 0 stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -4469,53 +4705,63 @@ wait/synch/mutex/sql/LOCK_connection_count 4 wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 0 -user1 localhost stage/sql/closing tables 0 -user1 localhost stage/sql/init 0 +user1 localhost stage/sql/Checking permissions 0 +user1 localhost stage/sql/Closing tables 0 +user1 localhost stage/sql/Init 0 +user1 localhost stage/sql/Init for update 0 user1 localhost stage/sql/Opening tables 0 -user2 localhost stage/sql/checking permissions 0 -user2 localhost stage/sql/closing tables 0 -user2 localhost stage/sql/init 0 +user2 localhost stage/sql/Checking permissions 0 +user2 localhost stage/sql/Closing tables 0 +user2 localhost stage/sql/Init 0 +user2 localhost stage/sql/Init for update 0 user2 localhost stage/sql/Opening tables 0 -user3 localhost stage/sql/checking permissions 0 -user3 localhost stage/sql/closing tables 0 -user3 localhost stage/sql/init 0 +user3 localhost stage/sql/Checking permissions 0 +user3 localhost stage/sql/Closing tables 0 +user3 localhost stage/sql/Init 0 +user3 localhost stage/sql/Init for update 0 user3 localhost stage/sql/Opening tables 0 -user4 localhost stage/sql/checking permissions 0 -user4 localhost stage/sql/closing tables 0 -user4 localhost stage/sql/init 0 +user4 localhost stage/sql/Checking permissions 0 +user4 localhost stage/sql/Closing tables 0 +user4 localhost stage/sql/Init 0 +user4 localhost stage/sql/Init for update 0 user4 localhost stage/sql/Opening tables 0 execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 0 -user1 stage/sql/closing tables 0 -user1 stage/sql/init 0 +user1 stage/sql/Checking permissions 0 +user1 stage/sql/Closing tables 0 +user1 stage/sql/Init 0 +user1 stage/sql/Init for update 0 user1 stage/sql/Opening tables 0 -user2 stage/sql/checking permissions 0 -user2 stage/sql/closing tables 0 -user2 stage/sql/init 0 +user2 stage/sql/Checking permissions 0 +user2 stage/sql/Closing tables 0 +user2 stage/sql/Init 0 +user2 stage/sql/Init for update 0 user2 stage/sql/Opening tables 0 -user3 stage/sql/checking permissions 0 -user3 stage/sql/closing tables 0 -user3 stage/sql/init 0 +user3 stage/sql/Checking permissions 0 +user3 stage/sql/Closing tables 0 +user3 stage/sql/Init 0 +user3 stage/sql/Init for update 0 user3 stage/sql/Opening tables 0 -user4 stage/sql/checking permissions 0 -user4 stage/sql/closing tables 0 -user4 stage/sql/init 0 +user4 stage/sql/Checking permissions 0 +user4 stage/sql/Closing tables 0 +user4 stage/sql/Init 0 +user4 stage/sql/Init for update 0 user4 stage/sql/Opening tables 0 execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/checking permissions 0 -stage/sql/closing tables 0 -stage/sql/init 0 +stage/sql/Checking permissions 0 +stage/sql/Closing tables 0 +stage/sql/Init 0 +stage/sql/Init for update 0 stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -4631,35 +4877,41 @@ execute dump_stages_account; user host event_name count_star execute dump_stages_user; user event_name count_star -user1 stage/sql/checking permissions 0 -user1 stage/sql/closing tables 0 -user1 stage/sql/init 0 +user1 stage/sql/Checking permissions 0 +user1 stage/sql/Closing tables 0 +user1 stage/sql/Init 0 +user1 stage/sql/Init for update 0 user1 stage/sql/Opening tables 0 -user2 stage/sql/checking permissions 0 -user2 stage/sql/closing tables 0 -user2 stage/sql/init 0 +user2 stage/sql/Checking permissions 0 +user2 stage/sql/Closing tables 0 +user2 stage/sql/Init 0 +user2 stage/sql/Init for update 0 user2 stage/sql/Opening tables 0 -user3 stage/sql/checking permissions 0 -user3 stage/sql/closing tables 0 -user3 stage/sql/init 0 +user3 stage/sql/Checking permissions 0 +user3 stage/sql/Closing tables 0 +user3 stage/sql/Init 0 +user3 stage/sql/Init for update 0 user3 stage/sql/Opening tables 0 -user4 stage/sql/checking permissions 0 -user4 stage/sql/closing tables 0 -user4 stage/sql/init 0 +user4 stage/sql/Checking permissions 0 +user4 stage/sql/Closing tables 0 +user4 stage/sql/Init 0 +user4 stage/sql/Init for update 0 user4 stage/sql/Opening tables 0 execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/checking permissions 0 -stage/sql/closing tables 0 -stage/sql/init 0 +stage/sql/Checking permissions 0 +stage/sql/Closing tables 0 +stage/sql/Init 0 +stage/sql/Init for update 0 stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -4743,15 +4995,17 @@ execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/checking permissions 0 -stage/sql/closing tables 0 -stage/sql/init 0 +stage/sql/Checking permissions 0 +stage/sql/Closing tables 0 +stage/sql/Init 0 +stage/sql/Init for update 0 stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -4815,15 +5069,17 @@ execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/checking permissions 0 -stage/sql/closing tables 0 -stage/sql/init 0 +stage/sql/Checking permissions 0 +stage/sql/Closing tables 0 +stage/sql/Init 0 +stage/sql/Init for update 0 stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star 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 f5c4044f40f..52c674024bd 100644 --- a/mysql-test/suite/perfschema/r/event_aggregate_no_u.result +++ b/mysql-test/suite/perfschema/r/event_aggregate_no_u.result @@ -32,15 +32,17 @@ execute dump_stages_user; user event_name count_star execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 0 -localhost stage/sql/closing tables 0 -localhost stage/sql/init 0 +localhost stage/sql/Checking permissions 0 +localhost stage/sql/Closing tables 0 +localhost stage/sql/Init 0 +localhost stage/sql/Init for update 0 localhost stage/sql/Opening tables 0 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 0 -stage/sql/closing tables 0 -stage/sql/init 0 +stage/sql/Checking permissions 0 +stage/sql/Closing tables 0 +stage/sql/Init 0 +stage/sql/Init for update 0 stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) @@ -110,23 +112,26 @@ event_name count(event_name) wait/io/file/sql/query_log 1 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 0 -user1 localhost stage/sql/closing tables 0 -user1 localhost stage/sql/init 0 +user1 localhost stage/sql/Checking permissions 0 +user1 localhost stage/sql/Closing tables 0 +user1 localhost stage/sql/Init 0 +user1 localhost stage/sql/Init for update 0 user1 localhost stage/sql/Opening tables 0 execute dump_stages_user; user event_name count_star execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 0 -localhost stage/sql/closing tables 0 -localhost stage/sql/init 0 +localhost stage/sql/Checking permissions 0 +localhost stage/sql/Closing tables 0 +localhost stage/sql/Init 0 +localhost stage/sql/Init for update 0 localhost stage/sql/Opening tables 0 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 0 -stage/sql/closing tables 0 -stage/sql/init 0 +stage/sql/Checking permissions 0 +stage/sql/Closing tables 0 +stage/sql/Init 0 +stage/sql/Init for update 0 stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) @@ -209,29 +214,33 @@ wait/io/file/sql/query_log 4 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 3 -user1 localhost stage/sql/closing tables 3 -user1 localhost stage/sql/init 6 +user1 localhost stage/sql/Checking permissions 3 +user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Init 5 +user1 localhost stage/sql/Init for update 1 user1 localhost stage/sql/Opening tables 3 execute dump_stages_user; user event_name count_star execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 3 -localhost stage/sql/closing tables 3 -localhost stage/sql/init 6 +localhost stage/sql/Checking permissions 3 +localhost stage/sql/Closing tables 4 +localhost stage/sql/Init 5 +localhost stage/sql/Init for update 1 localhost stage/sql/Opening tables 3 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 3 -stage/sql/closing tables 3 -stage/sql/init 6 +stage/sql/Checking permissions 3 +stage/sql/Closing tables 4 +stage/sql/Init 5 +stage/sql/Init for update 1 stage/sql/Opening tables 3 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 3 -stage/sql/closing tables 3 -stage/sql/init 6 +stage/sql/Checking permissions 3 +stage/sql/Closing tables 4 +stage/sql/Init 5 +stage/sql/Init for update 1 stage/sql/Opening tables 3 execute dump_statements_account; user host event_name count_star @@ -314,33 +323,38 @@ wait/io/file/sql/query_log 5 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 3 -user1 localhost stage/sql/closing tables 3 -user1 localhost stage/sql/init 6 +user1 localhost stage/sql/Checking permissions 3 +user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Init 5 +user1 localhost stage/sql/Init for update 1 user1 localhost stage/sql/Opening tables 3 -user2 localhost stage/sql/checking permissions 0 -user2 localhost stage/sql/closing tables 0 -user2 localhost stage/sql/init 0 +user2 localhost stage/sql/Checking permissions 0 +user2 localhost stage/sql/Closing tables 0 +user2 localhost stage/sql/Init 0 +user2 localhost stage/sql/Init for update 0 user2 localhost stage/sql/Opening tables 0 execute dump_stages_user; user event_name count_star execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 3 -localhost stage/sql/closing tables 3 -localhost stage/sql/init 6 +localhost stage/sql/Checking permissions 3 +localhost stage/sql/Closing tables 4 +localhost stage/sql/Init 5 +localhost stage/sql/Init for update 1 localhost stage/sql/Opening tables 3 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 3 -stage/sql/closing tables 3 -stage/sql/init 6 +stage/sql/Checking permissions 3 +stage/sql/Closing tables 4 +stage/sql/Init 5 +stage/sql/Init for update 1 stage/sql/Opening tables 3 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 3 -stage/sql/closing tables 3 -stage/sql/init 6 +stage/sql/Checking permissions 3 +stage/sql/Closing tables 4 +stage/sql/Init 5 +stage/sql/Init for update 1 stage/sql/Opening tables 3 execute dump_statements_account; user host event_name count_star @@ -435,33 +449,38 @@ wait/io/file/sql/query_log 8 wait/synch/rwlock/sql/LOCK_grant 2 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 3 -user1 localhost stage/sql/closing tables 3 -user1 localhost stage/sql/init 6 +user1 localhost stage/sql/Checking permissions 3 +user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Init 5 +user1 localhost stage/sql/Init for update 1 user1 localhost stage/sql/Opening tables 3 -user2 localhost stage/sql/checking permissions 3 -user2 localhost stage/sql/closing tables 3 -user2 localhost stage/sql/init 6 +user2 localhost stage/sql/Checking permissions 3 +user2 localhost stage/sql/Closing tables 4 +user2 localhost stage/sql/Init 5 +user2 localhost stage/sql/Init for update 1 user2 localhost stage/sql/Opening tables 3 execute dump_stages_user; user event_name count_star execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 6 -localhost stage/sql/closing tables 6 -localhost stage/sql/init 12 +localhost stage/sql/Checking permissions 6 +localhost stage/sql/Closing tables 8 +localhost stage/sql/Init 10 +localhost stage/sql/Init for update 2 localhost stage/sql/Opening tables 6 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 6 -stage/sql/closing tables 6 -stage/sql/init 12 +stage/sql/Checking permissions 6 +stage/sql/Closing tables 8 +stage/sql/Init 10 +stage/sql/Init for update 2 stage/sql/Opening tables 6 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 6 -stage/sql/closing tables 6 -stage/sql/init 12 +stage/sql/Checking permissions 6 +stage/sql/Closing tables 8 +stage/sql/Init 10 +stage/sql/Init for update 2 stage/sql/Opening tables 6 execute dump_statements_account; user host event_name count_star @@ -556,37 +575,43 @@ wait/io/file/sql/query_log 9 wait/synch/rwlock/sql/LOCK_grant 2 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 3 -user1 localhost stage/sql/closing tables 3 -user1 localhost stage/sql/init 6 +user1 localhost stage/sql/Checking permissions 3 +user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Init 5 +user1 localhost stage/sql/Init for update 1 user1 localhost stage/sql/Opening tables 3 -user2 localhost stage/sql/checking permissions 3 -user2 localhost stage/sql/closing tables 3 -user2 localhost stage/sql/init 6 +user2 localhost stage/sql/Checking permissions 3 +user2 localhost stage/sql/Closing tables 4 +user2 localhost stage/sql/Init 5 +user2 localhost stage/sql/Init for update 1 user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/checking permissions 0 -user3 localhost stage/sql/closing tables 0 -user3 localhost stage/sql/init 0 +user3 localhost stage/sql/Checking permissions 0 +user3 localhost stage/sql/Closing tables 0 +user3 localhost stage/sql/Init 0 +user3 localhost stage/sql/Init for update 0 user3 localhost stage/sql/Opening tables 0 execute dump_stages_user; user event_name count_star execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 6 -localhost stage/sql/closing tables 6 -localhost stage/sql/init 12 +localhost stage/sql/Checking permissions 6 +localhost stage/sql/Closing tables 8 +localhost stage/sql/Init 10 +localhost stage/sql/Init for update 2 localhost stage/sql/Opening tables 6 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 6 -stage/sql/closing tables 6 -stage/sql/init 12 +stage/sql/Checking permissions 6 +stage/sql/Closing tables 8 +stage/sql/Init 10 +stage/sql/Init for update 2 stage/sql/Opening tables 6 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 6 -stage/sql/closing tables 6 -stage/sql/init 12 +stage/sql/Checking permissions 6 +stage/sql/Closing tables 8 +stage/sql/Init 10 +stage/sql/Init for update 2 stage/sql/Opening tables 6 execute dump_statements_account; user host event_name count_star @@ -693,37 +718,43 @@ wait/io/file/sql/query_log 12 wait/synch/rwlock/sql/LOCK_grant 3 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 3 -user1 localhost stage/sql/closing tables 3 -user1 localhost stage/sql/init 6 +user1 localhost stage/sql/Checking permissions 3 +user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Init 5 +user1 localhost stage/sql/Init for update 1 user1 localhost stage/sql/Opening tables 3 -user2 localhost stage/sql/checking permissions 3 -user2 localhost stage/sql/closing tables 3 -user2 localhost stage/sql/init 6 +user2 localhost stage/sql/Checking permissions 3 +user2 localhost stage/sql/Closing tables 4 +user2 localhost stage/sql/Init 5 +user2 localhost stage/sql/Init for update 1 user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/checking permissions 3 -user3 localhost stage/sql/closing tables 3 -user3 localhost stage/sql/init 6 +user3 localhost stage/sql/Checking permissions 3 +user3 localhost stage/sql/Closing tables 4 +user3 localhost stage/sql/Init 5 +user3 localhost stage/sql/Init for update 1 user3 localhost stage/sql/Opening tables 3 execute dump_stages_user; user event_name count_star execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 9 -localhost stage/sql/closing tables 9 -localhost stage/sql/init 18 +localhost stage/sql/Checking permissions 9 +localhost stage/sql/Closing tables 12 +localhost stage/sql/Init 15 +localhost stage/sql/Init for update 3 localhost stage/sql/Opening tables 9 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 9 -stage/sql/closing tables 9 -stage/sql/init 18 +stage/sql/Checking permissions 9 +stage/sql/Closing tables 12 +stage/sql/Init 15 +stage/sql/Init for update 3 stage/sql/Opening tables 9 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 9 -stage/sql/closing tables 9 -stage/sql/init 18 +stage/sql/Checking permissions 9 +stage/sql/Closing tables 12 +stage/sql/Init 15 +stage/sql/Init for update 3 stage/sql/Opening tables 9 execute dump_statements_account; user host event_name count_star @@ -830,41 +861,48 @@ wait/io/file/sql/query_log 13 wait/synch/rwlock/sql/LOCK_grant 3 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 3 -user1 localhost stage/sql/closing tables 3 -user1 localhost stage/sql/init 6 +user1 localhost stage/sql/Checking permissions 3 +user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Init 5 +user1 localhost stage/sql/Init for update 1 user1 localhost stage/sql/Opening tables 3 -user2 localhost stage/sql/checking permissions 3 -user2 localhost stage/sql/closing tables 3 -user2 localhost stage/sql/init 6 +user2 localhost stage/sql/Checking permissions 3 +user2 localhost stage/sql/Closing tables 4 +user2 localhost stage/sql/Init 5 +user2 localhost stage/sql/Init for update 1 user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/checking permissions 3 -user3 localhost stage/sql/closing tables 3 -user3 localhost stage/sql/init 6 +user3 localhost stage/sql/Checking permissions 3 +user3 localhost stage/sql/Closing tables 4 +user3 localhost stage/sql/Init 5 +user3 localhost stage/sql/Init for update 1 user3 localhost stage/sql/Opening tables 3 -user4 localhost stage/sql/checking permissions 0 -user4 localhost stage/sql/closing tables 0 -user4 localhost stage/sql/init 0 +user4 localhost stage/sql/Checking permissions 0 +user4 localhost stage/sql/Closing tables 0 +user4 localhost stage/sql/Init 0 +user4 localhost stage/sql/Init for update 0 user4 localhost stage/sql/Opening tables 0 execute dump_stages_user; user event_name count_star execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 9 -localhost stage/sql/closing tables 9 -localhost stage/sql/init 18 +localhost stage/sql/Checking permissions 9 +localhost stage/sql/Closing tables 12 +localhost stage/sql/Init 15 +localhost stage/sql/Init for update 3 localhost stage/sql/Opening tables 9 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 9 -stage/sql/closing tables 9 -stage/sql/init 18 +stage/sql/Checking permissions 9 +stage/sql/Closing tables 12 +stage/sql/Init 15 +stage/sql/Init for update 3 stage/sql/Opening tables 9 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 9 -stage/sql/closing tables 9 -stage/sql/init 18 +stage/sql/Checking permissions 9 +stage/sql/Closing tables 12 +stage/sql/Init 15 +stage/sql/Init for update 3 stage/sql/Opening tables 9 execute dump_statements_account; user host event_name count_star @@ -983,41 +1021,48 @@ wait/io/file/sql/query_log 16 wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 3 -user1 localhost stage/sql/closing tables 3 -user1 localhost stage/sql/init 6 +user1 localhost stage/sql/Checking permissions 3 +user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Init 5 +user1 localhost stage/sql/Init for update 1 user1 localhost stage/sql/Opening tables 3 -user2 localhost stage/sql/checking permissions 3 -user2 localhost stage/sql/closing tables 3 -user2 localhost stage/sql/init 6 +user2 localhost stage/sql/Checking permissions 3 +user2 localhost stage/sql/Closing tables 4 +user2 localhost stage/sql/Init 5 +user2 localhost stage/sql/Init for update 1 user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/checking permissions 3 -user3 localhost stage/sql/closing tables 3 -user3 localhost stage/sql/init 6 +user3 localhost stage/sql/Checking permissions 3 +user3 localhost stage/sql/Closing tables 4 +user3 localhost stage/sql/Init 5 +user3 localhost stage/sql/Init for update 1 user3 localhost stage/sql/Opening tables 3 -user4 localhost stage/sql/checking permissions 3 -user4 localhost stage/sql/closing tables 3 -user4 localhost stage/sql/init 6 +user4 localhost stage/sql/Checking permissions 3 +user4 localhost stage/sql/Closing tables 4 +user4 localhost stage/sql/Init 5 +user4 localhost stage/sql/Init for update 1 user4 localhost stage/sql/Opening tables 3 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 12 -localhost stage/sql/init 24 +localhost stage/sql/Checking permissions 12 +localhost stage/sql/Closing tables 16 +localhost stage/sql/Init 20 +localhost stage/sql/Init for update 4 localhost stage/sql/Opening tables 12 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 24 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 20 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 24 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 20 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -1127,41 +1172,48 @@ wait/synch/mutex/sql/LOCK_connection_count 1 wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 3 -user1 localhost stage/sql/closing tables 3 -user1 localhost stage/sql/init 7 +user1 localhost stage/sql/Checking permissions 3 +user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Init 6 +user1 localhost stage/sql/Init for update 1 user1 localhost stage/sql/Opening tables 3 -user2 localhost stage/sql/checking permissions 3 -user2 localhost stage/sql/closing tables 3 -user2 localhost stage/sql/init 6 +user2 localhost stage/sql/Checking permissions 3 +user2 localhost stage/sql/Closing tables 4 +user2 localhost stage/sql/Init 5 +user2 localhost stage/sql/Init for update 1 user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/checking permissions 3 -user3 localhost stage/sql/closing tables 3 -user3 localhost stage/sql/init 6 +user3 localhost stage/sql/Checking permissions 3 +user3 localhost stage/sql/Closing tables 4 +user3 localhost stage/sql/Init 5 +user3 localhost stage/sql/Init for update 1 user3 localhost stage/sql/Opening tables 3 -user4 localhost stage/sql/checking permissions 3 -user4 localhost stage/sql/closing tables 3 -user4 localhost stage/sql/init 6 +user4 localhost stage/sql/Checking permissions 3 +user4 localhost stage/sql/Closing tables 4 +user4 localhost stage/sql/Init 5 +user4 localhost stage/sql/Init for update 1 user4 localhost stage/sql/Opening tables 3 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 12 -localhost stage/sql/init 25 +localhost stage/sql/Checking permissions 12 +localhost stage/sql/Closing tables 16 +localhost stage/sql/Init 21 +localhost stage/sql/Init for update 4 localhost stage/sql/Opening tables 12 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 25 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 21 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 25 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 21 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -1269,41 +1321,48 @@ wait/synch/mutex/sql/LOCK_connection_count 2 wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 3 -user1 localhost stage/sql/closing tables 3 -user1 localhost stage/sql/init 7 +user1 localhost stage/sql/Checking permissions 3 +user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Init 6 +user1 localhost stage/sql/Init for update 1 user1 localhost stage/sql/Opening tables 3 -user2 localhost stage/sql/checking permissions 3 -user2 localhost stage/sql/closing tables 3 -user2 localhost stage/sql/init 7 +user2 localhost stage/sql/Checking permissions 3 +user2 localhost stage/sql/Closing tables 4 +user2 localhost stage/sql/Init 6 +user2 localhost stage/sql/Init for update 1 user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/checking permissions 3 -user3 localhost stage/sql/closing tables 3 -user3 localhost stage/sql/init 6 +user3 localhost stage/sql/Checking permissions 3 +user3 localhost stage/sql/Closing tables 4 +user3 localhost stage/sql/Init 5 +user3 localhost stage/sql/Init for update 1 user3 localhost stage/sql/Opening tables 3 -user4 localhost stage/sql/checking permissions 3 -user4 localhost stage/sql/closing tables 3 -user4 localhost stage/sql/init 6 +user4 localhost stage/sql/Checking permissions 3 +user4 localhost stage/sql/Closing tables 4 +user4 localhost stage/sql/Init 5 +user4 localhost stage/sql/Init for update 1 user4 localhost stage/sql/Opening tables 3 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 12 -localhost stage/sql/init 26 +localhost stage/sql/Checking permissions 12 +localhost stage/sql/Closing tables 16 +localhost stage/sql/Init 22 +localhost stage/sql/Init for update 4 localhost stage/sql/Opening tables 12 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 26 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 22 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 26 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 22 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -1408,41 +1467,48 @@ wait/synch/mutex/sql/LOCK_connection_count 3 wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 3 -user1 localhost stage/sql/closing tables 3 -user1 localhost stage/sql/init 7 +user1 localhost stage/sql/Checking permissions 3 +user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Init 6 +user1 localhost stage/sql/Init for update 1 user1 localhost stage/sql/Opening tables 3 -user2 localhost stage/sql/checking permissions 3 -user2 localhost stage/sql/closing tables 3 -user2 localhost stage/sql/init 7 +user2 localhost stage/sql/Checking permissions 3 +user2 localhost stage/sql/Closing tables 4 +user2 localhost stage/sql/Init 6 +user2 localhost stage/sql/Init for update 1 user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/checking permissions 3 -user3 localhost stage/sql/closing tables 3 -user3 localhost stage/sql/init 7 +user3 localhost stage/sql/Checking permissions 3 +user3 localhost stage/sql/Closing tables 4 +user3 localhost stage/sql/Init 6 +user3 localhost stage/sql/Init for update 1 user3 localhost stage/sql/Opening tables 3 -user4 localhost stage/sql/checking permissions 3 -user4 localhost stage/sql/closing tables 3 -user4 localhost stage/sql/init 6 +user4 localhost stage/sql/Checking permissions 3 +user4 localhost stage/sql/Closing tables 4 +user4 localhost stage/sql/Init 5 +user4 localhost stage/sql/Init for update 1 user4 localhost stage/sql/Opening tables 3 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 12 -localhost stage/sql/init 27 +localhost stage/sql/Checking permissions 12 +localhost stage/sql/Closing tables 16 +localhost stage/sql/Init 23 +localhost stage/sql/Init for update 4 localhost stage/sql/Opening tables 12 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 27 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 23 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 27 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 23 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -1544,41 +1610,48 @@ wait/synch/mutex/sql/LOCK_connection_count 4 wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 3 -user1 localhost stage/sql/closing tables 3 -user1 localhost stage/sql/init 7 +user1 localhost stage/sql/Checking permissions 3 +user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Init 6 +user1 localhost stage/sql/Init for update 1 user1 localhost stage/sql/Opening tables 3 -user2 localhost stage/sql/checking permissions 3 -user2 localhost stage/sql/closing tables 3 -user2 localhost stage/sql/init 7 +user2 localhost stage/sql/Checking permissions 3 +user2 localhost stage/sql/Closing tables 4 +user2 localhost stage/sql/Init 6 +user2 localhost stage/sql/Init for update 1 user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/checking permissions 3 -user3 localhost stage/sql/closing tables 3 -user3 localhost stage/sql/init 7 +user3 localhost stage/sql/Checking permissions 3 +user3 localhost stage/sql/Closing tables 4 +user3 localhost stage/sql/Init 6 +user3 localhost stage/sql/Init for update 1 user3 localhost stage/sql/Opening tables 3 -user4 localhost stage/sql/checking permissions 3 -user4 localhost stage/sql/closing tables 3 -user4 localhost stage/sql/init 7 +user4 localhost stage/sql/Checking permissions 3 +user4 localhost stage/sql/Closing tables 4 +user4 localhost stage/sql/Init 6 +user4 localhost stage/sql/Init for update 1 user4 localhost stage/sql/Opening tables 3 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 12 -localhost stage/sql/init 28 +localhost stage/sql/Checking permissions 12 +localhost stage/sql/Closing tables 16 +localhost stage/sql/Init 24 +localhost stage/sql/Init for update 4 localhost stage/sql/Opening tables 12 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -1681,41 +1754,48 @@ wait/synch/mutex/sql/LOCK_connection_count 4 wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 3 -user1 localhost stage/sql/closing tables 3 -user1 localhost stage/sql/init 7 +user1 localhost stage/sql/Checking permissions 3 +user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Init 6 +user1 localhost stage/sql/Init for update 1 user1 localhost stage/sql/Opening tables 3 -user2 localhost stage/sql/checking permissions 3 -user2 localhost stage/sql/closing tables 3 -user2 localhost stage/sql/init 7 +user2 localhost stage/sql/Checking permissions 3 +user2 localhost stage/sql/Closing tables 4 +user2 localhost stage/sql/Init 6 +user2 localhost stage/sql/Init for update 1 user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/checking permissions 3 -user3 localhost stage/sql/closing tables 3 -user3 localhost stage/sql/init 7 +user3 localhost stage/sql/Checking permissions 3 +user3 localhost stage/sql/Closing tables 4 +user3 localhost stage/sql/Init 6 +user3 localhost stage/sql/Init for update 1 user3 localhost stage/sql/Opening tables 3 -user4 localhost stage/sql/checking permissions 3 -user4 localhost stage/sql/closing tables 3 -user4 localhost stage/sql/init 7 +user4 localhost stage/sql/Checking permissions 3 +user4 localhost stage/sql/Closing tables 4 +user4 localhost stage/sql/Init 6 +user4 localhost stage/sql/Init for update 1 user4 localhost stage/sql/Opening tables 3 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 12 -localhost stage/sql/init 28 +localhost stage/sql/Checking permissions 12 +localhost stage/sql/Closing tables 16 +localhost stage/sql/Init 24 +localhost stage/sql/Init for update 4 localhost stage/sql/Opening tables 12 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -1817,41 +1897,48 @@ wait/synch/mutex/sql/LOCK_connection_count 4 wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 3 -user1 localhost stage/sql/closing tables 3 -user1 localhost stage/sql/init 7 +user1 localhost stage/sql/Checking permissions 3 +user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Init 6 +user1 localhost stage/sql/Init for update 1 user1 localhost stage/sql/Opening tables 3 -user2 localhost stage/sql/checking permissions 3 -user2 localhost stage/sql/closing tables 3 -user2 localhost stage/sql/init 7 +user2 localhost stage/sql/Checking permissions 3 +user2 localhost stage/sql/Closing tables 4 +user2 localhost stage/sql/Init 6 +user2 localhost stage/sql/Init for update 1 user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/checking permissions 3 -user3 localhost stage/sql/closing tables 3 -user3 localhost stage/sql/init 7 +user3 localhost stage/sql/Checking permissions 3 +user3 localhost stage/sql/Closing tables 4 +user3 localhost stage/sql/Init 6 +user3 localhost stage/sql/Init for update 1 user3 localhost stage/sql/Opening tables 3 -user4 localhost stage/sql/checking permissions 3 -user4 localhost stage/sql/closing tables 3 -user4 localhost stage/sql/init 7 +user4 localhost stage/sql/Checking permissions 3 +user4 localhost stage/sql/Closing tables 4 +user4 localhost stage/sql/Init 6 +user4 localhost stage/sql/Init for update 1 user4 localhost stage/sql/Opening tables 3 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 12 -localhost stage/sql/init 28 +localhost stage/sql/Checking permissions 12 +localhost stage/sql/Closing tables 16 +localhost stage/sql/Init 24 +localhost stage/sql/Init for update 4 localhost stage/sql/Opening tables 12 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -1953,41 +2040,48 @@ wait/synch/mutex/sql/LOCK_connection_count 4 wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 3 -user1 localhost stage/sql/closing tables 3 -user1 localhost stage/sql/init 7 +user1 localhost stage/sql/Checking permissions 3 +user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Init 6 +user1 localhost stage/sql/Init for update 1 user1 localhost stage/sql/Opening tables 3 -user2 localhost stage/sql/checking permissions 3 -user2 localhost stage/sql/closing tables 3 -user2 localhost stage/sql/init 7 +user2 localhost stage/sql/Checking permissions 3 +user2 localhost stage/sql/Closing tables 4 +user2 localhost stage/sql/Init 6 +user2 localhost stage/sql/Init for update 1 user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/checking permissions 3 -user3 localhost stage/sql/closing tables 3 -user3 localhost stage/sql/init 7 +user3 localhost stage/sql/Checking permissions 3 +user3 localhost stage/sql/Closing tables 4 +user3 localhost stage/sql/Init 6 +user3 localhost stage/sql/Init for update 1 user3 localhost stage/sql/Opening tables 3 -user4 localhost stage/sql/checking permissions 3 -user4 localhost stage/sql/closing tables 3 -user4 localhost stage/sql/init 7 +user4 localhost stage/sql/Checking permissions 3 +user4 localhost stage/sql/Closing tables 4 +user4 localhost stage/sql/Init 6 +user4 localhost stage/sql/Init for update 1 user4 localhost stage/sql/Opening tables 3 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 12 -localhost stage/sql/init 28 +localhost stage/sql/Checking permissions 12 +localhost stage/sql/Closing tables 16 +localhost stage/sql/Init 24 +localhost stage/sql/Init for update 4 localhost stage/sql/Opening tables 12 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -2089,41 +2183,48 @@ wait/synch/mutex/sql/LOCK_connection_count 4 wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 3 -user1 localhost stage/sql/closing tables 3 -user1 localhost stage/sql/init 7 +user1 localhost stage/sql/Checking permissions 3 +user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Init 6 +user1 localhost stage/sql/Init for update 1 user1 localhost stage/sql/Opening tables 3 -user2 localhost stage/sql/checking permissions 3 -user2 localhost stage/sql/closing tables 3 -user2 localhost stage/sql/init 7 +user2 localhost stage/sql/Checking permissions 3 +user2 localhost stage/sql/Closing tables 4 +user2 localhost stage/sql/Init 6 +user2 localhost stage/sql/Init for update 1 user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/checking permissions 3 -user3 localhost stage/sql/closing tables 3 -user3 localhost stage/sql/init 7 +user3 localhost stage/sql/Checking permissions 3 +user3 localhost stage/sql/Closing tables 4 +user3 localhost stage/sql/Init 6 +user3 localhost stage/sql/Init for update 1 user3 localhost stage/sql/Opening tables 3 -user4 localhost stage/sql/checking permissions 3 -user4 localhost stage/sql/closing tables 3 -user4 localhost stage/sql/init 7 +user4 localhost stage/sql/Checking permissions 3 +user4 localhost stage/sql/Closing tables 4 +user4 localhost stage/sql/Init 6 +user4 localhost stage/sql/Init for update 1 user4 localhost stage/sql/Opening tables 3 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 12 -localhost stage/sql/init 28 +localhost stage/sql/Checking permissions 12 +localhost stage/sql/Closing tables 16 +localhost stage/sql/Init 24 +localhost stage/sql/Init for update 4 localhost stage/sql/Opening tables 12 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -2225,41 +2326,48 @@ wait/synch/mutex/sql/LOCK_connection_count 4 wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 3 -user1 localhost stage/sql/closing tables 3 -user1 localhost stage/sql/init 7 +user1 localhost stage/sql/Checking permissions 3 +user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Init 6 +user1 localhost stage/sql/Init for update 1 user1 localhost stage/sql/Opening tables 3 -user2 localhost stage/sql/checking permissions 3 -user2 localhost stage/sql/closing tables 3 -user2 localhost stage/sql/init 7 +user2 localhost stage/sql/Checking permissions 3 +user2 localhost stage/sql/Closing tables 4 +user2 localhost stage/sql/Init 6 +user2 localhost stage/sql/Init for update 1 user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/checking permissions 3 -user3 localhost stage/sql/closing tables 3 -user3 localhost stage/sql/init 7 +user3 localhost stage/sql/Checking permissions 3 +user3 localhost stage/sql/Closing tables 4 +user3 localhost stage/sql/Init 6 +user3 localhost stage/sql/Init for update 1 user3 localhost stage/sql/Opening tables 3 -user4 localhost stage/sql/checking permissions 3 -user4 localhost stage/sql/closing tables 3 -user4 localhost stage/sql/init 7 +user4 localhost stage/sql/Checking permissions 3 +user4 localhost stage/sql/Closing tables 4 +user4 localhost stage/sql/Init 6 +user4 localhost stage/sql/Init for update 1 user4 localhost stage/sql/Opening tables 3 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 12 -localhost stage/sql/init 28 +localhost stage/sql/Checking permissions 12 +localhost stage/sql/Closing tables 16 +localhost stage/sql/Init 24 +localhost stage/sql/Init for update 4 localhost stage/sql/Opening tables 12 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -2361,41 +2469,48 @@ wait/synch/mutex/sql/LOCK_connection_count 4 wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 3 -user1 localhost stage/sql/closing tables 3 -user1 localhost stage/sql/init 7 +user1 localhost stage/sql/Checking permissions 3 +user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Init 6 +user1 localhost stage/sql/Init for update 1 user1 localhost stage/sql/Opening tables 3 -user2 localhost stage/sql/checking permissions 3 -user2 localhost stage/sql/closing tables 3 -user2 localhost stage/sql/init 7 +user2 localhost stage/sql/Checking permissions 3 +user2 localhost stage/sql/Closing tables 4 +user2 localhost stage/sql/Init 6 +user2 localhost stage/sql/Init for update 1 user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/checking permissions 3 -user3 localhost stage/sql/closing tables 3 -user3 localhost stage/sql/init 7 +user3 localhost stage/sql/Checking permissions 3 +user3 localhost stage/sql/Closing tables 4 +user3 localhost stage/sql/Init 6 +user3 localhost stage/sql/Init for update 1 user3 localhost stage/sql/Opening tables 3 -user4 localhost stage/sql/checking permissions 3 -user4 localhost stage/sql/closing tables 3 -user4 localhost stage/sql/init 7 +user4 localhost stage/sql/Checking permissions 3 +user4 localhost stage/sql/Closing tables 4 +user4 localhost stage/sql/Init 6 +user4 localhost stage/sql/Init for update 1 user4 localhost stage/sql/Opening tables 3 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 12 -localhost stage/sql/init 28 +localhost stage/sql/Checking permissions 12 +localhost stage/sql/Closing tables 16 +localhost stage/sql/Init 24 +localhost stage/sql/Init for update 4 localhost stage/sql/Opening tables 12 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -2497,41 +2612,48 @@ wait/synch/mutex/sql/LOCK_connection_count 4 wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 0 -user1 localhost stage/sql/closing tables 0 -user1 localhost stage/sql/init 0 +user1 localhost stage/sql/Checking permissions 0 +user1 localhost stage/sql/Closing tables 0 +user1 localhost stage/sql/Init 0 +user1 localhost stage/sql/Init for update 0 user1 localhost stage/sql/Opening tables 0 -user2 localhost stage/sql/checking permissions 0 -user2 localhost stage/sql/closing tables 0 -user2 localhost stage/sql/init 0 +user2 localhost stage/sql/Checking permissions 0 +user2 localhost stage/sql/Closing tables 0 +user2 localhost stage/sql/Init 0 +user2 localhost stage/sql/Init for update 0 user2 localhost stage/sql/Opening tables 0 -user3 localhost stage/sql/checking permissions 0 -user3 localhost stage/sql/closing tables 0 -user3 localhost stage/sql/init 0 +user3 localhost stage/sql/Checking permissions 0 +user3 localhost stage/sql/Closing tables 0 +user3 localhost stage/sql/Init 0 +user3 localhost stage/sql/Init for update 0 user3 localhost stage/sql/Opening tables 0 -user4 localhost stage/sql/checking permissions 0 -user4 localhost stage/sql/closing tables 0 -user4 localhost stage/sql/init 0 +user4 localhost stage/sql/Checking permissions 0 +user4 localhost stage/sql/Closing tables 0 +user4 localhost stage/sql/Init 0 +user4 localhost stage/sql/Init for update 0 user4 localhost stage/sql/Opening tables 0 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 12 -localhost stage/sql/init 28 +localhost stage/sql/Checking permissions 12 +localhost stage/sql/Closing tables 16 +localhost stage/sql/Init 24 +localhost stage/sql/Init for update 4 localhost stage/sql/Opening tables 12 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -2633,41 +2755,48 @@ wait/synch/mutex/sql/LOCK_connection_count 4 wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 0 -user1 localhost stage/sql/closing tables 0 -user1 localhost stage/sql/init 0 +user1 localhost stage/sql/Checking permissions 0 +user1 localhost stage/sql/Closing tables 0 +user1 localhost stage/sql/Init 0 +user1 localhost stage/sql/Init for update 0 user1 localhost stage/sql/Opening tables 0 -user2 localhost stage/sql/checking permissions 0 -user2 localhost stage/sql/closing tables 0 -user2 localhost stage/sql/init 0 +user2 localhost stage/sql/Checking permissions 0 +user2 localhost stage/sql/Closing tables 0 +user2 localhost stage/sql/Init 0 +user2 localhost stage/sql/Init for update 0 user2 localhost stage/sql/Opening tables 0 -user3 localhost stage/sql/checking permissions 0 -user3 localhost stage/sql/closing tables 0 -user3 localhost stage/sql/init 0 +user3 localhost stage/sql/Checking permissions 0 +user3 localhost stage/sql/Closing tables 0 +user3 localhost stage/sql/Init 0 +user3 localhost stage/sql/Init for update 0 user3 localhost stage/sql/Opening tables 0 -user4 localhost stage/sql/checking permissions 0 -user4 localhost stage/sql/closing tables 0 -user4 localhost stage/sql/init 0 +user4 localhost stage/sql/Checking permissions 0 +user4 localhost stage/sql/Closing tables 0 +user4 localhost stage/sql/Init 0 +user4 localhost stage/sql/Init for update 0 user4 localhost stage/sql/Opening tables 0 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 12 -localhost stage/sql/init 28 +localhost stage/sql/Checking permissions 12 +localhost stage/sql/Closing tables 16 +localhost stage/sql/Init 24 +localhost stage/sql/Init for update 4 localhost stage/sql/Opening tables 12 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -2769,41 +2898,48 @@ wait/synch/mutex/sql/LOCK_connection_count 4 wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 0 -user1 localhost stage/sql/closing tables 0 -user1 localhost stage/sql/init 0 +user1 localhost stage/sql/Checking permissions 0 +user1 localhost stage/sql/Closing tables 0 +user1 localhost stage/sql/Init 0 +user1 localhost stage/sql/Init for update 0 user1 localhost stage/sql/Opening tables 0 -user2 localhost stage/sql/checking permissions 0 -user2 localhost stage/sql/closing tables 0 -user2 localhost stage/sql/init 0 +user2 localhost stage/sql/Checking permissions 0 +user2 localhost stage/sql/Closing tables 0 +user2 localhost stage/sql/Init 0 +user2 localhost stage/sql/Init for update 0 user2 localhost stage/sql/Opening tables 0 -user3 localhost stage/sql/checking permissions 0 -user3 localhost stage/sql/closing tables 0 -user3 localhost stage/sql/init 0 +user3 localhost stage/sql/Checking permissions 0 +user3 localhost stage/sql/Closing tables 0 +user3 localhost stage/sql/Init 0 +user3 localhost stage/sql/Init for update 0 user3 localhost stage/sql/Opening tables 0 -user4 localhost stage/sql/checking permissions 0 -user4 localhost stage/sql/closing tables 0 -user4 localhost stage/sql/init 0 +user4 localhost stage/sql/Checking permissions 0 +user4 localhost stage/sql/Closing tables 0 +user4 localhost stage/sql/Init 0 +user4 localhost stage/sql/Init for update 0 user4 localhost stage/sql/Opening tables 0 execute dump_stages_user; user event_name count_star execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 0 -localhost stage/sql/closing tables 0 -localhost stage/sql/init 0 +localhost stage/sql/Checking permissions 0 +localhost stage/sql/Closing tables 0 +localhost stage/sql/Init 0 +localhost stage/sql/Init for update 0 localhost stage/sql/Opening tables 0 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -2905,41 +3041,48 @@ wait/synch/mutex/sql/LOCK_connection_count 4 wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 0 -user1 localhost stage/sql/closing tables 0 -user1 localhost stage/sql/init 0 +user1 localhost stage/sql/Checking permissions 0 +user1 localhost stage/sql/Closing tables 0 +user1 localhost stage/sql/Init 0 +user1 localhost stage/sql/Init for update 0 user1 localhost stage/sql/Opening tables 0 -user2 localhost stage/sql/checking permissions 0 -user2 localhost stage/sql/closing tables 0 -user2 localhost stage/sql/init 0 +user2 localhost stage/sql/Checking permissions 0 +user2 localhost stage/sql/Closing tables 0 +user2 localhost stage/sql/Init 0 +user2 localhost stage/sql/Init for update 0 user2 localhost stage/sql/Opening tables 0 -user3 localhost stage/sql/checking permissions 0 -user3 localhost stage/sql/closing tables 0 -user3 localhost stage/sql/init 0 +user3 localhost stage/sql/Checking permissions 0 +user3 localhost stage/sql/Closing tables 0 +user3 localhost stage/sql/Init 0 +user3 localhost stage/sql/Init for update 0 user3 localhost stage/sql/Opening tables 0 -user4 localhost stage/sql/checking permissions 0 -user4 localhost stage/sql/closing tables 0 -user4 localhost stage/sql/init 0 +user4 localhost stage/sql/Checking permissions 0 +user4 localhost stage/sql/Closing tables 0 +user4 localhost stage/sql/Init 0 +user4 localhost stage/sql/Init for update 0 user4 localhost stage/sql/Opening tables 0 execute dump_stages_user; user event_name count_star execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 0 -localhost stage/sql/closing tables 0 -localhost stage/sql/init 0 +localhost stage/sql/Checking permissions 0 +localhost stage/sql/Closing tables 0 +localhost stage/sql/Init 0 +localhost stage/sql/Init for update 0 localhost stage/sql/Opening tables 0 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 0 -stage/sql/closing tables 0 -stage/sql/init 0 +stage/sql/Checking permissions 0 +stage/sql/Closing tables 0 +stage/sql/Init 0 +stage/sql/Init for update 0 stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -3041,41 +3184,48 @@ wait/synch/mutex/sql/LOCK_connection_count 4 wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 0 -user1 localhost stage/sql/closing tables 0 -user1 localhost stage/sql/init 0 +user1 localhost stage/sql/Checking permissions 0 +user1 localhost stage/sql/Closing tables 0 +user1 localhost stage/sql/Init 0 +user1 localhost stage/sql/Init for update 0 user1 localhost stage/sql/Opening tables 0 -user2 localhost stage/sql/checking permissions 0 -user2 localhost stage/sql/closing tables 0 -user2 localhost stage/sql/init 0 +user2 localhost stage/sql/Checking permissions 0 +user2 localhost stage/sql/Closing tables 0 +user2 localhost stage/sql/Init 0 +user2 localhost stage/sql/Init for update 0 user2 localhost stage/sql/Opening tables 0 -user3 localhost stage/sql/checking permissions 0 -user3 localhost stage/sql/closing tables 0 -user3 localhost stage/sql/init 0 +user3 localhost stage/sql/Checking permissions 0 +user3 localhost stage/sql/Closing tables 0 +user3 localhost stage/sql/Init 0 +user3 localhost stage/sql/Init for update 0 user3 localhost stage/sql/Opening tables 0 -user4 localhost stage/sql/checking permissions 0 -user4 localhost stage/sql/closing tables 0 -user4 localhost stage/sql/init 0 +user4 localhost stage/sql/Checking permissions 0 +user4 localhost stage/sql/Closing tables 0 +user4 localhost stage/sql/Init 0 +user4 localhost stage/sql/Init for update 0 user4 localhost stage/sql/Opening tables 0 execute dump_stages_user; user event_name count_star execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 0 -localhost stage/sql/closing tables 0 -localhost stage/sql/init 0 +localhost stage/sql/Checking permissions 0 +localhost stage/sql/Closing tables 0 +localhost stage/sql/Init 0 +localhost stage/sql/Init for update 0 localhost stage/sql/Opening tables 0 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 0 -stage/sql/closing tables 0 -stage/sql/init 0 +stage/sql/Checking permissions 0 +stage/sql/Closing tables 0 +stage/sql/Init 0 +stage/sql/Init for update 0 stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -3177,41 +3327,48 @@ wait/synch/mutex/sql/LOCK_connection_count 4 wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 0 -user1 localhost stage/sql/closing tables 0 -user1 localhost stage/sql/init 0 +user1 localhost stage/sql/Checking permissions 0 +user1 localhost stage/sql/Closing tables 0 +user1 localhost stage/sql/Init 0 +user1 localhost stage/sql/Init for update 0 user1 localhost stage/sql/Opening tables 0 -user2 localhost stage/sql/checking permissions 0 -user2 localhost stage/sql/closing tables 0 -user2 localhost stage/sql/init 0 +user2 localhost stage/sql/Checking permissions 0 +user2 localhost stage/sql/Closing tables 0 +user2 localhost stage/sql/Init 0 +user2 localhost stage/sql/Init for update 0 user2 localhost stage/sql/Opening tables 0 -user3 localhost stage/sql/checking permissions 0 -user3 localhost stage/sql/closing tables 0 -user3 localhost stage/sql/init 0 +user3 localhost stage/sql/Checking permissions 0 +user3 localhost stage/sql/Closing tables 0 +user3 localhost stage/sql/Init 0 +user3 localhost stage/sql/Init for update 0 user3 localhost stage/sql/Opening tables 0 -user4 localhost stage/sql/checking permissions 0 -user4 localhost stage/sql/closing tables 0 -user4 localhost stage/sql/init 0 +user4 localhost stage/sql/Checking permissions 0 +user4 localhost stage/sql/Closing tables 0 +user4 localhost stage/sql/Init 0 +user4 localhost stage/sql/Init for update 0 user4 localhost stage/sql/Opening tables 0 execute dump_stages_user; user event_name count_star execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 0 -localhost stage/sql/closing tables 0 -localhost stage/sql/init 0 +localhost stage/sql/Checking permissions 0 +localhost stage/sql/Closing tables 0 +localhost stage/sql/Init 0 +localhost stage/sql/Init for update 0 localhost stage/sql/Opening tables 0 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 0 -stage/sql/closing tables 0 -stage/sql/init 0 +stage/sql/Checking permissions 0 +stage/sql/Closing tables 0 +stage/sql/Init 0 +stage/sql/Init for update 0 stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -3313,41 +3470,48 @@ wait/synch/mutex/sql/LOCK_connection_count 4 wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 0 -user1 localhost stage/sql/closing tables 0 -user1 localhost stage/sql/init 0 +user1 localhost stage/sql/Checking permissions 0 +user1 localhost stage/sql/Closing tables 0 +user1 localhost stage/sql/Init 0 +user1 localhost stage/sql/Init for update 0 user1 localhost stage/sql/Opening tables 0 -user2 localhost stage/sql/checking permissions 0 -user2 localhost stage/sql/closing tables 0 -user2 localhost stage/sql/init 0 +user2 localhost stage/sql/Checking permissions 0 +user2 localhost stage/sql/Closing tables 0 +user2 localhost stage/sql/Init 0 +user2 localhost stage/sql/Init for update 0 user2 localhost stage/sql/Opening tables 0 -user3 localhost stage/sql/checking permissions 0 -user3 localhost stage/sql/closing tables 0 -user3 localhost stage/sql/init 0 +user3 localhost stage/sql/Checking permissions 0 +user3 localhost stage/sql/Closing tables 0 +user3 localhost stage/sql/Init 0 +user3 localhost stage/sql/Init for update 0 user3 localhost stage/sql/Opening tables 0 -user4 localhost stage/sql/checking permissions 0 -user4 localhost stage/sql/closing tables 0 -user4 localhost stage/sql/init 0 +user4 localhost stage/sql/Checking permissions 0 +user4 localhost stage/sql/Closing tables 0 +user4 localhost stage/sql/Init 0 +user4 localhost stage/sql/Init for update 0 user4 localhost stage/sql/Opening tables 0 execute dump_stages_user; user event_name count_star execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 0 -localhost stage/sql/closing tables 0 -localhost stage/sql/init 0 +localhost stage/sql/Checking permissions 0 +localhost stage/sql/Closing tables 0 +localhost stage/sql/Init 0 +localhost stage/sql/Init for update 0 localhost stage/sql/Opening tables 0 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 0 -stage/sql/closing tables 0 -stage/sql/init 0 +stage/sql/Checking permissions 0 +stage/sql/Closing tables 0 +stage/sql/Init 0 +stage/sql/Init for update 0 stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -3449,41 +3613,48 @@ wait/synch/mutex/sql/LOCK_connection_count 4 wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 0 -user1 localhost stage/sql/closing tables 0 -user1 localhost stage/sql/init 0 +user1 localhost stage/sql/Checking permissions 0 +user1 localhost stage/sql/Closing tables 0 +user1 localhost stage/sql/Init 0 +user1 localhost stage/sql/Init for update 0 user1 localhost stage/sql/Opening tables 0 -user2 localhost stage/sql/checking permissions 0 -user2 localhost stage/sql/closing tables 0 -user2 localhost stage/sql/init 0 +user2 localhost stage/sql/Checking permissions 0 +user2 localhost stage/sql/Closing tables 0 +user2 localhost stage/sql/Init 0 +user2 localhost stage/sql/Init for update 0 user2 localhost stage/sql/Opening tables 0 -user3 localhost stage/sql/checking permissions 0 -user3 localhost stage/sql/closing tables 0 -user3 localhost stage/sql/init 0 +user3 localhost stage/sql/Checking permissions 0 +user3 localhost stage/sql/Closing tables 0 +user3 localhost stage/sql/Init 0 +user3 localhost stage/sql/Init for update 0 user3 localhost stage/sql/Opening tables 0 -user4 localhost stage/sql/checking permissions 0 -user4 localhost stage/sql/closing tables 0 -user4 localhost stage/sql/init 0 +user4 localhost stage/sql/Checking permissions 0 +user4 localhost stage/sql/Closing tables 0 +user4 localhost stage/sql/Init 0 +user4 localhost stage/sql/Init for update 0 user4 localhost stage/sql/Opening tables 0 execute dump_stages_user; user event_name count_star execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 0 -localhost stage/sql/closing tables 0 -localhost stage/sql/init 0 +localhost stage/sql/Checking permissions 0 +localhost stage/sql/Closing tables 0 +localhost stage/sql/Init 0 +localhost stage/sql/Init for update 0 localhost stage/sql/Opening tables 0 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 0 -stage/sql/closing tables 0 -stage/sql/init 0 +stage/sql/Checking permissions 0 +stage/sql/Closing tables 0 +stage/sql/Init 0 +stage/sql/Init for update 0 stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -3585,41 +3756,48 @@ wait/synch/mutex/sql/LOCK_connection_count 4 wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 0 -user1 localhost stage/sql/closing tables 0 -user1 localhost stage/sql/init 0 +user1 localhost stage/sql/Checking permissions 0 +user1 localhost stage/sql/Closing tables 0 +user1 localhost stage/sql/Init 0 +user1 localhost stage/sql/Init for update 0 user1 localhost stage/sql/Opening tables 0 -user2 localhost stage/sql/checking permissions 0 -user2 localhost stage/sql/closing tables 0 -user2 localhost stage/sql/init 0 +user2 localhost stage/sql/Checking permissions 0 +user2 localhost stage/sql/Closing tables 0 +user2 localhost stage/sql/Init 0 +user2 localhost stage/sql/Init for update 0 user2 localhost stage/sql/Opening tables 0 -user3 localhost stage/sql/checking permissions 0 -user3 localhost stage/sql/closing tables 0 -user3 localhost stage/sql/init 0 +user3 localhost stage/sql/Checking permissions 0 +user3 localhost stage/sql/Closing tables 0 +user3 localhost stage/sql/Init 0 +user3 localhost stage/sql/Init for update 0 user3 localhost stage/sql/Opening tables 0 -user4 localhost stage/sql/checking permissions 0 -user4 localhost stage/sql/closing tables 0 -user4 localhost stage/sql/init 0 +user4 localhost stage/sql/Checking permissions 0 +user4 localhost stage/sql/Closing tables 0 +user4 localhost stage/sql/Init 0 +user4 localhost stage/sql/Init for update 0 user4 localhost stage/sql/Opening tables 0 execute dump_stages_user; user event_name count_star execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 0 -localhost stage/sql/closing tables 0 -localhost stage/sql/init 0 +localhost stage/sql/Checking permissions 0 +localhost stage/sql/Closing tables 0 +localhost stage/sql/Init 0 +localhost stage/sql/Init for update 0 localhost stage/sql/Opening tables 0 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 0 -stage/sql/closing tables 0 -stage/sql/init 0 +stage/sql/Checking permissions 0 +stage/sql/Closing tables 0 +stage/sql/Init 0 +stage/sql/Init for update 0 stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -3709,21 +3887,24 @@ execute dump_stages_user; user event_name count_star execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 0 -localhost stage/sql/closing tables 0 -localhost stage/sql/init 0 +localhost stage/sql/Checking permissions 0 +localhost stage/sql/Closing tables 0 +localhost stage/sql/Init 0 +localhost stage/sql/Init for update 0 localhost stage/sql/Opening tables 0 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 0 -stage/sql/closing tables 0 -stage/sql/init 0 +stage/sql/Checking permissions 0 +stage/sql/Closing tables 0 +stage/sql/Init 0 +stage/sql/Init for update 0 stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -3793,21 +3974,24 @@ execute dump_stages_user; user event_name count_star execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 0 -localhost stage/sql/closing tables 0 -localhost stage/sql/init 0 +localhost stage/sql/Checking permissions 0 +localhost stage/sql/Closing tables 0 +localhost stage/sql/Init 0 +localhost stage/sql/Init for update 0 localhost stage/sql/Opening tables 0 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 0 -stage/sql/closing tables 0 -stage/sql/init 0 +stage/sql/Checking permissions 0 +stage/sql/Closing tables 0 +stage/sql/Init 0 +stage/sql/Init for update 0 stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -3877,21 +4061,24 @@ execute dump_stages_user; user event_name count_star execute dump_stages_host; host event_name count_star -localhost stage/sql/checking permissions 0 -localhost stage/sql/closing tables 0 -localhost stage/sql/init 0 +localhost stage/sql/Checking permissions 0 +localhost stage/sql/Closing tables 0 +localhost stage/sql/Init 0 +localhost stage/sql/Init for update 0 localhost stage/sql/Opening tables 0 execute dump_stages_global; event_name count_star -stage/sql/checking permissions 0 -stage/sql/closing tables 0 -stage/sql/init 0 +stage/sql/Checking permissions 0 +stage/sql/Closing tables 0 +stage/sql/Init 0 +stage/sql/Init for update 0 stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star 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 5b40823e6ff..a493631d71f 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 @@ -30,9 +30,10 @@ execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/checking permissions 0 -stage/sql/closing tables 0 -stage/sql/init 0 +stage/sql/Checking permissions 0 +stage/sql/Closing tables 0 +stage/sql/Init 0 +stage/sql/Init for update 0 stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) @@ -93,9 +94,10 @@ event_name count(event_name) wait/io/file/sql/query_log 1 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 0 -user1 localhost stage/sql/closing tables 0 -user1 localhost stage/sql/init 0 +user1 localhost stage/sql/Checking permissions 0 +user1 localhost stage/sql/Closing tables 0 +user1 localhost stage/sql/Init 0 +user1 localhost stage/sql/Init for update 0 user1 localhost stage/sql/Opening tables 0 execute dump_stages_user; user event_name count_star @@ -103,9 +105,10 @@ execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/checking permissions 0 -stage/sql/closing tables 0 -stage/sql/init 0 +stage/sql/Checking permissions 0 +stage/sql/Closing tables 0 +stage/sql/Init 0 +stage/sql/Init for update 0 stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) @@ -179,9 +182,10 @@ wait/io/file/sql/query_log 4 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 3 -user1 localhost stage/sql/closing tables 3 -user1 localhost stage/sql/init 6 +user1 localhost stage/sql/Checking permissions 3 +user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Init 5 +user1 localhost stage/sql/Init for update 1 user1 localhost stage/sql/Opening tables 3 execute dump_stages_user; user event_name count_star @@ -189,15 +193,17 @@ execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/checking permissions 3 -stage/sql/closing tables 3 -stage/sql/init 6 +stage/sql/Checking permissions 3 +stage/sql/Closing tables 4 +stage/sql/Init 5 +stage/sql/Init for update 1 stage/sql/Opening tables 3 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 3 -stage/sql/closing tables 3 -stage/sql/init 6 +stage/sql/Checking permissions 3 +stage/sql/Closing tables 4 +stage/sql/Init 5 +stage/sql/Init for update 1 stage/sql/Opening tables 3 execute dump_statements_account; user host event_name count_star @@ -271,13 +277,15 @@ wait/io/file/sql/query_log 5 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 3 -user1 localhost stage/sql/closing tables 3 -user1 localhost stage/sql/init 6 +user1 localhost stage/sql/Checking permissions 3 +user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Init 5 +user1 localhost stage/sql/Init for update 1 user1 localhost stage/sql/Opening tables 3 -user2 localhost stage/sql/checking permissions 0 -user2 localhost stage/sql/closing tables 0 -user2 localhost stage/sql/init 0 +user2 localhost stage/sql/Checking permissions 0 +user2 localhost stage/sql/Closing tables 0 +user2 localhost stage/sql/Init 0 +user2 localhost stage/sql/Init for update 0 user2 localhost stage/sql/Opening tables 0 execute dump_stages_user; user event_name count_star @@ -285,15 +293,17 @@ execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/checking permissions 3 -stage/sql/closing tables 3 -stage/sql/init 6 +stage/sql/Checking permissions 3 +stage/sql/Closing tables 4 +stage/sql/Init 5 +stage/sql/Init for update 1 stage/sql/Opening tables 3 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 3 -stage/sql/closing tables 3 -stage/sql/init 6 +stage/sql/Checking permissions 3 +stage/sql/Closing tables 4 +stage/sql/Init 5 +stage/sql/Init for update 1 stage/sql/Opening tables 3 execute dump_statements_account; user host event_name count_star @@ -379,13 +389,15 @@ wait/io/file/sql/query_log 8 wait/synch/rwlock/sql/LOCK_grant 2 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 3 -user1 localhost stage/sql/closing tables 3 -user1 localhost stage/sql/init 6 +user1 localhost stage/sql/Checking permissions 3 +user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Init 5 +user1 localhost stage/sql/Init for update 1 user1 localhost stage/sql/Opening tables 3 -user2 localhost stage/sql/checking permissions 3 -user2 localhost stage/sql/closing tables 3 -user2 localhost stage/sql/init 6 +user2 localhost stage/sql/Checking permissions 3 +user2 localhost stage/sql/Closing tables 4 +user2 localhost stage/sql/Init 5 +user2 localhost stage/sql/Init for update 1 user2 localhost stage/sql/Opening tables 3 execute dump_stages_user; user event_name count_star @@ -393,15 +405,17 @@ execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/checking permissions 6 -stage/sql/closing tables 6 -stage/sql/init 12 +stage/sql/Checking permissions 6 +stage/sql/Closing tables 8 +stage/sql/Init 10 +stage/sql/Init for update 2 stage/sql/Opening tables 6 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 6 -stage/sql/closing tables 6 -stage/sql/init 12 +stage/sql/Checking permissions 6 +stage/sql/Closing tables 8 +stage/sql/Init 10 +stage/sql/Init for update 2 stage/sql/Opening tables 6 execute dump_statements_account; user host event_name count_star @@ -487,17 +501,20 @@ wait/io/file/sql/query_log 9 wait/synch/rwlock/sql/LOCK_grant 2 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 3 -user1 localhost stage/sql/closing tables 3 -user1 localhost stage/sql/init 6 +user1 localhost stage/sql/Checking permissions 3 +user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Init 5 +user1 localhost stage/sql/Init for update 1 user1 localhost stage/sql/Opening tables 3 -user2 localhost stage/sql/checking permissions 3 -user2 localhost stage/sql/closing tables 3 -user2 localhost stage/sql/init 6 +user2 localhost stage/sql/Checking permissions 3 +user2 localhost stage/sql/Closing tables 4 +user2 localhost stage/sql/Init 5 +user2 localhost stage/sql/Init for update 1 user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/checking permissions 0 -user3 localhost stage/sql/closing tables 0 -user3 localhost stage/sql/init 0 +user3 localhost stage/sql/Checking permissions 0 +user3 localhost stage/sql/Closing tables 0 +user3 localhost stage/sql/Init 0 +user3 localhost stage/sql/Init for update 0 user3 localhost stage/sql/Opening tables 0 execute dump_stages_user; user event_name count_star @@ -505,15 +522,17 @@ execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/checking permissions 6 -stage/sql/closing tables 6 -stage/sql/init 12 +stage/sql/Checking permissions 6 +stage/sql/Closing tables 8 +stage/sql/Init 10 +stage/sql/Init for update 2 stage/sql/Opening tables 6 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 6 -stage/sql/closing tables 6 -stage/sql/init 12 +stage/sql/Checking permissions 6 +stage/sql/Closing tables 8 +stage/sql/Init 10 +stage/sql/Init for update 2 stage/sql/Opening tables 6 execute dump_statements_account; user host event_name count_star @@ -611,17 +630,20 @@ wait/io/file/sql/query_log 12 wait/synch/rwlock/sql/LOCK_grant 3 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 3 -user1 localhost stage/sql/closing tables 3 -user1 localhost stage/sql/init 6 +user1 localhost stage/sql/Checking permissions 3 +user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Init 5 +user1 localhost stage/sql/Init for update 1 user1 localhost stage/sql/Opening tables 3 -user2 localhost stage/sql/checking permissions 3 -user2 localhost stage/sql/closing tables 3 -user2 localhost stage/sql/init 6 +user2 localhost stage/sql/Checking permissions 3 +user2 localhost stage/sql/Closing tables 4 +user2 localhost stage/sql/Init 5 +user2 localhost stage/sql/Init for update 1 user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/checking permissions 3 -user3 localhost stage/sql/closing tables 3 -user3 localhost stage/sql/init 6 +user3 localhost stage/sql/Checking permissions 3 +user3 localhost stage/sql/Closing tables 4 +user3 localhost stage/sql/Init 5 +user3 localhost stage/sql/Init for update 1 user3 localhost stage/sql/Opening tables 3 execute dump_stages_user; user event_name count_star @@ -629,15 +651,17 @@ execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/checking permissions 9 -stage/sql/closing tables 9 -stage/sql/init 18 +stage/sql/Checking permissions 9 +stage/sql/Closing tables 12 +stage/sql/Init 15 +stage/sql/Init for update 3 stage/sql/Opening tables 9 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 9 -stage/sql/closing tables 9 -stage/sql/init 18 +stage/sql/Checking permissions 9 +stage/sql/Closing tables 12 +stage/sql/Init 15 +stage/sql/Init for update 3 stage/sql/Opening tables 9 execute dump_statements_account; user host event_name count_star @@ -735,21 +759,25 @@ wait/io/file/sql/query_log 13 wait/synch/rwlock/sql/LOCK_grant 3 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 3 -user1 localhost stage/sql/closing tables 3 -user1 localhost stage/sql/init 6 +user1 localhost stage/sql/Checking permissions 3 +user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Init 5 +user1 localhost stage/sql/Init for update 1 user1 localhost stage/sql/Opening tables 3 -user2 localhost stage/sql/checking permissions 3 -user2 localhost stage/sql/closing tables 3 -user2 localhost stage/sql/init 6 +user2 localhost stage/sql/Checking permissions 3 +user2 localhost stage/sql/Closing tables 4 +user2 localhost stage/sql/Init 5 +user2 localhost stage/sql/Init for update 1 user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/checking permissions 3 -user3 localhost stage/sql/closing tables 3 -user3 localhost stage/sql/init 6 +user3 localhost stage/sql/Checking permissions 3 +user3 localhost stage/sql/Closing tables 4 +user3 localhost stage/sql/Init 5 +user3 localhost stage/sql/Init for update 1 user3 localhost stage/sql/Opening tables 3 -user4 localhost stage/sql/checking permissions 0 -user4 localhost stage/sql/closing tables 0 -user4 localhost stage/sql/init 0 +user4 localhost stage/sql/Checking permissions 0 +user4 localhost stage/sql/Closing tables 0 +user4 localhost stage/sql/Init 0 +user4 localhost stage/sql/Init for update 0 user4 localhost stage/sql/Opening tables 0 execute dump_stages_user; user event_name count_star @@ -757,15 +785,17 @@ execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/checking permissions 9 -stage/sql/closing tables 9 -stage/sql/init 18 +stage/sql/Checking permissions 9 +stage/sql/Closing tables 12 +stage/sql/Init 15 +stage/sql/Init for update 3 stage/sql/Opening tables 9 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 9 -stage/sql/closing tables 9 -stage/sql/init 18 +stage/sql/Checking permissions 9 +stage/sql/Closing tables 12 +stage/sql/Init 15 +stage/sql/Init for update 3 stage/sql/Opening tables 9 execute dump_statements_account; user host event_name count_star @@ -875,21 +905,25 @@ wait/io/file/sql/query_log 16 wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 3 -user1 localhost stage/sql/closing tables 3 -user1 localhost stage/sql/init 6 +user1 localhost stage/sql/Checking permissions 3 +user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Init 5 +user1 localhost stage/sql/Init for update 1 user1 localhost stage/sql/Opening tables 3 -user2 localhost stage/sql/checking permissions 3 -user2 localhost stage/sql/closing tables 3 -user2 localhost stage/sql/init 6 +user2 localhost stage/sql/Checking permissions 3 +user2 localhost stage/sql/Closing tables 4 +user2 localhost stage/sql/Init 5 +user2 localhost stage/sql/Init for update 1 user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/checking permissions 3 -user3 localhost stage/sql/closing tables 3 -user3 localhost stage/sql/init 6 +user3 localhost stage/sql/Checking permissions 3 +user3 localhost stage/sql/Closing tables 4 +user3 localhost stage/sql/Init 5 +user3 localhost stage/sql/Init for update 1 user3 localhost stage/sql/Opening tables 3 -user4 localhost stage/sql/checking permissions 3 -user4 localhost stage/sql/closing tables 3 -user4 localhost stage/sql/init 6 +user4 localhost stage/sql/Checking permissions 3 +user4 localhost stage/sql/Closing tables 4 +user4 localhost stage/sql/Init 5 +user4 localhost stage/sql/Init for update 1 user4 localhost stage/sql/Opening tables 3 execute dump_stages_user; user event_name count_star @@ -897,15 +931,17 @@ 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 12 -stage/sql/init 24 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 20 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 24 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 20 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -1006,21 +1042,25 @@ wait/synch/mutex/sql/LOCK_connection_count 1 wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 3 -user1 localhost stage/sql/closing tables 3 -user1 localhost stage/sql/init 7 +user1 localhost stage/sql/Checking permissions 3 +user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Init 6 +user1 localhost stage/sql/Init for update 1 user1 localhost stage/sql/Opening tables 3 -user2 localhost stage/sql/checking permissions 3 -user2 localhost stage/sql/closing tables 3 -user2 localhost stage/sql/init 6 +user2 localhost stage/sql/Checking permissions 3 +user2 localhost stage/sql/Closing tables 4 +user2 localhost stage/sql/Init 5 +user2 localhost stage/sql/Init for update 1 user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/checking permissions 3 -user3 localhost stage/sql/closing tables 3 -user3 localhost stage/sql/init 6 +user3 localhost stage/sql/Checking permissions 3 +user3 localhost stage/sql/Closing tables 4 +user3 localhost stage/sql/Init 5 +user3 localhost stage/sql/Init for update 1 user3 localhost stage/sql/Opening tables 3 -user4 localhost stage/sql/checking permissions 3 -user4 localhost stage/sql/closing tables 3 -user4 localhost stage/sql/init 6 +user4 localhost stage/sql/Checking permissions 3 +user4 localhost stage/sql/Closing tables 4 +user4 localhost stage/sql/Init 5 +user4 localhost stage/sql/Init for update 1 user4 localhost stage/sql/Opening tables 3 execute dump_stages_user; user event_name count_star @@ -1028,15 +1068,17 @@ 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 12 -stage/sql/init 25 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 21 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 25 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 21 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -1135,21 +1177,25 @@ wait/synch/mutex/sql/LOCK_connection_count 2 wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 3 -user1 localhost stage/sql/closing tables 3 -user1 localhost stage/sql/init 7 +user1 localhost stage/sql/Checking permissions 3 +user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Init 6 +user1 localhost stage/sql/Init for update 1 user1 localhost stage/sql/Opening tables 3 -user2 localhost stage/sql/checking permissions 3 -user2 localhost stage/sql/closing tables 3 -user2 localhost stage/sql/init 7 +user2 localhost stage/sql/Checking permissions 3 +user2 localhost stage/sql/Closing tables 4 +user2 localhost stage/sql/Init 6 +user2 localhost stage/sql/Init for update 1 user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/checking permissions 3 -user3 localhost stage/sql/closing tables 3 -user3 localhost stage/sql/init 6 +user3 localhost stage/sql/Checking permissions 3 +user3 localhost stage/sql/Closing tables 4 +user3 localhost stage/sql/Init 5 +user3 localhost stage/sql/Init for update 1 user3 localhost stage/sql/Opening tables 3 -user4 localhost stage/sql/checking permissions 3 -user4 localhost stage/sql/closing tables 3 -user4 localhost stage/sql/init 6 +user4 localhost stage/sql/Checking permissions 3 +user4 localhost stage/sql/Closing tables 4 +user4 localhost stage/sql/Init 5 +user4 localhost stage/sql/Init for update 1 user4 localhost stage/sql/Opening tables 3 execute dump_stages_user; user event_name count_star @@ -1157,15 +1203,17 @@ 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 12 -stage/sql/init 26 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 22 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 26 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 22 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -1261,21 +1309,25 @@ wait/synch/mutex/sql/LOCK_connection_count 3 wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 3 -user1 localhost stage/sql/closing tables 3 -user1 localhost stage/sql/init 7 +user1 localhost stage/sql/Checking permissions 3 +user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Init 6 +user1 localhost stage/sql/Init for update 1 user1 localhost stage/sql/Opening tables 3 -user2 localhost stage/sql/checking permissions 3 -user2 localhost stage/sql/closing tables 3 -user2 localhost stage/sql/init 7 +user2 localhost stage/sql/Checking permissions 3 +user2 localhost stage/sql/Closing tables 4 +user2 localhost stage/sql/Init 6 +user2 localhost stage/sql/Init for update 1 user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/checking permissions 3 -user3 localhost stage/sql/closing tables 3 -user3 localhost stage/sql/init 7 +user3 localhost stage/sql/Checking permissions 3 +user3 localhost stage/sql/Closing tables 4 +user3 localhost stage/sql/Init 6 +user3 localhost stage/sql/Init for update 1 user3 localhost stage/sql/Opening tables 3 -user4 localhost stage/sql/checking permissions 3 -user4 localhost stage/sql/closing tables 3 -user4 localhost stage/sql/init 6 +user4 localhost stage/sql/Checking permissions 3 +user4 localhost stage/sql/Closing tables 4 +user4 localhost stage/sql/Init 5 +user4 localhost stage/sql/Init for update 1 user4 localhost stage/sql/Opening tables 3 execute dump_stages_user; user event_name count_star @@ -1283,15 +1335,17 @@ 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 12 -stage/sql/init 27 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 23 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 27 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 23 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -1384,21 +1438,25 @@ wait/synch/mutex/sql/LOCK_connection_count 4 wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 3 -user1 localhost stage/sql/closing tables 3 -user1 localhost stage/sql/init 7 +user1 localhost stage/sql/Checking permissions 3 +user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Init 6 +user1 localhost stage/sql/Init for update 1 user1 localhost stage/sql/Opening tables 3 -user2 localhost stage/sql/checking permissions 3 -user2 localhost stage/sql/closing tables 3 -user2 localhost stage/sql/init 7 +user2 localhost stage/sql/Checking permissions 3 +user2 localhost stage/sql/Closing tables 4 +user2 localhost stage/sql/Init 6 +user2 localhost stage/sql/Init for update 1 user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/checking permissions 3 -user3 localhost stage/sql/closing tables 3 -user3 localhost stage/sql/init 7 +user3 localhost stage/sql/Checking permissions 3 +user3 localhost stage/sql/Closing tables 4 +user3 localhost stage/sql/Init 6 +user3 localhost stage/sql/Init for update 1 user3 localhost stage/sql/Opening tables 3 -user4 localhost stage/sql/checking permissions 3 -user4 localhost stage/sql/closing tables 3 -user4 localhost stage/sql/init 7 +user4 localhost stage/sql/Checking permissions 3 +user4 localhost stage/sql/Closing tables 4 +user4 localhost stage/sql/Init 6 +user4 localhost stage/sql/Init for update 1 user4 localhost stage/sql/Opening tables 3 execute dump_stages_user; user event_name count_star @@ -1406,15 +1464,17 @@ 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 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -1508,21 +1568,25 @@ wait/synch/mutex/sql/LOCK_connection_count 4 wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 3 -user1 localhost stage/sql/closing tables 3 -user1 localhost stage/sql/init 7 +user1 localhost stage/sql/Checking permissions 3 +user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Init 6 +user1 localhost stage/sql/Init for update 1 user1 localhost stage/sql/Opening tables 3 -user2 localhost stage/sql/checking permissions 3 -user2 localhost stage/sql/closing tables 3 -user2 localhost stage/sql/init 7 +user2 localhost stage/sql/Checking permissions 3 +user2 localhost stage/sql/Closing tables 4 +user2 localhost stage/sql/Init 6 +user2 localhost stage/sql/Init for update 1 user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/checking permissions 3 -user3 localhost stage/sql/closing tables 3 -user3 localhost stage/sql/init 7 +user3 localhost stage/sql/Checking permissions 3 +user3 localhost stage/sql/Closing tables 4 +user3 localhost stage/sql/Init 6 +user3 localhost stage/sql/Init for update 1 user3 localhost stage/sql/Opening tables 3 -user4 localhost stage/sql/checking permissions 3 -user4 localhost stage/sql/closing tables 3 -user4 localhost stage/sql/init 7 +user4 localhost stage/sql/Checking permissions 3 +user4 localhost stage/sql/Closing tables 4 +user4 localhost stage/sql/Init 6 +user4 localhost stage/sql/Init for update 1 user4 localhost stage/sql/Opening tables 3 execute dump_stages_user; user event_name count_star @@ -1530,15 +1594,17 @@ 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 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -1631,21 +1697,25 @@ wait/synch/mutex/sql/LOCK_connection_count 4 wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 3 -user1 localhost stage/sql/closing tables 3 -user1 localhost stage/sql/init 7 +user1 localhost stage/sql/Checking permissions 3 +user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Init 6 +user1 localhost stage/sql/Init for update 1 user1 localhost stage/sql/Opening tables 3 -user2 localhost stage/sql/checking permissions 3 -user2 localhost stage/sql/closing tables 3 -user2 localhost stage/sql/init 7 +user2 localhost stage/sql/Checking permissions 3 +user2 localhost stage/sql/Closing tables 4 +user2 localhost stage/sql/Init 6 +user2 localhost stage/sql/Init for update 1 user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/checking permissions 3 -user3 localhost stage/sql/closing tables 3 -user3 localhost stage/sql/init 7 +user3 localhost stage/sql/Checking permissions 3 +user3 localhost stage/sql/Closing tables 4 +user3 localhost stage/sql/Init 6 +user3 localhost stage/sql/Init for update 1 user3 localhost stage/sql/Opening tables 3 -user4 localhost stage/sql/checking permissions 3 -user4 localhost stage/sql/closing tables 3 -user4 localhost stage/sql/init 7 +user4 localhost stage/sql/Checking permissions 3 +user4 localhost stage/sql/Closing tables 4 +user4 localhost stage/sql/Init 6 +user4 localhost stage/sql/Init for update 1 user4 localhost stage/sql/Opening tables 3 execute dump_stages_user; user event_name count_star @@ -1653,15 +1723,17 @@ 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 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -1754,21 +1826,25 @@ wait/synch/mutex/sql/LOCK_connection_count 4 wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 3 -user1 localhost stage/sql/closing tables 3 -user1 localhost stage/sql/init 7 +user1 localhost stage/sql/Checking permissions 3 +user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Init 6 +user1 localhost stage/sql/Init for update 1 user1 localhost stage/sql/Opening tables 3 -user2 localhost stage/sql/checking permissions 3 -user2 localhost stage/sql/closing tables 3 -user2 localhost stage/sql/init 7 +user2 localhost stage/sql/Checking permissions 3 +user2 localhost stage/sql/Closing tables 4 +user2 localhost stage/sql/Init 6 +user2 localhost stage/sql/Init for update 1 user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/checking permissions 3 -user3 localhost stage/sql/closing tables 3 -user3 localhost stage/sql/init 7 +user3 localhost stage/sql/Checking permissions 3 +user3 localhost stage/sql/Closing tables 4 +user3 localhost stage/sql/Init 6 +user3 localhost stage/sql/Init for update 1 user3 localhost stage/sql/Opening tables 3 -user4 localhost stage/sql/checking permissions 3 -user4 localhost stage/sql/closing tables 3 -user4 localhost stage/sql/init 7 +user4 localhost stage/sql/Checking permissions 3 +user4 localhost stage/sql/Closing tables 4 +user4 localhost stage/sql/Init 6 +user4 localhost stage/sql/Init for update 1 user4 localhost stage/sql/Opening tables 3 execute dump_stages_user; user event_name count_star @@ -1776,15 +1852,17 @@ 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 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -1877,21 +1955,25 @@ wait/synch/mutex/sql/LOCK_connection_count 4 wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 3 -user1 localhost stage/sql/closing tables 3 -user1 localhost stage/sql/init 7 +user1 localhost stage/sql/Checking permissions 3 +user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Init 6 +user1 localhost stage/sql/Init for update 1 user1 localhost stage/sql/Opening tables 3 -user2 localhost stage/sql/checking permissions 3 -user2 localhost stage/sql/closing tables 3 -user2 localhost stage/sql/init 7 +user2 localhost stage/sql/Checking permissions 3 +user2 localhost stage/sql/Closing tables 4 +user2 localhost stage/sql/Init 6 +user2 localhost stage/sql/Init for update 1 user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/checking permissions 3 -user3 localhost stage/sql/closing tables 3 -user3 localhost stage/sql/init 7 +user3 localhost stage/sql/Checking permissions 3 +user3 localhost stage/sql/Closing tables 4 +user3 localhost stage/sql/Init 6 +user3 localhost stage/sql/Init for update 1 user3 localhost stage/sql/Opening tables 3 -user4 localhost stage/sql/checking permissions 3 -user4 localhost stage/sql/closing tables 3 -user4 localhost stage/sql/init 7 +user4 localhost stage/sql/Checking permissions 3 +user4 localhost stage/sql/Closing tables 4 +user4 localhost stage/sql/Init 6 +user4 localhost stage/sql/Init for update 1 user4 localhost stage/sql/Opening tables 3 execute dump_stages_user; user event_name count_star @@ -1899,15 +1981,17 @@ 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 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -2000,21 +2084,25 @@ wait/synch/mutex/sql/LOCK_connection_count 4 wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 3 -user1 localhost stage/sql/closing tables 3 -user1 localhost stage/sql/init 7 +user1 localhost stage/sql/Checking permissions 3 +user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Init 6 +user1 localhost stage/sql/Init for update 1 user1 localhost stage/sql/Opening tables 3 -user2 localhost stage/sql/checking permissions 3 -user2 localhost stage/sql/closing tables 3 -user2 localhost stage/sql/init 7 +user2 localhost stage/sql/Checking permissions 3 +user2 localhost stage/sql/Closing tables 4 +user2 localhost stage/sql/Init 6 +user2 localhost stage/sql/Init for update 1 user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/checking permissions 3 -user3 localhost stage/sql/closing tables 3 -user3 localhost stage/sql/init 7 +user3 localhost stage/sql/Checking permissions 3 +user3 localhost stage/sql/Closing tables 4 +user3 localhost stage/sql/Init 6 +user3 localhost stage/sql/Init for update 1 user3 localhost stage/sql/Opening tables 3 -user4 localhost stage/sql/checking permissions 3 -user4 localhost stage/sql/closing tables 3 -user4 localhost stage/sql/init 7 +user4 localhost stage/sql/Checking permissions 3 +user4 localhost stage/sql/Closing tables 4 +user4 localhost stage/sql/Init 6 +user4 localhost stage/sql/Init for update 1 user4 localhost stage/sql/Opening tables 3 execute dump_stages_user; user event_name count_star @@ -2022,15 +2110,17 @@ 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 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -2123,21 +2213,25 @@ wait/synch/mutex/sql/LOCK_connection_count 4 wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 3 -user1 localhost stage/sql/closing tables 3 -user1 localhost stage/sql/init 7 +user1 localhost stage/sql/Checking permissions 3 +user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Init 6 +user1 localhost stage/sql/Init for update 1 user1 localhost stage/sql/Opening tables 3 -user2 localhost stage/sql/checking permissions 3 -user2 localhost stage/sql/closing tables 3 -user2 localhost stage/sql/init 7 +user2 localhost stage/sql/Checking permissions 3 +user2 localhost stage/sql/Closing tables 4 +user2 localhost stage/sql/Init 6 +user2 localhost stage/sql/Init for update 1 user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/checking permissions 3 -user3 localhost stage/sql/closing tables 3 -user3 localhost stage/sql/init 7 +user3 localhost stage/sql/Checking permissions 3 +user3 localhost stage/sql/Closing tables 4 +user3 localhost stage/sql/Init 6 +user3 localhost stage/sql/Init for update 1 user3 localhost stage/sql/Opening tables 3 -user4 localhost stage/sql/checking permissions 3 -user4 localhost stage/sql/closing tables 3 -user4 localhost stage/sql/init 7 +user4 localhost stage/sql/Checking permissions 3 +user4 localhost stage/sql/Closing tables 4 +user4 localhost stage/sql/Init 6 +user4 localhost stage/sql/Init for update 1 user4 localhost stage/sql/Opening tables 3 execute dump_stages_user; user event_name count_star @@ -2145,15 +2239,17 @@ 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 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -2246,21 +2342,25 @@ wait/synch/mutex/sql/LOCK_connection_count 4 wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 0 -user1 localhost stage/sql/closing tables 0 -user1 localhost stage/sql/init 0 +user1 localhost stage/sql/Checking permissions 0 +user1 localhost stage/sql/Closing tables 0 +user1 localhost stage/sql/Init 0 +user1 localhost stage/sql/Init for update 0 user1 localhost stage/sql/Opening tables 0 -user2 localhost stage/sql/checking permissions 0 -user2 localhost stage/sql/closing tables 0 -user2 localhost stage/sql/init 0 +user2 localhost stage/sql/Checking permissions 0 +user2 localhost stage/sql/Closing tables 0 +user2 localhost stage/sql/Init 0 +user2 localhost stage/sql/Init for update 0 user2 localhost stage/sql/Opening tables 0 -user3 localhost stage/sql/checking permissions 0 -user3 localhost stage/sql/closing tables 0 -user3 localhost stage/sql/init 0 +user3 localhost stage/sql/Checking permissions 0 +user3 localhost stage/sql/Closing tables 0 +user3 localhost stage/sql/Init 0 +user3 localhost stage/sql/Init for update 0 user3 localhost stage/sql/Opening tables 0 -user4 localhost stage/sql/checking permissions 0 -user4 localhost stage/sql/closing tables 0 -user4 localhost stage/sql/init 0 +user4 localhost stage/sql/Checking permissions 0 +user4 localhost stage/sql/Closing tables 0 +user4 localhost stage/sql/Init 0 +user4 localhost stage/sql/Init for update 0 user4 localhost stage/sql/Opening tables 0 execute dump_stages_user; user event_name count_star @@ -2268,15 +2368,17 @@ 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 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -2369,21 +2471,25 @@ wait/synch/mutex/sql/LOCK_connection_count 4 wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 0 -user1 localhost stage/sql/closing tables 0 -user1 localhost stage/sql/init 0 +user1 localhost stage/sql/Checking permissions 0 +user1 localhost stage/sql/Closing tables 0 +user1 localhost stage/sql/Init 0 +user1 localhost stage/sql/Init for update 0 user1 localhost stage/sql/Opening tables 0 -user2 localhost stage/sql/checking permissions 0 -user2 localhost stage/sql/closing tables 0 -user2 localhost stage/sql/init 0 +user2 localhost stage/sql/Checking permissions 0 +user2 localhost stage/sql/Closing tables 0 +user2 localhost stage/sql/Init 0 +user2 localhost stage/sql/Init for update 0 user2 localhost stage/sql/Opening tables 0 -user3 localhost stage/sql/checking permissions 0 -user3 localhost stage/sql/closing tables 0 -user3 localhost stage/sql/init 0 +user3 localhost stage/sql/Checking permissions 0 +user3 localhost stage/sql/Closing tables 0 +user3 localhost stage/sql/Init 0 +user3 localhost stage/sql/Init for update 0 user3 localhost stage/sql/Opening tables 0 -user4 localhost stage/sql/checking permissions 0 -user4 localhost stage/sql/closing tables 0 -user4 localhost stage/sql/init 0 +user4 localhost stage/sql/Checking permissions 0 +user4 localhost stage/sql/Closing tables 0 +user4 localhost stage/sql/Init 0 +user4 localhost stage/sql/Init for update 0 user4 localhost stage/sql/Opening tables 0 execute dump_stages_user; user event_name count_star @@ -2391,15 +2497,17 @@ 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 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -2492,21 +2600,25 @@ wait/synch/mutex/sql/LOCK_connection_count 4 wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 0 -user1 localhost stage/sql/closing tables 0 -user1 localhost stage/sql/init 0 +user1 localhost stage/sql/Checking permissions 0 +user1 localhost stage/sql/Closing tables 0 +user1 localhost stage/sql/Init 0 +user1 localhost stage/sql/Init for update 0 user1 localhost stage/sql/Opening tables 0 -user2 localhost stage/sql/checking permissions 0 -user2 localhost stage/sql/closing tables 0 -user2 localhost stage/sql/init 0 +user2 localhost stage/sql/Checking permissions 0 +user2 localhost stage/sql/Closing tables 0 +user2 localhost stage/sql/Init 0 +user2 localhost stage/sql/Init for update 0 user2 localhost stage/sql/Opening tables 0 -user3 localhost stage/sql/checking permissions 0 -user3 localhost stage/sql/closing tables 0 -user3 localhost stage/sql/init 0 +user3 localhost stage/sql/Checking permissions 0 +user3 localhost stage/sql/Closing tables 0 +user3 localhost stage/sql/Init 0 +user3 localhost stage/sql/Init for update 0 user3 localhost stage/sql/Opening tables 0 -user4 localhost stage/sql/checking permissions 0 -user4 localhost stage/sql/closing tables 0 -user4 localhost stage/sql/init 0 +user4 localhost stage/sql/Checking permissions 0 +user4 localhost stage/sql/Closing tables 0 +user4 localhost stage/sql/Init 0 +user4 localhost stage/sql/Init for update 0 user4 localhost stage/sql/Opening tables 0 execute dump_stages_user; user event_name count_star @@ -2514,15 +2626,17 @@ 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 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -2615,21 +2729,25 @@ wait/synch/mutex/sql/LOCK_connection_count 4 wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 0 -user1 localhost stage/sql/closing tables 0 -user1 localhost stage/sql/init 0 +user1 localhost stage/sql/Checking permissions 0 +user1 localhost stage/sql/Closing tables 0 +user1 localhost stage/sql/Init 0 +user1 localhost stage/sql/Init for update 0 user1 localhost stage/sql/Opening tables 0 -user2 localhost stage/sql/checking permissions 0 -user2 localhost stage/sql/closing tables 0 -user2 localhost stage/sql/init 0 +user2 localhost stage/sql/Checking permissions 0 +user2 localhost stage/sql/Closing tables 0 +user2 localhost stage/sql/Init 0 +user2 localhost stage/sql/Init for update 0 user2 localhost stage/sql/Opening tables 0 -user3 localhost stage/sql/checking permissions 0 -user3 localhost stage/sql/closing tables 0 -user3 localhost stage/sql/init 0 +user3 localhost stage/sql/Checking permissions 0 +user3 localhost stage/sql/Closing tables 0 +user3 localhost stage/sql/Init 0 +user3 localhost stage/sql/Init for update 0 user3 localhost stage/sql/Opening tables 0 -user4 localhost stage/sql/checking permissions 0 -user4 localhost stage/sql/closing tables 0 -user4 localhost stage/sql/init 0 +user4 localhost stage/sql/Checking permissions 0 +user4 localhost stage/sql/Closing tables 0 +user4 localhost stage/sql/Init 0 +user4 localhost stage/sql/Init for update 0 user4 localhost stage/sql/Opening tables 0 execute dump_stages_user; user event_name count_star @@ -2637,15 +2755,17 @@ execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/checking permissions 0 -stage/sql/closing tables 0 -stage/sql/init 0 +stage/sql/Checking permissions 0 +stage/sql/Closing tables 0 +stage/sql/Init 0 +stage/sql/Init for update 0 stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -2738,21 +2858,25 @@ wait/synch/mutex/sql/LOCK_connection_count 4 wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 0 -user1 localhost stage/sql/closing tables 0 -user1 localhost stage/sql/init 0 +user1 localhost stage/sql/Checking permissions 0 +user1 localhost stage/sql/Closing tables 0 +user1 localhost stage/sql/Init 0 +user1 localhost stage/sql/Init for update 0 user1 localhost stage/sql/Opening tables 0 -user2 localhost stage/sql/checking permissions 0 -user2 localhost stage/sql/closing tables 0 -user2 localhost stage/sql/init 0 +user2 localhost stage/sql/Checking permissions 0 +user2 localhost stage/sql/Closing tables 0 +user2 localhost stage/sql/Init 0 +user2 localhost stage/sql/Init for update 0 user2 localhost stage/sql/Opening tables 0 -user3 localhost stage/sql/checking permissions 0 -user3 localhost stage/sql/closing tables 0 -user3 localhost stage/sql/init 0 +user3 localhost stage/sql/Checking permissions 0 +user3 localhost stage/sql/Closing tables 0 +user3 localhost stage/sql/Init 0 +user3 localhost stage/sql/Init for update 0 user3 localhost stage/sql/Opening tables 0 -user4 localhost stage/sql/checking permissions 0 -user4 localhost stage/sql/closing tables 0 -user4 localhost stage/sql/init 0 +user4 localhost stage/sql/Checking permissions 0 +user4 localhost stage/sql/Closing tables 0 +user4 localhost stage/sql/Init 0 +user4 localhost stage/sql/Init for update 0 user4 localhost stage/sql/Opening tables 0 execute dump_stages_user; user event_name count_star @@ -2760,15 +2884,17 @@ execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/checking permissions 0 -stage/sql/closing tables 0 -stage/sql/init 0 +stage/sql/Checking permissions 0 +stage/sql/Closing tables 0 +stage/sql/Init 0 +stage/sql/Init for update 0 stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -2861,21 +2987,25 @@ wait/synch/mutex/sql/LOCK_connection_count 4 wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 0 -user1 localhost stage/sql/closing tables 0 -user1 localhost stage/sql/init 0 +user1 localhost stage/sql/Checking permissions 0 +user1 localhost stage/sql/Closing tables 0 +user1 localhost stage/sql/Init 0 +user1 localhost stage/sql/Init for update 0 user1 localhost stage/sql/Opening tables 0 -user2 localhost stage/sql/checking permissions 0 -user2 localhost stage/sql/closing tables 0 -user2 localhost stage/sql/init 0 +user2 localhost stage/sql/Checking permissions 0 +user2 localhost stage/sql/Closing tables 0 +user2 localhost stage/sql/Init 0 +user2 localhost stage/sql/Init for update 0 user2 localhost stage/sql/Opening tables 0 -user3 localhost stage/sql/checking permissions 0 -user3 localhost stage/sql/closing tables 0 -user3 localhost stage/sql/init 0 +user3 localhost stage/sql/Checking permissions 0 +user3 localhost stage/sql/Closing tables 0 +user3 localhost stage/sql/Init 0 +user3 localhost stage/sql/Init for update 0 user3 localhost stage/sql/Opening tables 0 -user4 localhost stage/sql/checking permissions 0 -user4 localhost stage/sql/closing tables 0 -user4 localhost stage/sql/init 0 +user4 localhost stage/sql/Checking permissions 0 +user4 localhost stage/sql/Closing tables 0 +user4 localhost stage/sql/Init 0 +user4 localhost stage/sql/Init for update 0 user4 localhost stage/sql/Opening tables 0 execute dump_stages_user; user event_name count_star @@ -2883,15 +3013,17 @@ execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/checking permissions 0 -stage/sql/closing tables 0 -stage/sql/init 0 +stage/sql/Checking permissions 0 +stage/sql/Closing tables 0 +stage/sql/Init 0 +stage/sql/Init for update 0 stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -2984,21 +3116,25 @@ wait/synch/mutex/sql/LOCK_connection_count 4 wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 0 -user1 localhost stage/sql/closing tables 0 -user1 localhost stage/sql/init 0 +user1 localhost stage/sql/Checking permissions 0 +user1 localhost stage/sql/Closing tables 0 +user1 localhost stage/sql/Init 0 +user1 localhost stage/sql/Init for update 0 user1 localhost stage/sql/Opening tables 0 -user2 localhost stage/sql/checking permissions 0 -user2 localhost stage/sql/closing tables 0 -user2 localhost stage/sql/init 0 +user2 localhost stage/sql/Checking permissions 0 +user2 localhost stage/sql/Closing tables 0 +user2 localhost stage/sql/Init 0 +user2 localhost stage/sql/Init for update 0 user2 localhost stage/sql/Opening tables 0 -user3 localhost stage/sql/checking permissions 0 -user3 localhost stage/sql/closing tables 0 -user3 localhost stage/sql/init 0 +user3 localhost stage/sql/Checking permissions 0 +user3 localhost stage/sql/Closing tables 0 +user3 localhost stage/sql/Init 0 +user3 localhost stage/sql/Init for update 0 user3 localhost stage/sql/Opening tables 0 -user4 localhost stage/sql/checking permissions 0 -user4 localhost stage/sql/closing tables 0 -user4 localhost stage/sql/init 0 +user4 localhost stage/sql/Checking permissions 0 +user4 localhost stage/sql/Closing tables 0 +user4 localhost stage/sql/Init 0 +user4 localhost stage/sql/Init for update 0 user4 localhost stage/sql/Opening tables 0 execute dump_stages_user; user event_name count_star @@ -3006,15 +3142,17 @@ execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/checking permissions 0 -stage/sql/closing tables 0 -stage/sql/init 0 +stage/sql/Checking permissions 0 +stage/sql/Closing tables 0 +stage/sql/Init 0 +stage/sql/Init for update 0 stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -3107,21 +3245,25 @@ wait/synch/mutex/sql/LOCK_connection_count 4 wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 0 -user1 localhost stage/sql/closing tables 0 -user1 localhost stage/sql/init 0 +user1 localhost stage/sql/Checking permissions 0 +user1 localhost stage/sql/Closing tables 0 +user1 localhost stage/sql/Init 0 +user1 localhost stage/sql/Init for update 0 user1 localhost stage/sql/Opening tables 0 -user2 localhost stage/sql/checking permissions 0 -user2 localhost stage/sql/closing tables 0 -user2 localhost stage/sql/init 0 +user2 localhost stage/sql/Checking permissions 0 +user2 localhost stage/sql/Closing tables 0 +user2 localhost stage/sql/Init 0 +user2 localhost stage/sql/Init for update 0 user2 localhost stage/sql/Opening tables 0 -user3 localhost stage/sql/checking permissions 0 -user3 localhost stage/sql/closing tables 0 -user3 localhost stage/sql/init 0 +user3 localhost stage/sql/Checking permissions 0 +user3 localhost stage/sql/Closing tables 0 +user3 localhost stage/sql/Init 0 +user3 localhost stage/sql/Init for update 0 user3 localhost stage/sql/Opening tables 0 -user4 localhost stage/sql/checking permissions 0 -user4 localhost stage/sql/closing tables 0 -user4 localhost stage/sql/init 0 +user4 localhost stage/sql/Checking permissions 0 +user4 localhost stage/sql/Closing tables 0 +user4 localhost stage/sql/Init 0 +user4 localhost stage/sql/Init for update 0 user4 localhost stage/sql/Opening tables 0 execute dump_stages_user; user event_name count_star @@ -3129,15 +3271,17 @@ execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/checking permissions 0 -stage/sql/closing tables 0 -stage/sql/init 0 +stage/sql/Checking permissions 0 +stage/sql/Closing tables 0 +stage/sql/Init 0 +stage/sql/Init for update 0 stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -3230,21 +3374,25 @@ wait/synch/mutex/sql/LOCK_connection_count 4 wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/checking permissions 0 -user1 localhost stage/sql/closing tables 0 -user1 localhost stage/sql/init 0 +user1 localhost stage/sql/Checking permissions 0 +user1 localhost stage/sql/Closing tables 0 +user1 localhost stage/sql/Init 0 +user1 localhost stage/sql/Init for update 0 user1 localhost stage/sql/Opening tables 0 -user2 localhost stage/sql/checking permissions 0 -user2 localhost stage/sql/closing tables 0 -user2 localhost stage/sql/init 0 +user2 localhost stage/sql/Checking permissions 0 +user2 localhost stage/sql/Closing tables 0 +user2 localhost stage/sql/Init 0 +user2 localhost stage/sql/Init for update 0 user2 localhost stage/sql/Opening tables 0 -user3 localhost stage/sql/checking permissions 0 -user3 localhost stage/sql/closing tables 0 -user3 localhost stage/sql/init 0 +user3 localhost stage/sql/Checking permissions 0 +user3 localhost stage/sql/Closing tables 0 +user3 localhost stage/sql/Init 0 +user3 localhost stage/sql/Init for update 0 user3 localhost stage/sql/Opening tables 0 -user4 localhost stage/sql/checking permissions 0 -user4 localhost stage/sql/closing tables 0 -user4 localhost stage/sql/init 0 +user4 localhost stage/sql/Checking permissions 0 +user4 localhost stage/sql/Closing tables 0 +user4 localhost stage/sql/Init 0 +user4 localhost stage/sql/Init for update 0 user4 localhost stage/sql/Opening tables 0 execute dump_stages_user; user event_name count_star @@ -3252,15 +3400,17 @@ execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/checking permissions 0 -stage/sql/closing tables 0 -stage/sql/init 0 +stage/sql/Checking permissions 0 +stage/sql/Closing tables 0 +stage/sql/Init 0 +stage/sql/Init for update 0 stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -3343,15 +3493,17 @@ execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/checking permissions 0 -stage/sql/closing tables 0 -stage/sql/init 0 +stage/sql/Checking permissions 0 +stage/sql/Closing tables 0 +stage/sql/Init 0 +stage/sql/Init for update 0 stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -3414,15 +3566,17 @@ execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/checking permissions 0 -stage/sql/closing tables 0 -stage/sql/init 0 +stage/sql/Checking permissions 0 +stage/sql/Closing tables 0 +stage/sql/Init 0 +stage/sql/Init for update 0 stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star @@ -3485,15 +3639,17 @@ execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/checking permissions 0 -stage/sql/closing tables 0 -stage/sql/init 0 +stage/sql/Checking permissions 0 +stage/sql/Closing tables 0 +stage/sql/Init 0 +stage/sql/Init for update 0 stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) -stage/sql/checking permissions 12 -stage/sql/closing tables 12 -stage/sql/init 28 +stage/sql/Checking permissions 12 +stage/sql/Closing tables 16 +stage/sql/Init 24 +stage/sql/Init for update 4 stage/sql/Opening tables 12 execute dump_statements_account; user host event_name count_star diff --git a/mysql-test/suite/perfschema/r/nesting.result b/mysql-test/suite/perfschema/r/nesting.result index e08aec94845..78126d93cc7 100644 --- a/mysql-test/suite/perfschema/r/nesting.result +++ b/mysql-test/suite/perfschema/r/nesting.result @@ -107,138 +107,152 @@ and (end_event_id <= @marker_end) ) all_events order by relative_event_id asc; relative_event_id relative_end_event_id event_name comment nesting_event_type relative_nesting_event_id -0 18 statement/sql/select select "MARKER_BEGIN" as marker NULL NULL -1 4 stage/sql/init (stage) STATEMENT 0 +0 20 statement/sql/select select "MARKER_BEGIN" as marker NULL NULL +1 4 stage/sql/Init (stage) STATEMENT 0 2 2 wait/io/socket/sql/client_connection recv STAGE 1 3 3 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 1 4 4 wait/io/file/sql/query_log write STAGE 1 -5 5 stage/sql/checking permissions (stage) STATEMENT 0 +5 5 stage/sql/Checking permissions (stage) STATEMENT 0 6 6 stage/sql/Opening tables (stage) STATEMENT 0 7 7 stage/sql/After opening tables (stage) STATEMENT 0 -8 8 stage/sql/init (stage) STATEMENT 0 -9 9 stage/sql/optimizing (stage) STATEMENT 0 -10 10 stage/sql/executing (stage) STATEMENT 0 -11 11 stage/sql/end (stage) STATEMENT 0 -12 12 stage/sql/query end (stage) STATEMENT 0 -13 13 stage/sql/closing tables (stage) STATEMENT 0 -14 14 stage/sql/freeing items (stage) STATEMENT 0 -15 15 wait/io/socket/sql/client_connection send STATEMENT 0 -16 16 wait/synch/mutex/sql/THD::LOCK_thd_data lock STATEMENT 0 -17 18 stage/sql/cleaning up (stage) STATEMENT 0 -18 18 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 17 -19 19 idle idle NULL NULL -20 38 statement/sql/select select "This is simple statement one" as payload NULL NULL -21 24 stage/sql/init (stage) STATEMENT 20 -22 22 wait/io/socket/sql/client_connection recv STAGE 21 -23 23 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 21 -24 24 wait/io/file/sql/query_log write STAGE 21 -25 25 stage/sql/checking permissions (stage) STATEMENT 20 -26 26 stage/sql/Opening tables (stage) STATEMENT 20 -27 27 stage/sql/After opening tables (stage) STATEMENT 20 -28 28 stage/sql/init (stage) STATEMENT 20 -29 29 stage/sql/optimizing (stage) STATEMENT 20 -30 30 stage/sql/executing (stage) STATEMENT 20 -31 31 stage/sql/end (stage) STATEMENT 20 -32 32 stage/sql/query end (stage) STATEMENT 20 -33 33 stage/sql/closing tables (stage) STATEMENT 20 -34 34 stage/sql/freeing items (stage) STATEMENT 20 -35 35 wait/io/socket/sql/client_connection send STATEMENT 20 -36 36 wait/synch/mutex/sql/THD::LOCK_thd_data lock STATEMENT 20 -37 38 stage/sql/cleaning up (stage) STATEMENT 20 -38 38 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 37 -39 39 idle idle NULL NULL -40 58 statement/sql/select select "This is simple statement two" as payload NULL NULL -41 44 stage/sql/init (stage) STATEMENT 40 -42 42 wait/io/socket/sql/client_connection recv STAGE 41 -43 43 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 41 -44 44 wait/io/file/sql/query_log write STAGE 41 -45 45 stage/sql/checking permissions (stage) STATEMENT 40 -46 46 stage/sql/Opening tables (stage) STATEMENT 40 -47 47 stage/sql/After opening tables (stage) STATEMENT 40 -48 48 stage/sql/init (stage) STATEMENT 40 -49 49 stage/sql/optimizing (stage) STATEMENT 40 -50 50 stage/sql/executing (stage) STATEMENT 40 -51 51 stage/sql/end (stage) STATEMENT 40 -52 52 stage/sql/query end (stage) STATEMENT 40 -53 53 stage/sql/closing tables (stage) STATEMENT 40 -54 54 stage/sql/freeing items (stage) STATEMENT 40 -55 55 wait/io/socket/sql/client_connection send STATEMENT 40 -56 56 wait/synch/mutex/sql/THD::LOCK_thd_data lock STATEMENT 40 -57 58 stage/sql/cleaning up (stage) STATEMENT 40 -58 58 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 57 -59 59 idle idle NULL NULL -60 77 statement/sql/select select "This is the first part of a multi query" as payload; +8 8 stage/sql/Init (stage) STATEMENT 0 +9 9 stage/sql/Optimizing (stage) STATEMENT 0 +10 10 stage/sql/Executing (stage) STATEMENT 0 +11 11 stage/sql/End of update loop (stage) STATEMENT 0 +12 12 stage/sql/Query end (stage) STATEMENT 0 +13 13 stage/sql/Commit (stage) STATEMENT 0 +14 14 stage/sql/Closing tables (stage) STATEMENT 0 +15 15 stage/sql/Starting cleanup (stage) STATEMENT 0 +16 16 stage/sql/Freeing items (stage) STATEMENT 0 +17 17 wait/io/socket/sql/client_connection send STATEMENT 0 +18 18 wait/synch/mutex/sql/THD::LOCK_thd_data lock STATEMENT 0 +19 20 stage/sql/Reset for next command (stage) STATEMENT 0 +20 20 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 19 +21 21 idle idle NULL NULL +22 42 statement/sql/select select "This is simple statement one" as payload NULL NULL +23 26 stage/sql/Init (stage) STATEMENT 22 +24 24 wait/io/socket/sql/client_connection recv STAGE 23 +25 25 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 23 +26 26 wait/io/file/sql/query_log write STAGE 23 +27 27 stage/sql/Checking permissions (stage) STATEMENT 22 +28 28 stage/sql/Opening tables (stage) STATEMENT 22 +29 29 stage/sql/After opening tables (stage) STATEMENT 22 +30 30 stage/sql/Init (stage) STATEMENT 22 +31 31 stage/sql/Optimizing (stage) STATEMENT 22 +32 32 stage/sql/Executing (stage) STATEMENT 22 +33 33 stage/sql/End of update loop (stage) STATEMENT 22 +34 34 stage/sql/Query end (stage) STATEMENT 22 +35 35 stage/sql/Commit (stage) STATEMENT 22 +36 36 stage/sql/Closing tables (stage) STATEMENT 22 +37 37 stage/sql/Starting cleanup (stage) STATEMENT 22 +38 38 stage/sql/Freeing items (stage) STATEMENT 22 +39 39 wait/io/socket/sql/client_connection send STATEMENT 22 +40 40 wait/synch/mutex/sql/THD::LOCK_thd_data lock STATEMENT 22 +41 42 stage/sql/Reset for next command (stage) STATEMENT 22 +42 42 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 41 +43 43 idle idle NULL NULL +44 64 statement/sql/select select "This is simple statement two" as payload NULL NULL +45 48 stage/sql/Init (stage) STATEMENT 44 +46 46 wait/io/socket/sql/client_connection recv STAGE 45 +47 47 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 45 +48 48 wait/io/file/sql/query_log write STAGE 45 +49 49 stage/sql/Checking permissions (stage) STATEMENT 44 +50 50 stage/sql/Opening tables (stage) STATEMENT 44 +51 51 stage/sql/After opening tables (stage) STATEMENT 44 +52 52 stage/sql/Init (stage) STATEMENT 44 +53 53 stage/sql/Optimizing (stage) STATEMENT 44 +54 54 stage/sql/Executing (stage) STATEMENT 44 +55 55 stage/sql/End of update loop (stage) STATEMENT 44 +56 56 stage/sql/Query end (stage) STATEMENT 44 +57 57 stage/sql/Commit (stage) STATEMENT 44 +58 58 stage/sql/Closing tables (stage) STATEMENT 44 +59 59 stage/sql/Starting cleanup (stage) STATEMENT 44 +60 60 stage/sql/Freeing items (stage) STATEMENT 44 +61 61 wait/io/socket/sql/client_connection send STATEMENT 44 +62 62 wait/synch/mutex/sql/THD::LOCK_thd_data lock STATEMENT 44 +63 64 stage/sql/Reset for next command (stage) STATEMENT 44 +64 64 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 63 +65 65 idle idle NULL NULL +66 85 statement/sql/select select "This is the first part of a multi query" as payload; select "And this is the second part of a multi query" as payload; select "With a third part to make things complete" as payload NULL NULL -61 65 stage/sql/init (stage) STATEMENT 60 -62 62 wait/io/socket/sql/client_connection recv STAGE 61 -63 63 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 61 -64 64 wait/io/file/sql/query_log write STAGE 61 -65 65 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 61 -66 66 stage/sql/checking permissions (stage) STATEMENT 60 -67 67 stage/sql/Opening tables (stage) STATEMENT 60 -68 68 stage/sql/After opening tables (stage) STATEMENT 60 -69 69 stage/sql/init (stage) STATEMENT 60 -70 70 stage/sql/optimizing (stage) STATEMENT 60 -71 71 stage/sql/executing (stage) STATEMENT 60 -72 72 stage/sql/end (stage) STATEMENT 60 -73 73 stage/sql/query end (stage) STATEMENT 60 -74 74 stage/sql/closing tables (stage) STATEMENT 60 -75 77 stage/sql/freeing items (stage) STATEMENT 60 -76 76 wait/io/socket/sql/client_connection send STAGE 75 -77 77 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 75 -78 93 statement/sql/select select "And this is the second part of a multi query" as payload; +67 71 stage/sql/Init (stage) STATEMENT 66 +68 68 wait/io/socket/sql/client_connection recv STAGE 67 +69 69 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 67 +70 70 wait/io/file/sql/query_log write STAGE 67 +71 71 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 67 +72 72 stage/sql/Checking permissions (stage) STATEMENT 66 +73 73 stage/sql/Opening tables (stage) STATEMENT 66 +74 74 stage/sql/After opening tables (stage) STATEMENT 66 +75 75 stage/sql/Init (stage) STATEMENT 66 +76 76 stage/sql/Optimizing (stage) STATEMENT 66 +77 77 stage/sql/Executing (stage) STATEMENT 66 +78 78 stage/sql/End of update loop (stage) STATEMENT 66 +79 79 stage/sql/Query end (stage) STATEMENT 66 +80 80 stage/sql/Commit (stage) STATEMENT 66 +81 81 stage/sql/Closing tables (stage) STATEMENT 66 +82 82 stage/sql/Starting cleanup (stage) STATEMENT 66 +83 85 stage/sql/Freeing items (stage) STATEMENT 66 +84 84 wait/io/socket/sql/client_connection send STAGE 83 +85 85 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 83 +86 103 statement/sql/select select "And this is the second part of a multi query" as payload; select "With a third part to make things complete" as payload NULL NULL -79 81 stage/sql/init (stage) STATEMENT 78 -80 80 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 79 -81 81 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 79 -82 82 stage/sql/checking permissions (stage) STATEMENT 78 -83 83 stage/sql/Opening tables (stage) STATEMENT 78 -84 84 stage/sql/After opening tables (stage) STATEMENT 78 -85 85 stage/sql/init (stage) STATEMENT 78 -86 86 stage/sql/optimizing (stage) STATEMENT 78 -87 87 stage/sql/executing (stage) STATEMENT 78 -88 88 stage/sql/end (stage) STATEMENT 78 -89 89 stage/sql/query end (stage) STATEMENT 78 -90 90 stage/sql/closing tables (stage) STATEMENT 78 -91 93 stage/sql/freeing items (stage) STATEMENT 78 -92 92 wait/io/socket/sql/client_connection send STAGE 91 -93 93 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 91 -94 110 statement/sql/select select "With a third part to make things complete" as payload NULL NULL -95 96 stage/sql/init (stage) STATEMENT 94 -96 96 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 95 -97 97 stage/sql/checking permissions (stage) STATEMENT 94 -98 98 stage/sql/Opening tables (stage) STATEMENT 94 -99 99 stage/sql/After opening tables (stage) STATEMENT 94 -100 100 stage/sql/init (stage) STATEMENT 94 -101 101 stage/sql/optimizing (stage) STATEMENT 94 -102 102 stage/sql/executing (stage) STATEMENT 94 -103 103 stage/sql/end (stage) STATEMENT 94 -104 104 stage/sql/query end (stage) STATEMENT 94 -105 105 stage/sql/closing tables (stage) STATEMENT 94 -106 106 stage/sql/freeing items (stage) STATEMENT 94 -107 107 wait/io/socket/sql/client_connection send STATEMENT 94 -108 108 wait/synch/mutex/sql/THD::LOCK_thd_data lock STATEMENT 94 -109 110 stage/sql/cleaning up (stage) STATEMENT 94 -110 110 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 109 -111 111 idle idle NULL NULL -112 130 statement/sql/select select "MARKER_END" as marker NULL NULL -113 116 stage/sql/init (stage) STATEMENT 112 -114 114 wait/io/socket/sql/client_connection recv STAGE 113 -115 115 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 113 -116 116 wait/io/file/sql/query_log write STAGE 113 -117 117 stage/sql/checking permissions (stage) STATEMENT 112 -118 118 stage/sql/Opening tables (stage) STATEMENT 112 -119 119 stage/sql/After opening tables (stage) STATEMENT 112 -120 120 stage/sql/init (stage) STATEMENT 112 -121 121 stage/sql/optimizing (stage) STATEMENT 112 -122 122 stage/sql/executing (stage) STATEMENT 112 -123 123 stage/sql/end (stage) STATEMENT 112 -124 124 stage/sql/query end (stage) STATEMENT 112 -125 125 stage/sql/closing tables (stage) STATEMENT 112 -126 126 stage/sql/freeing items (stage) STATEMENT 112 -127 127 wait/io/socket/sql/client_connection send STATEMENT 112 -128 128 wait/synch/mutex/sql/THD::LOCK_thd_data lock STATEMENT 112 -129 130 stage/sql/cleaning up (stage) STATEMENT 112 -130 130 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 129 +87 89 stage/sql/Init (stage) STATEMENT 86 +88 88 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 87 +89 89 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 87 +90 90 stage/sql/Checking permissions (stage) STATEMENT 86 +91 91 stage/sql/Opening tables (stage) STATEMENT 86 +92 92 stage/sql/After opening tables (stage) STATEMENT 86 +93 93 stage/sql/Init (stage) STATEMENT 86 +94 94 stage/sql/Optimizing (stage) STATEMENT 86 +95 95 stage/sql/Executing (stage) STATEMENT 86 +96 96 stage/sql/End of update loop (stage) STATEMENT 86 +97 97 stage/sql/Query end (stage) STATEMENT 86 +98 98 stage/sql/Commit (stage) STATEMENT 86 +99 99 stage/sql/Closing tables (stage) STATEMENT 86 +100 100 stage/sql/Starting cleanup (stage) STATEMENT 86 +101 103 stage/sql/Freeing items (stage) STATEMENT 86 +102 102 wait/io/socket/sql/client_connection send STAGE 101 +103 103 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 101 +104 122 statement/sql/select select "With a third part to make things complete" as payload NULL NULL +105 106 stage/sql/Init (stage) STATEMENT 104 +106 106 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 105 +107 107 stage/sql/Checking permissions (stage) STATEMENT 104 +108 108 stage/sql/Opening tables (stage) STATEMENT 104 +109 109 stage/sql/After opening tables (stage) STATEMENT 104 +110 110 stage/sql/Init (stage) STATEMENT 104 +111 111 stage/sql/Optimizing (stage) STATEMENT 104 +112 112 stage/sql/Executing (stage) STATEMENT 104 +113 113 stage/sql/End of update loop (stage) STATEMENT 104 +114 114 stage/sql/Query end (stage) STATEMENT 104 +115 115 stage/sql/Commit (stage) STATEMENT 104 +116 116 stage/sql/Closing tables (stage) STATEMENT 104 +117 117 stage/sql/Starting cleanup (stage) STATEMENT 104 +118 118 stage/sql/Freeing items (stage) STATEMENT 104 +119 119 wait/io/socket/sql/client_connection send STATEMENT 104 +120 120 wait/synch/mutex/sql/THD::LOCK_thd_data lock STATEMENT 104 +121 122 stage/sql/Reset for next command (stage) STATEMENT 104 +122 122 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 121 +123 123 idle idle NULL NULL +124 144 statement/sql/select select "MARKER_END" as marker NULL NULL +125 128 stage/sql/Init (stage) STATEMENT 124 +126 126 wait/io/socket/sql/client_connection recv STAGE 125 +127 127 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 125 +128 128 wait/io/file/sql/query_log write STAGE 125 +129 129 stage/sql/Checking permissions (stage) STATEMENT 124 +130 130 stage/sql/Opening tables (stage) STATEMENT 124 +131 131 stage/sql/After opening tables (stage) STATEMENT 124 +132 132 stage/sql/Init (stage) STATEMENT 124 +133 133 stage/sql/Optimizing (stage) STATEMENT 124 +134 134 stage/sql/Executing (stage) STATEMENT 124 +135 135 stage/sql/End of update loop (stage) STATEMENT 124 +136 136 stage/sql/Query end (stage) STATEMENT 124 +137 137 stage/sql/Commit (stage) STATEMENT 124 +138 138 stage/sql/Closing tables (stage) STATEMENT 124 +139 139 stage/sql/Starting cleanup (stage) STATEMENT 124 +140 140 stage/sql/Freeing items (stage) STATEMENT 124 +141 141 wait/io/socket/sql/client_connection send STATEMENT 124 +142 142 wait/synch/mutex/sql/THD::LOCK_thd_data lock STATEMENT 124 +143 144 stage/sql/Reset for next command (stage) STATEMENT 124 +144 144 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 143 disconnect con1; diff --git a/mysql-test/suite/perfschema/r/ortho_iter.result b/mysql-test/suite/perfschema/r/ortho_iter.result index f449aa97b40..299551051c9 100644 --- a/mysql-test/suite/perfschema/r/ortho_iter.result +++ b/mysql-test/suite/perfschema/r/ortho_iter.result @@ -121,7 +121,7 @@ performance_schema_max_rwlock_classes 40 performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 -performance_schema_max_stage_classes 150 +performance_schema_max_stage_classes 160 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/privilege_table_io.result b/mysql-test/suite/perfschema/r/privilege_table_io.result index b1bc1857b52..5443c178502 100644 --- a/mysql-test/suite/perfschema/r/privilege_table_io.result +++ b/mysql-test/suite/perfschema/r/privilege_table_io.result @@ -50,7 +50,7 @@ performance_schema_max_rwlock_classes 40 performance_schema_max_rwlock_instances 5000 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 1000 -performance_schema_max_stage_classes 150 +performance_schema_max_stage_classes 160 performance_schema_max_table_handles 1000 performance_schema_max_table_instances 500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/setup_instruments_defaults.result b/mysql-test/suite/perfschema/r/setup_instruments_defaults.result index b0570d70602..f31bb1a8b7a 100644 --- a/mysql-test/suite/perfschema/r/setup_instruments_defaults.result +++ b/mysql-test/suite/perfschema/r/setup_instruments_defaults.result @@ -10,7 +10,7 @@ WHERE name IN ( AND enabled = 'yes' AND timed = 'no' ORDER BY name; NAME ENABLED TIMED -stage/sql/creating table YES NO +stage/sql/Creating table YES NO wait/synch/mutex/sql/LOCK_plugin YES NO wait/synch/mutex/sql/LOCK_user_conn YES NO SELECT * FROM performance_schema.setup_instruments diff --git a/mysql-test/suite/perfschema/r/sizing_default.result b/mysql-test/suite/perfschema/r/sizing_default.result index 1ca202e821f..07fbf35619b 100644 --- a/mysql-test/suite/perfschema/r/sizing_default.result +++ b/mysql-test/suite/perfschema/r/sizing_default.result @@ -33,7 +33,7 @@ performance_schema_max_rwlock_classes 40 performance_schema_max_rwlock_instances 9102 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 322 -performance_schema_max_stage_classes 150 +performance_schema_max_stage_classes\t160 performance_schema_max_table_handles 4000 performance_schema_max_table_instances 12500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/sizing_high.result b/mysql-test/suite/perfschema/r/sizing_high.result index b633d5fce8d..1cf84a14d22 100644 --- a/mysql-test/suite/perfschema/r/sizing_high.result +++ b/mysql-test/suite/perfschema/r/sizing_high.result @@ -33,7 +33,7 @@ performance_schema_max_rwlock_classes 40 performance_schema_max_rwlock_instances 30800 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 420 -performance_schema_max_stage_classes 150 +performance_schema_max_stage_classes\t160 performance_schema_max_table_handles 800 performance_schema_max_table_instances 12500 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/sizing_low.result b/mysql-test/suite/perfschema/r/sizing_low.result index a698f55aa07..4569ebd7a5e 100644 --- a/mysql-test/suite/perfschema/r/sizing_low.result +++ b/mysql-test/suite/perfschema/r/sizing_low.result @@ -33,7 +33,7 @@ performance_schema_max_rwlock_classes 40 performance_schema_max_rwlock_instances 1612 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 67 -performance_schema_max_stage_classes 150 +performance_schema_max_stage_classes\t160 performance_schema_max_table_handles 112 performance_schema_max_table_instances 445 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/sizing_med.result b/mysql-test/suite/perfschema/r/sizing_med.result index 2eda017467a..24fba02d16b 100644 --- a/mysql-test/suite/perfschema/r/sizing_med.result +++ b/mysql-test/suite/perfschema/r/sizing_med.result @@ -33,7 +33,7 @@ performance_schema_max_rwlock_classes 40 performance_schema_max_rwlock_instances 2222 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances 232 -performance_schema_max_stage_classes 150 +performance_schema_max_stage_classes\t160 performance_schema_max_table_handles 573 performance_schema_max_table_instances 556 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/sizing_off.result b/mysql-test/suite/perfschema/r/sizing_off.result index b4ca7b1b9be..e49a9824f42 100644 --- a/mysql-test/suite/perfschema/r/sizing_off.result +++ b/mysql-test/suite/perfschema/r/sizing_off.result @@ -24,7 +24,7 @@ performance_schema_max_rwlock_classes 40 performance_schema_max_rwlock_instances -1 performance_schema_max_socket_classes 10 performance_schema_max_socket_instances -1 -performance_schema_max_stage_classes 150 +performance_schema_max_stage_classes\t160 performance_schema_max_table_handles -1 performance_schema_max_table_instances -1 performance_schema_max_thread_classes 50 diff --git a/mysql-test/suite/perfschema/r/stage_mdl_function.result b/mysql-test/suite/perfschema/r/stage_mdl_function.result index eb72fa338aa..5f55dd6c28e 100644 --- a/mysql-test/suite/perfschema/r/stage_mdl_function.result +++ b/mysql-test/suite/perfschema/r/stage_mdl_function.result @@ -14,23 +14,23 @@ username event_name sql_text user1 statement/sql/select select test.f1() username event_name nesting_event_type username event_name nesting_event_type -user1 stage/sql/executing STATEMENT -user1 stage/sql/Opening tables STATEMENT -user1 stage/sql/After opening tables STATEMENT -user1 stage/sql/closing tables STATEMENT -user1 stage/sql/end STATEMENT -user1 stage/sql/query end STATEMENT -user1 stage/sql/closing tables STATEMENT +user1 stage/sql/Closing tables STATEMENT +user1 stage/sql/End of update loop STATEMENT +user1 stage/sql/Query end STATEMENT +user1 stage/sql/Commit STATEMENT +user1 stage/sql/Closing tables STATEMENT user1 stage/sql/Unlocking tables STATEMENT -user1 stage/sql/freeing items STATEMENT -user1 stage/sql/cleaning up STATEMENT +user1 stage/sql/Closing tables STATEMENT +user1 stage/sql/Starting cleanup STATEMENT +user1 stage/sql/Freeing items STATEMENT +user1 stage/sql/Reset for next command STATEMENT call dump_one_thread('user2'); username event_name sql_text user2 statement/sql/drop_function drop function test.f1 username event_name nesting_event_type user2 stage/sql/Waiting for stored function metadata lock STATEMENT username event_name nesting_event_type -user2 stage/sql/init STATEMENT +user2 stage/sql/Init STATEMENT connection con1; select f1(); f1() diff --git a/mysql-test/suite/perfschema/r/stage_mdl_global.result b/mysql-test/suite/perfschema/r/stage_mdl_global.result index f82874bef74..7d15b250bd9 100644 --- a/mysql-test/suite/perfschema/r/stage_mdl_global.result +++ b/mysql-test/suite/perfschema/r/stage_mdl_global.result @@ -8,22 +8,24 @@ username event_name sql_text user1 statement/sql/flush flush tables with read lock username event_name nesting_event_type username event_name nesting_event_type -user1 stage/sql/init STATEMENT -user1 stage/sql/init STATEMENT +user1 stage/sql/Init STATEMENT user1 stage/sql/Waiting for query cache lock STATEMENT -user1 stage/sql/init STATEMENT -user1 stage/sql/query end STATEMENT -user1 stage/sql/closing tables STATEMENT -user1 stage/sql/freeing items STATEMENT -user1 stage/sql/cleaning up STATEMENT +user1 stage/sql/Init STATEMENT +user1 stage/sql/Query end STATEMENT +user1 stage/sql/Commit STATEMENT +user1 stage/sql/Closing tables STATEMENT +user1 stage/sql/Commit_implicit STATEMENT +user1 stage/sql/Starting cleanup STATEMENT +user1 stage/sql/Freeing items STATEMENT +user1 stage/sql/Reset for next command STATEMENT call dump_one_thread('user2'); username event_name sql_text user2 statement/sql/insert insert into test.t1 values (1), (2), (3) username event_name nesting_event_type user2 stage/sql/Waiting for global read lock STATEMENT username event_name nesting_event_type -user2 stage/sql/init STATEMENT -user2 stage/sql/checking permissions STATEMENT +user2 stage/sql/Init STATEMENT +user2 stage/sql/Checking permissions STATEMENT user2 stage/sql/Opening tables STATEMENT connection con1; unlock tables; diff --git a/mysql-test/suite/perfschema/r/stage_mdl_procedure.result b/mysql-test/suite/perfschema/r/stage_mdl_procedure.result index 8f7e70bc740..6362f725b88 100644 --- a/mysql-test/suite/perfschema/r/stage_mdl_procedure.result +++ b/mysql-test/suite/perfschema/r/stage_mdl_procedure.result @@ -21,23 +21,23 @@ username event_name sql_text user1 statement/sql/select select test.f1() username event_name nesting_event_type username event_name nesting_event_type -user1 stage/sql/closing tables STATEMENT -user1 stage/sql/Opening tables STATEMENT -user1 stage/sql/After opening tables STATEMENT -user1 stage/sql/closing tables STATEMENT -user1 stage/sql/end STATEMENT -user1 stage/sql/query end STATEMENT -user1 stage/sql/closing tables STATEMENT +user1 stage/sql/Closing tables STATEMENT +user1 stage/sql/End of update loop STATEMENT +user1 stage/sql/Query end STATEMENT +user1 stage/sql/Commit STATEMENT +user1 stage/sql/Closing tables STATEMENT user1 stage/sql/Unlocking tables STATEMENT -user1 stage/sql/freeing items STATEMENT -user1 stage/sql/cleaning up STATEMENT +user1 stage/sql/Closing tables STATEMENT +user1 stage/sql/Starting cleanup STATEMENT +user1 stage/sql/Freeing items STATEMENT +user1 stage/sql/Reset for next command STATEMENT call dump_one_thread('user2'); username event_name sql_text user2 statement/sql/drop_procedure drop procedure test.p1 username event_name nesting_event_type user2 stage/sql/Waiting for stored procedure metadata lock STATEMENT username event_name nesting_event_type -user2 stage/sql/init STATEMENT +user2 stage/sql/Init STATEMENT connection con1; select test.f1(); test.f1() diff --git a/mysql-test/suite/perfschema/r/stage_mdl_table.result b/mysql-test/suite/perfschema/r/stage_mdl_table.result index f7d519bedeb..c703e910891 100644 --- a/mysql-test/suite/perfschema/r/stage_mdl_table.result +++ b/mysql-test/suite/perfschema/r/stage_mdl_table.result @@ -16,30 +16,29 @@ username event_name sql_text user1 statement/sql/select select * from test.t1 for update username event_name nesting_event_type username event_name nesting_event_type -user1 stage/sql/statistics STATEMENT -user1 stage/sql/preparing STATEMENT -user1 stage/sql/executing STATEMENT user1 stage/sql/Sending data STATEMENT -user1 stage/sql/end STATEMENT -user1 stage/sql/query end STATEMENT -user1 stage/sql/closing tables STATEMENT +user1 stage/sql/End of update loop STATEMENT +user1 stage/sql/Query end STATEMENT +user1 stage/sql/Commit STATEMENT +user1 stage/sql/Closing tables STATEMENT user1 stage/sql/Unlocking tables STATEMENT -user1 stage/sql/freeing items STATEMENT -user1 stage/sql/cleaning up STATEMENT +user1 stage/sql/Closing tables STATEMENT +user1 stage/sql/Starting cleanup STATEMENT +user1 stage/sql/Freeing items STATEMENT +user1 stage/sql/Reset for next command STATEMENT call dump_one_thread('user2'); username event_name sql_text user2 statement/sql/alter_table alter table test.t1 add column (b int) username event_name nesting_event_type user2 stage/sql/Waiting for table metadata lock STATEMENT username event_name nesting_event_type -user2 stage/sql/init STATEMENT -user2 stage/sql/checking permissions STATEMENT -user2 stage/sql/checking permissions STATEMENT -user2 stage/sql/init STATEMENT +user2 stage/sql/Init STATEMENT +user2 stage/sql/Checking permissions STATEMENT +user2 stage/sql/Init for update STATEMENT user2 stage/sql/Opening tables STATEMENT user2 stage/sql/After opening tables STATEMENT -user2 stage/sql/setup STATEMENT -user2 stage/sql/creating table STATEMENT +user2 stage/sql/Setup STATEMENT +user2 stage/sql/Creating table STATEMENT user2 stage/sql/After create STATEMENT connection con1; commit; diff --git a/mysql-test/suite/perfschema/r/start_server_disable_idle.result b/mysql-test/suite/perfschema/r/start_server_disable_idle.result index 382824458a0..294c3a72f58 100644 --- a/mysql-test/suite/perfschema/r/start_server_disable_idle.result +++ b/mysql-test/suite/perfschema/r/start_server_disable_idle.result @@ -17,93 +17,6 @@ count(*) > 3 select count(*) from performance_schema.setup_timers; count(*) 4 -select * from performance_schema.accounts; -select * from performance_schema.cond_instances; -select * from performance_schema.events_stages_current; -select * from performance_schema.events_stages_history; -select * from performance_schema.events_stages_history_long; -select * from performance_schema.events_stages_summary_by_account_by_event_name; -select * from performance_schema.events_stages_summary_by_host_by_event_name; -select * from performance_schema.events_stages_summary_by_thread_by_event_name; -select * from performance_schema.events_stages_summary_by_user_by_event_name; -select * from performance_schema.events_stages_summary_global_by_event_name; -select * from performance_schema.events_statements_current; -select * from performance_schema.events_statements_history; -select * from performance_schema.events_statements_history_long; -select * from performance_schema.events_statements_summary_by_account_by_event_name; -select * from performance_schema.events_statements_summary_by_digest; -select * from performance_schema.events_statements_summary_by_host_by_event_name; -select * from performance_schema.events_statements_summary_by_thread_by_event_name; -select * from performance_schema.events_statements_summary_by_user_by_event_name; -select * from performance_schema.events_statements_summary_global_by_event_name; -select * from performance_schema.events_waits_current; -select * from performance_schema.events_waits_history; -select * from performance_schema.events_waits_history_long; -select * from performance_schema.events_waits_summary_by_account_by_event_name; -select * from performance_schema.events_waits_summary_by_host_by_event_name; -select * from performance_schema.events_waits_summary_by_instance; -select * from performance_schema.events_waits_summary_by_thread_by_event_name; -select * from performance_schema.events_waits_summary_by_user_by_event_name; -select * from performance_schema.events_waits_summary_global_by_event_name; -select * from performance_schema.file_instances; -select * from performance_schema.file_summary_by_event_name; -select * from performance_schema.file_summary_by_instance; -select * from performance_schema.host_cache; -select * from performance_schema.hosts; -select * from performance_schema.mutex_instances; -select * from performance_schema.objects_summary_global_by_type; -select * from performance_schema.performance_timers; -select * from performance_schema.rwlock_instances; -select * from performance_schema.session_account_connect_attrs; -select * from performance_schema.session_connect_attrs; -select * from performance_schema.setup_actors; -select * from performance_schema.setup_consumers; -select * from performance_schema.setup_instruments; -select * from performance_schema.setup_objects; -select * from performance_schema.setup_timers; -select * from performance_schema.socket_instances; -select * from performance_schema.socket_summary_by_instance; -select * from performance_schema.socket_summary_by_event_name; -select * from performance_schema.table_io_waits_summary_by_index_usage; -select * from performance_schema.table_io_waits_summary_by_table; -select * from performance_schema.table_lock_waits_summary_by_table; -select * from performance_schema.threads; -select * from performance_schema.users; -show variables where -`Variable_name` != "performance_schema_max_statement_classes" and -`Variable_name` like "performance_schema%"; -Variable_name Value -performance_schema ON -performance_schema_accounts_size 100 -performance_schema_digests_size 200 -performance_schema_events_stages_history_long_size 1000 -performance_schema_events_stages_history_size 10 -performance_schema_events_statements_history_long_size 1000 -performance_schema_events_statements_history_size 10 -performance_schema_events_waits_history_long_size 10000 -performance_schema_events_waits_history_size 10 -performance_schema_hosts_size 100 -performance_schema_max_cond_classes 80 -performance_schema_max_cond_instances 1000 -performance_schema_max_digest_length 1024 -performance_schema_max_file_classes 50 -performance_schema_max_file_handles 32768 -performance_schema_max_file_instances 10000 -performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 5000 -performance_schema_max_rwlock_classes 40 -performance_schema_max_rwlock_instances 5000 -performance_schema_max_socket_classes 10 -performance_schema_max_socket_instances 1000 -performance_schema_max_stage_classes 150 -performance_schema_max_table_handles 1000 -performance_schema_max_table_instances 500 -performance_schema_max_thread_classes 50 -performance_schema_max_thread_instances 200 -performance_schema_session_connect_attrs_size 2048 -performance_schema_setup_actors_size 100 -performance_schema_setup_objects_size 100 -performance_schema_users_size 100 show engine PERFORMANCE_SCHEMA status; show status like "performance_schema%"; select * from performance_schema.setup_instruments diff --git a/mysql-test/suite/perfschema/r/start_server_disable_stages.result b/mysql-test/suite/perfschema/r/start_server_disable_stages.result index 6fae8be810f..6ed2234babe 100644 --- a/mysql-test/suite/perfschema/r/start_server_disable_stages.result +++ b/mysql-test/suite/perfschema/r/start_server_disable_stages.result @@ -17,93 +17,6 @@ count(*) > 3 select count(*) from performance_schema.setup_timers; count(*) 4 -select * from performance_schema.accounts; -select * from performance_schema.cond_instances; -select * from performance_schema.events_stages_current; -select * from performance_schema.events_stages_history; -select * from performance_schema.events_stages_history_long; -select * from performance_schema.events_stages_summary_by_account_by_event_name; -select * from performance_schema.events_stages_summary_by_host_by_event_name; -select * from performance_schema.events_stages_summary_by_thread_by_event_name; -select * from performance_schema.events_stages_summary_by_user_by_event_name; -select * from performance_schema.events_stages_summary_global_by_event_name; -select * from performance_schema.events_statements_current; -select * from performance_schema.events_statements_history; -select * from performance_schema.events_statements_history_long; -select * from performance_schema.events_statements_summary_by_account_by_event_name; -select * from performance_schema.events_statements_summary_by_digest; -select * from performance_schema.events_statements_summary_by_host_by_event_name; -select * from performance_schema.events_statements_summary_by_thread_by_event_name; -select * from performance_schema.events_statements_summary_by_user_by_event_name; -select * from performance_schema.events_statements_summary_global_by_event_name; -select * from performance_schema.events_waits_current; -select * from performance_schema.events_waits_history; -select * from performance_schema.events_waits_history_long; -select * from performance_schema.events_waits_summary_by_account_by_event_name; -select * from performance_schema.events_waits_summary_by_host_by_event_name; -select * from performance_schema.events_waits_summary_by_instance; -select * from performance_schema.events_waits_summary_by_thread_by_event_name; -select * from performance_schema.events_waits_summary_by_user_by_event_name; -select * from performance_schema.events_waits_summary_global_by_event_name; -select * from performance_schema.file_instances; -select * from performance_schema.file_summary_by_event_name; -select * from performance_schema.file_summary_by_instance; -select * from performance_schema.host_cache; -select * from performance_schema.hosts; -select * from performance_schema.mutex_instances; -select * from performance_schema.objects_summary_global_by_type; -select * from performance_schema.performance_timers; -select * from performance_schema.rwlock_instances; -select * from performance_schema.session_account_connect_attrs; -select * from performance_schema.session_connect_attrs; -select * from performance_schema.setup_actors; -select * from performance_schema.setup_consumers; -select * from performance_schema.setup_instruments; -select * from performance_schema.setup_objects; -select * from performance_schema.setup_timers; -select * from performance_schema.socket_instances; -select * from performance_schema.socket_summary_by_instance; -select * from performance_schema.socket_summary_by_event_name; -select * from performance_schema.table_io_waits_summary_by_index_usage; -select * from performance_schema.table_io_waits_summary_by_table; -select * from performance_schema.table_lock_waits_summary_by_table; -select * from performance_schema.threads; -select * from performance_schema.users; -show variables where -`Variable_name` != "performance_schema_max_statement_classes" and -`Variable_name` like "performance_schema%"; -Variable_name Value -performance_schema ON -performance_schema_accounts_size 100 -performance_schema_digests_size 200 -performance_schema_events_stages_history_long_size 1000 -performance_schema_events_stages_history_size 10 -performance_schema_events_statements_history_long_size 1000 -performance_schema_events_statements_history_size 10 -performance_schema_events_waits_history_long_size 10000 -performance_schema_events_waits_history_size 10 -performance_schema_hosts_size 100 -performance_schema_max_cond_classes 80 -performance_schema_max_cond_instances 1000 -performance_schema_max_digest_length 1024 -performance_schema_max_file_classes 50 -performance_schema_max_file_handles 32768 -performance_schema_max_file_instances 10000 -performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 5000 -performance_schema_max_rwlock_classes 40 -performance_schema_max_rwlock_instances 5000 -performance_schema_max_socket_classes 10 -performance_schema_max_socket_instances 1000 -performance_schema_max_stage_classes 150 -performance_schema_max_table_handles 1000 -performance_schema_max_table_instances 500 -performance_schema_max_thread_classes 50 -performance_schema_max_thread_instances 200 -performance_schema_session_connect_attrs_size 2048 -performance_schema_setup_actors_size 100 -performance_schema_setup_objects_size 100 -performance_schema_users_size 100 show engine PERFORMANCE_SCHEMA status; show status like "performance_schema%"; select * from performance_schema.setup_instruments diff --git a/mysql-test/suite/perfschema/r/start_server_disable_statements.result b/mysql-test/suite/perfschema/r/start_server_disable_statements.result index ff9c6f93268..f942f2ee570 100644 --- a/mysql-test/suite/perfschema/r/start_server_disable_statements.result +++ b/mysql-test/suite/perfschema/r/start_server_disable_statements.result @@ -17,93 +17,6 @@ count(*) > 3 select count(*) from performance_schema.setup_timers; count(*) 4 -select * from performance_schema.accounts; -select * from performance_schema.cond_instances; -select * from performance_schema.events_stages_current; -select * from performance_schema.events_stages_history; -select * from performance_schema.events_stages_history_long; -select * from performance_schema.events_stages_summary_by_account_by_event_name; -select * from performance_schema.events_stages_summary_by_host_by_event_name; -select * from performance_schema.events_stages_summary_by_thread_by_event_name; -select * from performance_schema.events_stages_summary_by_user_by_event_name; -select * from performance_schema.events_stages_summary_global_by_event_name; -select * from performance_schema.events_statements_current; -select * from performance_schema.events_statements_history; -select * from performance_schema.events_statements_history_long; -select * from performance_schema.events_statements_summary_by_account_by_event_name; -select * from performance_schema.events_statements_summary_by_digest; -select * from performance_schema.events_statements_summary_by_host_by_event_name; -select * from performance_schema.events_statements_summary_by_thread_by_event_name; -select * from performance_schema.events_statements_summary_by_user_by_event_name; -select * from performance_schema.events_statements_summary_global_by_event_name; -select * from performance_schema.events_waits_current; -select * from performance_schema.events_waits_history; -select * from performance_schema.events_waits_history_long; -select * from performance_schema.events_waits_summary_by_account_by_event_name; -select * from performance_schema.events_waits_summary_by_host_by_event_name; -select * from performance_schema.events_waits_summary_by_instance; -select * from performance_schema.events_waits_summary_by_thread_by_event_name; -select * from performance_schema.events_waits_summary_by_user_by_event_name; -select * from performance_schema.events_waits_summary_global_by_event_name; -select * from performance_schema.file_instances; -select * from performance_schema.file_summary_by_event_name; -select * from performance_schema.file_summary_by_instance; -select * from performance_schema.host_cache; -select * from performance_schema.hosts; -select * from performance_schema.mutex_instances; -select * from performance_schema.objects_summary_global_by_type; -select * from performance_schema.performance_timers; -select * from performance_schema.rwlock_instances; -select * from performance_schema.session_account_connect_attrs; -select * from performance_schema.session_connect_attrs; -select * from performance_schema.setup_actors; -select * from performance_schema.setup_consumers; -select * from performance_schema.setup_instruments; -select * from performance_schema.setup_objects; -select * from performance_schema.setup_timers; -select * from performance_schema.socket_instances; -select * from performance_schema.socket_summary_by_instance; -select * from performance_schema.socket_summary_by_event_name; -select * from performance_schema.table_io_waits_summary_by_index_usage; -select * from performance_schema.table_io_waits_summary_by_table; -select * from performance_schema.table_lock_waits_summary_by_table; -select * from performance_schema.threads; -select * from performance_schema.users; -show variables where -`Variable_name` != "performance_schema_max_statement_classes" and -`Variable_name` like "performance_schema%"; -Variable_name Value -performance_schema ON -performance_schema_accounts_size 100 -performance_schema_digests_size 200 -performance_schema_events_stages_history_long_size 1000 -performance_schema_events_stages_history_size 10 -performance_schema_events_statements_history_long_size 1000 -performance_schema_events_statements_history_size 10 -performance_schema_events_waits_history_long_size 10000 -performance_schema_events_waits_history_size 10 -performance_schema_hosts_size 100 -performance_schema_max_cond_classes 80 -performance_schema_max_cond_instances 1000 -performance_schema_max_digest_length 1024 -performance_schema_max_file_classes 50 -performance_schema_max_file_handles 32768 -performance_schema_max_file_instances 10000 -performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 5000 -performance_schema_max_rwlock_classes 40 -performance_schema_max_rwlock_instances 5000 -performance_schema_max_socket_classes 10 -performance_schema_max_socket_instances 1000 -performance_schema_max_stage_classes 150 -performance_schema_max_table_handles 1000 -performance_schema_max_table_instances 500 -performance_schema_max_thread_classes 50 -performance_schema_max_thread_instances 200 -performance_schema_session_connect_attrs_size 2048 -performance_schema_setup_actors_size 100 -performance_schema_setup_objects_size 100 -performance_schema_users_size 100 show engine PERFORMANCE_SCHEMA status; show status like "performance_schema%"; select * from performance_schema.setup_instruments diff --git a/mysql-test/suite/perfschema/r/start_server_disable_waits.result b/mysql-test/suite/perfschema/r/start_server_disable_waits.result index 38e1f59cd39..fb02ace2ed4 100644 --- a/mysql-test/suite/perfschema/r/start_server_disable_waits.result +++ b/mysql-test/suite/perfschema/r/start_server_disable_waits.result @@ -17,93 +17,6 @@ count(*) > 3 select count(*) from performance_schema.setup_timers; count(*) 4 -select * from performance_schema.accounts; -select * from performance_schema.cond_instances; -select * from performance_schema.events_stages_current; -select * from performance_schema.events_stages_history; -select * from performance_schema.events_stages_history_long; -select * from performance_schema.events_stages_summary_by_account_by_event_name; -select * from performance_schema.events_stages_summary_by_host_by_event_name; -select * from performance_schema.events_stages_summary_by_thread_by_event_name; -select * from performance_schema.events_stages_summary_by_user_by_event_name; -select * from performance_schema.events_stages_summary_global_by_event_name; -select * from performance_schema.events_statements_current; -select * from performance_schema.events_statements_history; -select * from performance_schema.events_statements_history_long; -select * from performance_schema.events_statements_summary_by_account_by_event_name; -select * from performance_schema.events_statements_summary_by_digest; -select * from performance_schema.events_statements_summary_by_host_by_event_name; -select * from performance_schema.events_statements_summary_by_thread_by_event_name; -select * from performance_schema.events_statements_summary_by_user_by_event_name; -select * from performance_schema.events_statements_summary_global_by_event_name; -select * from performance_schema.events_waits_current; -select * from performance_schema.events_waits_history; -select * from performance_schema.events_waits_history_long; -select * from performance_schema.events_waits_summary_by_account_by_event_name; -select * from performance_schema.events_waits_summary_by_host_by_event_name; -select * from performance_schema.events_waits_summary_by_instance; -select * from performance_schema.events_waits_summary_by_thread_by_event_name; -select * from performance_schema.events_waits_summary_by_user_by_event_name; -select * from performance_schema.events_waits_summary_global_by_event_name; -select * from performance_schema.file_instances; -select * from performance_schema.file_summary_by_event_name; -select * from performance_schema.file_summary_by_instance; -select * from performance_schema.host_cache; -select * from performance_schema.hosts; -select * from performance_schema.mutex_instances; -select * from performance_schema.objects_summary_global_by_type; -select * from performance_schema.performance_timers; -select * from performance_schema.rwlock_instances; -select * from performance_schema.session_account_connect_attrs; -select * from performance_schema.session_connect_attrs; -select * from performance_schema.setup_actors; -select * from performance_schema.setup_consumers; -select * from performance_schema.setup_instruments; -select * from performance_schema.setup_objects; -select * from performance_schema.setup_timers; -select * from performance_schema.socket_instances; -select * from performance_schema.socket_summary_by_instance; -select * from performance_schema.socket_summary_by_event_name; -select * from performance_schema.table_io_waits_summary_by_index_usage; -select * from performance_schema.table_io_waits_summary_by_table; -select * from performance_schema.table_lock_waits_summary_by_table; -select * from performance_schema.threads; -select * from performance_schema.users; -show variables where -`Variable_name` != "performance_schema_max_statement_classes" and -`Variable_name` like "performance_schema%"; -Variable_name Value -performance_schema ON -performance_schema_accounts_size 100 -performance_schema_digests_size 200 -performance_schema_events_stages_history_long_size 1000 -performance_schema_events_stages_history_size 10 -performance_schema_events_statements_history_long_size 1000 -performance_schema_events_statements_history_size 10 -performance_schema_events_waits_history_long_size 10000 -performance_schema_events_waits_history_size 10 -performance_schema_hosts_size 100 -performance_schema_max_cond_classes 80 -performance_schema_max_cond_instances 1000 -performance_schema_max_digest_length 1024 -performance_schema_max_file_classes 50 -performance_schema_max_file_handles 32768 -performance_schema_max_file_instances 10000 -performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 5000 -performance_schema_max_rwlock_classes 40 -performance_schema_max_rwlock_instances 5000 -performance_schema_max_socket_classes 10 -performance_schema_max_socket_instances 1000 -performance_schema_max_stage_classes 150 -performance_schema_max_table_handles 1000 -performance_schema_max_table_instances 500 -performance_schema_max_thread_classes 50 -performance_schema_max_thread_instances 200 -performance_schema_session_connect_attrs_size 2048 -performance_schema_setup_actors_size 100 -performance_schema_setup_objects_size 100 -performance_schema_users_size 100 show engine PERFORMANCE_SCHEMA status; show status like "performance_schema%"; select * from performance_schema.setup_instruments diff --git a/mysql-test/suite/perfschema/r/start_server_innodb.result b/mysql-test/suite/perfschema/r/start_server_innodb.result index a270b4a6320..cf210c0935c 100644 --- a/mysql-test/suite/perfschema/r/start_server_innodb.result +++ b/mysql-test/suite/perfschema/r/start_server_innodb.result @@ -17,93 +17,6 @@ count(*) > 3 select count(*) from performance_schema.setup_timers; count(*) 4 -select * from performance_schema.accounts; -select * from performance_schema.cond_instances; -select * from performance_schema.events_stages_current; -select * from performance_schema.events_stages_history; -select * from performance_schema.events_stages_history_long; -select * from performance_schema.events_stages_summary_by_account_by_event_name; -select * from performance_schema.events_stages_summary_by_host_by_event_name; -select * from performance_schema.events_stages_summary_by_thread_by_event_name; -select * from performance_schema.events_stages_summary_by_user_by_event_name; -select * from performance_schema.events_stages_summary_global_by_event_name; -select * from performance_schema.events_statements_current; -select * from performance_schema.events_statements_history; -select * from performance_schema.events_statements_history_long; -select * from performance_schema.events_statements_summary_by_account_by_event_name; -select * from performance_schema.events_statements_summary_by_digest; -select * from performance_schema.events_statements_summary_by_host_by_event_name; -select * from performance_schema.events_statements_summary_by_thread_by_event_name; -select * from performance_schema.events_statements_summary_by_user_by_event_name; -select * from performance_schema.events_statements_summary_global_by_event_name; -select * from performance_schema.events_waits_current; -select * from performance_schema.events_waits_history; -select * from performance_schema.events_waits_history_long; -select * from performance_schema.events_waits_summary_by_account_by_event_name; -select * from performance_schema.events_waits_summary_by_host_by_event_name; -select * from performance_schema.events_waits_summary_by_instance; -select * from performance_schema.events_waits_summary_by_thread_by_event_name; -select * from performance_schema.events_waits_summary_by_user_by_event_name; -select * from performance_schema.events_waits_summary_global_by_event_name; -select * from performance_schema.file_instances; -select * from performance_schema.file_summary_by_event_name; -select * from performance_schema.file_summary_by_instance; -select * from performance_schema.host_cache; -select * from performance_schema.hosts; -select * from performance_schema.mutex_instances; -select * from performance_schema.objects_summary_global_by_type; -select * from performance_schema.performance_timers; -select * from performance_schema.rwlock_instances; -select * from performance_schema.session_account_connect_attrs; -select * from performance_schema.session_connect_attrs; -select * from performance_schema.setup_actors; -select * from performance_schema.setup_consumers; -select * from performance_schema.setup_instruments; -select * from performance_schema.setup_objects; -select * from performance_schema.setup_timers; -select * from performance_schema.socket_instances; -select * from performance_schema.socket_summary_by_instance; -select * from performance_schema.socket_summary_by_event_name; -select * from performance_schema.table_io_waits_summary_by_index_usage; -select * from performance_schema.table_io_waits_summary_by_table; -select * from performance_schema.table_lock_waits_summary_by_table; -select * from performance_schema.threads; -select * from performance_schema.users; -show variables where -`Variable_name` != "performance_schema_max_statement_classes" and -`Variable_name` like "performance_schema%"; -Variable_name Value -performance_schema ON -performance_schema_accounts_size 100 -performance_schema_digests_size 200 -performance_schema_events_stages_history_long_size 1000 -performance_schema_events_stages_history_size 10 -performance_schema_events_statements_history_long_size 1000 -performance_schema_events_statements_history_size 10 -performance_schema_events_waits_history_long_size 10000 -performance_schema_events_waits_history_size 10 -performance_schema_hosts_size 100 -performance_schema_max_cond_classes 80 -performance_schema_max_cond_instances 1000 -performance_schema_max_digest_length 1024 -performance_schema_max_file_classes 50 -performance_schema_max_file_handles 32768 -performance_schema_max_file_instances 10000 -performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 5000 -performance_schema_max_rwlock_classes 40 -performance_schema_max_rwlock_instances 5000 -performance_schema_max_socket_classes 10 -performance_schema_max_socket_instances 1000 -performance_schema_max_stage_classes 150 -performance_schema_max_table_handles 1000 -performance_schema_max_table_instances 500 -performance_schema_max_thread_classes 50 -performance_schema_max_thread_instances 200 -performance_schema_session_connect_attrs_size 2048 -performance_schema_setup_actors_size 100 -performance_schema_setup_objects_size 100 -performance_schema_users_size 100 show engine PERFORMANCE_SCHEMA status; show status like "performance_schema%"; show status like "performance_schema%"; diff --git a/mysql-test/suite/perfschema/r/start_server_no_account.result b/mysql-test/suite/perfschema/r/start_server_no_account.result index 05d67d88a8b..c02b75e5c33 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_account.result +++ b/mysql-test/suite/perfschema/r/start_server_no_account.result @@ -17,93 +17,6 @@ count(*) > 3 select count(*) from performance_schema.setup_timers; count(*) 4 -select * from performance_schema.accounts; -select * from performance_schema.cond_instances; -select * from performance_schema.events_stages_current; -select * from performance_schema.events_stages_history; -select * from performance_schema.events_stages_history_long; -select * from performance_schema.events_stages_summary_by_account_by_event_name; -select * from performance_schema.events_stages_summary_by_host_by_event_name; -select * from performance_schema.events_stages_summary_by_thread_by_event_name; -select * from performance_schema.events_stages_summary_by_user_by_event_name; -select * from performance_schema.events_stages_summary_global_by_event_name; -select * from performance_schema.events_statements_current; -select * from performance_schema.events_statements_history; -select * from performance_schema.events_statements_history_long; -select * from performance_schema.events_statements_summary_by_account_by_event_name; -select * from performance_schema.events_statements_summary_by_digest; -select * from performance_schema.events_statements_summary_by_host_by_event_name; -select * from performance_schema.events_statements_summary_by_thread_by_event_name; -select * from performance_schema.events_statements_summary_by_user_by_event_name; -select * from performance_schema.events_statements_summary_global_by_event_name; -select * from performance_schema.events_waits_current; -select * from performance_schema.events_waits_history; -select * from performance_schema.events_waits_history_long; -select * from performance_schema.events_waits_summary_by_account_by_event_name; -select * from performance_schema.events_waits_summary_by_host_by_event_name; -select * from performance_schema.events_waits_summary_by_instance; -select * from performance_schema.events_waits_summary_by_thread_by_event_name; -select * from performance_schema.events_waits_summary_by_user_by_event_name; -select * from performance_schema.events_waits_summary_global_by_event_name; -select * from performance_schema.file_instances; -select * from performance_schema.file_summary_by_event_name; -select * from performance_schema.file_summary_by_instance; -select * from performance_schema.host_cache; -select * from performance_schema.hosts; -select * from performance_schema.mutex_instances; -select * from performance_schema.objects_summary_global_by_type; -select * from performance_schema.performance_timers; -select * from performance_schema.rwlock_instances; -select * from performance_schema.session_account_connect_attrs; -select * from performance_schema.session_connect_attrs; -select * from performance_schema.setup_actors; -select * from performance_schema.setup_consumers; -select * from performance_schema.setup_instruments; -select * from performance_schema.setup_objects; -select * from performance_schema.setup_timers; -select * from performance_schema.socket_instances; -select * from performance_schema.socket_summary_by_instance; -select * from performance_schema.socket_summary_by_event_name; -select * from performance_schema.table_io_waits_summary_by_index_usage; -select * from performance_schema.table_io_waits_summary_by_table; -select * from performance_schema.table_lock_waits_summary_by_table; -select * from performance_schema.threads; -select * from performance_schema.users; -show variables where -`Variable_name` != "performance_schema_max_statement_classes" and -`Variable_name` like "performance_schema%"; -Variable_name Value -performance_schema ON -performance_schema_accounts_size 0 -performance_schema_digests_size 200 -performance_schema_events_stages_history_long_size 1000 -performance_schema_events_stages_history_size 10 -performance_schema_events_statements_history_long_size 1000 -performance_schema_events_statements_history_size 10 -performance_schema_events_waits_history_long_size 10000 -performance_schema_events_waits_history_size 10 -performance_schema_hosts_size 100 -performance_schema_max_cond_classes 80 -performance_schema_max_cond_instances 1000 -performance_schema_max_digest_length 1024 -performance_schema_max_file_classes 50 -performance_schema_max_file_handles 32768 -performance_schema_max_file_instances 10000 -performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 5000 -performance_schema_max_rwlock_classes 40 -performance_schema_max_rwlock_instances 5000 -performance_schema_max_socket_classes 10 -performance_schema_max_socket_instances 1000 -performance_schema_max_stage_classes 150 -performance_schema_max_table_handles 1000 -performance_schema_max_table_instances 500 -performance_schema_max_thread_classes 50 -performance_schema_max_thread_instances 200 -performance_schema_session_connect_attrs_size 2048 -performance_schema_setup_actors_size 100 -performance_schema_setup_objects_size 100 -performance_schema_users_size 100 show engine PERFORMANCE_SCHEMA status; show status like "performance_schema%"; show variables like "performance_schema_accounts_size"; diff --git a/mysql-test/suite/perfschema/r/start_server_no_cond_class.result b/mysql-test/suite/perfschema/r/start_server_no_cond_class.result index 574c8d4173b..a3e16b4be8d 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_cond_class.result +++ b/mysql-test/suite/perfschema/r/start_server_no_cond_class.result @@ -17,93 +17,6 @@ count(*) > 3 select count(*) from performance_schema.setup_timers; count(*) 4 -select * from performance_schema.accounts; -select * from performance_schema.cond_instances; -select * from performance_schema.events_stages_current; -select * from performance_schema.events_stages_history; -select * from performance_schema.events_stages_history_long; -select * from performance_schema.events_stages_summary_by_account_by_event_name; -select * from performance_schema.events_stages_summary_by_host_by_event_name; -select * from performance_schema.events_stages_summary_by_thread_by_event_name; -select * from performance_schema.events_stages_summary_by_user_by_event_name; -select * from performance_schema.events_stages_summary_global_by_event_name; -select * from performance_schema.events_statements_current; -select * from performance_schema.events_statements_history; -select * from performance_schema.events_statements_history_long; -select * from performance_schema.events_statements_summary_by_account_by_event_name; -select * from performance_schema.events_statements_summary_by_digest; -select * from performance_schema.events_statements_summary_by_host_by_event_name; -select * from performance_schema.events_statements_summary_by_thread_by_event_name; -select * from performance_schema.events_statements_summary_by_user_by_event_name; -select * from performance_schema.events_statements_summary_global_by_event_name; -select * from performance_schema.events_waits_current; -select * from performance_schema.events_waits_history; -select * from performance_schema.events_waits_history_long; -select * from performance_schema.events_waits_summary_by_account_by_event_name; -select * from performance_schema.events_waits_summary_by_host_by_event_name; -select * from performance_schema.events_waits_summary_by_instance; -select * from performance_schema.events_waits_summary_by_thread_by_event_name; -select * from performance_schema.events_waits_summary_by_user_by_event_name; -select * from performance_schema.events_waits_summary_global_by_event_name; -select * from performance_schema.file_instances; -select * from performance_schema.file_summary_by_event_name; -select * from performance_schema.file_summary_by_instance; -select * from performance_schema.host_cache; -select * from performance_schema.hosts; -select * from performance_schema.mutex_instances; -select * from performance_schema.objects_summary_global_by_type; -select * from performance_schema.performance_timers; -select * from performance_schema.rwlock_instances; -select * from performance_schema.session_account_connect_attrs; -select * from performance_schema.session_connect_attrs; -select * from performance_schema.setup_actors; -select * from performance_schema.setup_consumers; -select * from performance_schema.setup_instruments; -select * from performance_schema.setup_objects; -select * from performance_schema.setup_timers; -select * from performance_schema.socket_instances; -select * from performance_schema.socket_summary_by_instance; -select * from performance_schema.socket_summary_by_event_name; -select * from performance_schema.table_io_waits_summary_by_index_usage; -select * from performance_schema.table_io_waits_summary_by_table; -select * from performance_schema.table_lock_waits_summary_by_table; -select * from performance_schema.threads; -select * from performance_schema.users; -show variables where -`Variable_name` != "performance_schema_max_statement_classes" and -`Variable_name` like "performance_schema%"; -Variable_name Value -performance_schema ON -performance_schema_accounts_size 100 -performance_schema_digests_size 200 -performance_schema_events_stages_history_long_size 1000 -performance_schema_events_stages_history_size 10 -performance_schema_events_statements_history_long_size 1000 -performance_schema_events_statements_history_size 10 -performance_schema_events_waits_history_long_size 10000 -performance_schema_events_waits_history_size 10 -performance_schema_hosts_size 100 -performance_schema_max_cond_classes 0 -performance_schema_max_cond_instances 1000 -performance_schema_max_digest_length 1024 -performance_schema_max_file_classes 50 -performance_schema_max_file_handles 32768 -performance_schema_max_file_instances 10000 -performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 5000 -performance_schema_max_rwlock_classes 40 -performance_schema_max_rwlock_instances 5000 -performance_schema_max_socket_classes 10 -performance_schema_max_socket_instances 1000 -performance_schema_max_stage_classes 150 -performance_schema_max_table_handles 1000 -performance_schema_max_table_instances 500 -performance_schema_max_thread_classes 50 -performance_schema_max_thread_instances 200 -performance_schema_session_connect_attrs_size 2048 -performance_schema_setup_actors_size 100 -performance_schema_setup_objects_size 100 -performance_schema_users_size 100 show engine PERFORMANCE_SCHEMA status; show status like "performance_schema%"; show variables like "performance_schema_max_cond_classes"; diff --git a/mysql-test/suite/perfschema/r/start_server_no_cond_inst.result b/mysql-test/suite/perfschema/r/start_server_no_cond_inst.result index ea5c7a69125..df5373ead87 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_cond_inst.result +++ b/mysql-test/suite/perfschema/r/start_server_no_cond_inst.result @@ -17,93 +17,6 @@ count(*) > 3 select count(*) from performance_schema.setup_timers; count(*) 4 -select * from performance_schema.accounts; -select * from performance_schema.cond_instances; -select * from performance_schema.events_stages_current; -select * from performance_schema.events_stages_history; -select * from performance_schema.events_stages_history_long; -select * from performance_schema.events_stages_summary_by_account_by_event_name; -select * from performance_schema.events_stages_summary_by_host_by_event_name; -select * from performance_schema.events_stages_summary_by_thread_by_event_name; -select * from performance_schema.events_stages_summary_by_user_by_event_name; -select * from performance_schema.events_stages_summary_global_by_event_name; -select * from performance_schema.events_statements_current; -select * from performance_schema.events_statements_history; -select * from performance_schema.events_statements_history_long; -select * from performance_schema.events_statements_summary_by_account_by_event_name; -select * from performance_schema.events_statements_summary_by_digest; -select * from performance_schema.events_statements_summary_by_host_by_event_name; -select * from performance_schema.events_statements_summary_by_thread_by_event_name; -select * from performance_schema.events_statements_summary_by_user_by_event_name; -select * from performance_schema.events_statements_summary_global_by_event_name; -select * from performance_schema.events_waits_current; -select * from performance_schema.events_waits_history; -select * from performance_schema.events_waits_history_long; -select * from performance_schema.events_waits_summary_by_account_by_event_name; -select * from performance_schema.events_waits_summary_by_host_by_event_name; -select * from performance_schema.events_waits_summary_by_instance; -select * from performance_schema.events_waits_summary_by_thread_by_event_name; -select * from performance_schema.events_waits_summary_by_user_by_event_name; -select * from performance_schema.events_waits_summary_global_by_event_name; -select * from performance_schema.file_instances; -select * from performance_schema.file_summary_by_event_name; -select * from performance_schema.file_summary_by_instance; -select * from performance_schema.host_cache; -select * from performance_schema.hosts; -select * from performance_schema.mutex_instances; -select * from performance_schema.objects_summary_global_by_type; -select * from performance_schema.performance_timers; -select * from performance_schema.rwlock_instances; -select * from performance_schema.session_account_connect_attrs; -select * from performance_schema.session_connect_attrs; -select * from performance_schema.setup_actors; -select * from performance_schema.setup_consumers; -select * from performance_schema.setup_instruments; -select * from performance_schema.setup_objects; -select * from performance_schema.setup_timers; -select * from performance_schema.socket_instances; -select * from performance_schema.socket_summary_by_instance; -select * from performance_schema.socket_summary_by_event_name; -select * from performance_schema.table_io_waits_summary_by_index_usage; -select * from performance_schema.table_io_waits_summary_by_table; -select * from performance_schema.table_lock_waits_summary_by_table; -select * from performance_schema.threads; -select * from performance_schema.users; -show variables where -`Variable_name` != "performance_schema_max_statement_classes" and -`Variable_name` like "performance_schema%"; -Variable_name Value -performance_schema ON -performance_schema_accounts_size 100 -performance_schema_digests_size 200 -performance_schema_events_stages_history_long_size 1000 -performance_schema_events_stages_history_size 10 -performance_schema_events_statements_history_long_size 1000 -performance_schema_events_statements_history_size 10 -performance_schema_events_waits_history_long_size 10000 -performance_schema_events_waits_history_size 10 -performance_schema_hosts_size 100 -performance_schema_max_cond_classes 80 -performance_schema_max_cond_instances 0 -performance_schema_max_digest_length 1024 -performance_schema_max_file_classes 50 -performance_schema_max_file_handles 32768 -performance_schema_max_file_instances 10000 -performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 5000 -performance_schema_max_rwlock_classes 40 -performance_schema_max_rwlock_instances 5000 -performance_schema_max_socket_classes 10 -performance_schema_max_socket_instances 1000 -performance_schema_max_stage_classes 150 -performance_schema_max_table_handles 1000 -performance_schema_max_table_instances 500 -performance_schema_max_thread_classes 50 -performance_schema_max_thread_instances 200 -performance_schema_session_connect_attrs_size 2048 -performance_schema_setup_actors_size 100 -performance_schema_setup_objects_size 100 -performance_schema_users_size 100 show engine PERFORMANCE_SCHEMA status; show status like "performance_schema%"; show variables like "performance_schema_max_cond_classes"; diff --git a/mysql-test/suite/perfschema/r/start_server_no_file_class.result b/mysql-test/suite/perfschema/r/start_server_no_file_class.result index 0f93054bfd4..5e6da344a70 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_file_class.result +++ b/mysql-test/suite/perfschema/r/start_server_no_file_class.result @@ -17,93 +17,6 @@ count(*) > 3 select count(*) from performance_schema.setup_timers; count(*) 4 -select * from performance_schema.accounts; -select * from performance_schema.cond_instances; -select * from performance_schema.events_stages_current; -select * from performance_schema.events_stages_history; -select * from performance_schema.events_stages_history_long; -select * from performance_schema.events_stages_summary_by_account_by_event_name; -select * from performance_schema.events_stages_summary_by_host_by_event_name; -select * from performance_schema.events_stages_summary_by_thread_by_event_name; -select * from performance_schema.events_stages_summary_by_user_by_event_name; -select * from performance_schema.events_stages_summary_global_by_event_name; -select * from performance_schema.events_statements_current; -select * from performance_schema.events_statements_history; -select * from performance_schema.events_statements_history_long; -select * from performance_schema.events_statements_summary_by_account_by_event_name; -select * from performance_schema.events_statements_summary_by_digest; -select * from performance_schema.events_statements_summary_by_host_by_event_name; -select * from performance_schema.events_statements_summary_by_thread_by_event_name; -select * from performance_schema.events_statements_summary_by_user_by_event_name; -select * from performance_schema.events_statements_summary_global_by_event_name; -select * from performance_schema.events_waits_current; -select * from performance_schema.events_waits_history; -select * from performance_schema.events_waits_history_long; -select * from performance_schema.events_waits_summary_by_account_by_event_name; -select * from performance_schema.events_waits_summary_by_host_by_event_name; -select * from performance_schema.events_waits_summary_by_instance; -select * from performance_schema.events_waits_summary_by_thread_by_event_name; -select * from performance_schema.events_waits_summary_by_user_by_event_name; -select * from performance_schema.events_waits_summary_global_by_event_name; -select * from performance_schema.file_instances; -select * from performance_schema.file_summary_by_event_name; -select * from performance_schema.file_summary_by_instance; -select * from performance_schema.host_cache; -select * from performance_schema.hosts; -select * from performance_schema.mutex_instances; -select * from performance_schema.objects_summary_global_by_type; -select * from performance_schema.performance_timers; -select * from performance_schema.rwlock_instances; -select * from performance_schema.session_account_connect_attrs; -select * from performance_schema.session_connect_attrs; -select * from performance_schema.setup_actors; -select * from performance_schema.setup_consumers; -select * from performance_schema.setup_instruments; -select * from performance_schema.setup_objects; -select * from performance_schema.setup_timers; -select * from performance_schema.socket_instances; -select * from performance_schema.socket_summary_by_instance; -select * from performance_schema.socket_summary_by_event_name; -select * from performance_schema.table_io_waits_summary_by_index_usage; -select * from performance_schema.table_io_waits_summary_by_table; -select * from performance_schema.table_lock_waits_summary_by_table; -select * from performance_schema.threads; -select * from performance_schema.users; -show variables where -`Variable_name` != "performance_schema_max_statement_classes" and -`Variable_name` like "performance_schema%"; -Variable_name Value -performance_schema ON -performance_schema_accounts_size 100 -performance_schema_digests_size 200 -performance_schema_events_stages_history_long_size 1000 -performance_schema_events_stages_history_size 10 -performance_schema_events_statements_history_long_size 1000 -performance_schema_events_statements_history_size 10 -performance_schema_events_waits_history_long_size 10000 -performance_schema_events_waits_history_size 10 -performance_schema_hosts_size 100 -performance_schema_max_cond_classes 80 -performance_schema_max_cond_instances 1000 -performance_schema_max_digest_length 1024 -performance_schema_max_file_classes 0 -performance_schema_max_file_handles 32768 -performance_schema_max_file_instances 10000 -performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 5000 -performance_schema_max_rwlock_classes 40 -performance_schema_max_rwlock_instances 5000 -performance_schema_max_socket_classes 10 -performance_schema_max_socket_instances 1000 -performance_schema_max_stage_classes 150 -performance_schema_max_table_handles 1000 -performance_schema_max_table_instances 500 -performance_schema_max_thread_classes 50 -performance_schema_max_thread_instances 200 -performance_schema_session_connect_attrs_size 2048 -performance_schema_setup_actors_size 100 -performance_schema_setup_objects_size 100 -performance_schema_users_size 100 show engine PERFORMANCE_SCHEMA status; show status like "performance_schema%"; show variables like "performance_schema_max_file_classes"; diff --git a/mysql-test/suite/perfschema/r/start_server_no_file_inst.result b/mysql-test/suite/perfschema/r/start_server_no_file_inst.result index 71004d68f5e..33dce305ef3 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_file_inst.result +++ b/mysql-test/suite/perfschema/r/start_server_no_file_inst.result @@ -17,93 +17,6 @@ count(*) > 3 select count(*) from performance_schema.setup_timers; count(*) 4 -select * from performance_schema.accounts; -select * from performance_schema.cond_instances; -select * from performance_schema.events_stages_current; -select * from performance_schema.events_stages_history; -select * from performance_schema.events_stages_history_long; -select * from performance_schema.events_stages_summary_by_account_by_event_name; -select * from performance_schema.events_stages_summary_by_host_by_event_name; -select * from performance_schema.events_stages_summary_by_thread_by_event_name; -select * from performance_schema.events_stages_summary_by_user_by_event_name; -select * from performance_schema.events_stages_summary_global_by_event_name; -select * from performance_schema.events_statements_current; -select * from performance_schema.events_statements_history; -select * from performance_schema.events_statements_history_long; -select * from performance_schema.events_statements_summary_by_account_by_event_name; -select * from performance_schema.events_statements_summary_by_digest; -select * from performance_schema.events_statements_summary_by_host_by_event_name; -select * from performance_schema.events_statements_summary_by_thread_by_event_name; -select * from performance_schema.events_statements_summary_by_user_by_event_name; -select * from performance_schema.events_statements_summary_global_by_event_name; -select * from performance_schema.events_waits_current; -select * from performance_schema.events_waits_history; -select * from performance_schema.events_waits_history_long; -select * from performance_schema.events_waits_summary_by_account_by_event_name; -select * from performance_schema.events_waits_summary_by_host_by_event_name; -select * from performance_schema.events_waits_summary_by_instance; -select * from performance_schema.events_waits_summary_by_thread_by_event_name; -select * from performance_schema.events_waits_summary_by_user_by_event_name; -select * from performance_schema.events_waits_summary_global_by_event_name; -select * from performance_schema.file_instances; -select * from performance_schema.file_summary_by_event_name; -select * from performance_schema.file_summary_by_instance; -select * from performance_schema.host_cache; -select * from performance_schema.hosts; -select * from performance_schema.mutex_instances; -select * from performance_schema.objects_summary_global_by_type; -select * from performance_schema.performance_timers; -select * from performance_schema.rwlock_instances; -select * from performance_schema.session_account_connect_attrs; -select * from performance_schema.session_connect_attrs; -select * from performance_schema.setup_actors; -select * from performance_schema.setup_consumers; -select * from performance_schema.setup_instruments; -select * from performance_schema.setup_objects; -select * from performance_schema.setup_timers; -select * from performance_schema.socket_instances; -select * from performance_schema.socket_summary_by_instance; -select * from performance_schema.socket_summary_by_event_name; -select * from performance_schema.table_io_waits_summary_by_index_usage; -select * from performance_schema.table_io_waits_summary_by_table; -select * from performance_schema.table_lock_waits_summary_by_table; -select * from performance_schema.threads; -select * from performance_schema.users; -show variables where -`Variable_name` != "performance_schema_max_statement_classes" and -`Variable_name` like "performance_schema%"; -Variable_name Value -performance_schema ON -performance_schema_accounts_size 100 -performance_schema_digests_size 200 -performance_schema_events_stages_history_long_size 1000 -performance_schema_events_stages_history_size 10 -performance_schema_events_statements_history_long_size 1000 -performance_schema_events_statements_history_size 10 -performance_schema_events_waits_history_long_size 10000 -performance_schema_events_waits_history_size 10 -performance_schema_hosts_size 100 -performance_schema_max_cond_classes 80 -performance_schema_max_cond_instances 1000 -performance_schema_max_digest_length 1024 -performance_schema_max_file_classes 50 -performance_schema_max_file_handles 32768 -performance_schema_max_file_instances 0 -performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 5000 -performance_schema_max_rwlock_classes 40 -performance_schema_max_rwlock_instances 5000 -performance_schema_max_socket_classes 10 -performance_schema_max_socket_instances 1000 -performance_schema_max_stage_classes 150 -performance_schema_max_table_handles 1000 -performance_schema_max_table_instances 500 -performance_schema_max_thread_classes 50 -performance_schema_max_thread_instances 200 -performance_schema_session_connect_attrs_size 2048 -performance_schema_setup_actors_size 100 -performance_schema_setup_objects_size 100 -performance_schema_users_size 100 show engine PERFORMANCE_SCHEMA status; show status like "performance_schema%"; show variables like "performance_schema_max_file_classes"; diff --git a/mysql-test/suite/perfschema/r/start_server_no_host.result b/mysql-test/suite/perfschema/r/start_server_no_host.result index 329f74a4fff..a4f362b256f 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_host.result +++ b/mysql-test/suite/perfschema/r/start_server_no_host.result @@ -17,93 +17,6 @@ count(*) > 3 select count(*) from performance_schema.setup_timers; count(*) 4 -select * from performance_schema.accounts; -select * from performance_schema.cond_instances; -select * from performance_schema.events_stages_current; -select * from performance_schema.events_stages_history; -select * from performance_schema.events_stages_history_long; -select * from performance_schema.events_stages_summary_by_account_by_event_name; -select * from performance_schema.events_stages_summary_by_host_by_event_name; -select * from performance_schema.events_stages_summary_by_thread_by_event_name; -select * from performance_schema.events_stages_summary_by_user_by_event_name; -select * from performance_schema.events_stages_summary_global_by_event_name; -select * from performance_schema.events_statements_current; -select * from performance_schema.events_statements_history; -select * from performance_schema.events_statements_history_long; -select * from performance_schema.events_statements_summary_by_account_by_event_name; -select * from performance_schema.events_statements_summary_by_digest; -select * from performance_schema.events_statements_summary_by_host_by_event_name; -select * from performance_schema.events_statements_summary_by_thread_by_event_name; -select * from performance_schema.events_statements_summary_by_user_by_event_name; -select * from performance_schema.events_statements_summary_global_by_event_name; -select * from performance_schema.events_waits_current; -select * from performance_schema.events_waits_history; -select * from performance_schema.events_waits_history_long; -select * from performance_schema.events_waits_summary_by_account_by_event_name; -select * from performance_schema.events_waits_summary_by_host_by_event_name; -select * from performance_schema.events_waits_summary_by_instance; -select * from performance_schema.events_waits_summary_by_thread_by_event_name; -select * from performance_schema.events_waits_summary_by_user_by_event_name; -select * from performance_schema.events_waits_summary_global_by_event_name; -select * from performance_schema.file_instances; -select * from performance_schema.file_summary_by_event_name; -select * from performance_schema.file_summary_by_instance; -select * from performance_schema.host_cache; -select * from performance_schema.hosts; -select * from performance_schema.mutex_instances; -select * from performance_schema.objects_summary_global_by_type; -select * from performance_schema.performance_timers; -select * from performance_schema.rwlock_instances; -select * from performance_schema.session_account_connect_attrs; -select * from performance_schema.session_connect_attrs; -select * from performance_schema.setup_actors; -select * from performance_schema.setup_consumers; -select * from performance_schema.setup_instruments; -select * from performance_schema.setup_objects; -select * from performance_schema.setup_timers; -select * from performance_schema.socket_instances; -select * from performance_schema.socket_summary_by_instance; -select * from performance_schema.socket_summary_by_event_name; -select * from performance_schema.table_io_waits_summary_by_index_usage; -select * from performance_schema.table_io_waits_summary_by_table; -select * from performance_schema.table_lock_waits_summary_by_table; -select * from performance_schema.threads; -select * from performance_schema.users; -show variables where -`Variable_name` != "performance_schema_max_statement_classes" and -`Variable_name` like "performance_schema%"; -Variable_name Value -performance_schema ON -performance_schema_accounts_size 100 -performance_schema_digests_size 200 -performance_schema_events_stages_history_long_size 1000 -performance_schema_events_stages_history_size 10 -performance_schema_events_statements_history_long_size 1000 -performance_schema_events_statements_history_size 10 -performance_schema_events_waits_history_long_size 10000 -performance_schema_events_waits_history_size 10 -performance_schema_hosts_size 0 -performance_schema_max_cond_classes 80 -performance_schema_max_cond_instances 1000 -performance_schema_max_digest_length 1024 -performance_schema_max_file_classes 50 -performance_schema_max_file_handles 32768 -performance_schema_max_file_instances 10000 -performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 5000 -performance_schema_max_rwlock_classes 40 -performance_schema_max_rwlock_instances 5000 -performance_schema_max_socket_classes 10 -performance_schema_max_socket_instances 1000 -performance_schema_max_stage_classes 150 -performance_schema_max_table_handles 1000 -performance_schema_max_table_instances 500 -performance_schema_max_thread_classes 50 -performance_schema_max_thread_instances 200 -performance_schema_session_connect_attrs_size 2048 -performance_schema_setup_actors_size 100 -performance_schema_setup_objects_size 100 -performance_schema_users_size 100 show engine PERFORMANCE_SCHEMA status; show status like "performance_schema%"; show variables like "performance_schema_hosts_size"; diff --git a/mysql-test/suite/perfschema/r/start_server_no_mutex_class.result b/mysql-test/suite/perfschema/r/start_server_no_mutex_class.result index cda2719cc37..9fadcc581c7 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_mutex_class.result +++ b/mysql-test/suite/perfschema/r/start_server_no_mutex_class.result @@ -17,93 +17,6 @@ count(*) > 3 select count(*) from performance_schema.setup_timers; count(*) 4 -select * from performance_schema.accounts; -select * from performance_schema.cond_instances; -select * from performance_schema.events_stages_current; -select * from performance_schema.events_stages_history; -select * from performance_schema.events_stages_history_long; -select * from performance_schema.events_stages_summary_by_account_by_event_name; -select * from performance_schema.events_stages_summary_by_host_by_event_name; -select * from performance_schema.events_stages_summary_by_thread_by_event_name; -select * from performance_schema.events_stages_summary_by_user_by_event_name; -select * from performance_schema.events_stages_summary_global_by_event_name; -select * from performance_schema.events_statements_current; -select * from performance_schema.events_statements_history; -select * from performance_schema.events_statements_history_long; -select * from performance_schema.events_statements_summary_by_account_by_event_name; -select * from performance_schema.events_statements_summary_by_digest; -select * from performance_schema.events_statements_summary_by_host_by_event_name; -select * from performance_schema.events_statements_summary_by_thread_by_event_name; -select * from performance_schema.events_statements_summary_by_user_by_event_name; -select * from performance_schema.events_statements_summary_global_by_event_name; -select * from performance_schema.events_waits_current; -select * from performance_schema.events_waits_history; -select * from performance_schema.events_waits_history_long; -select * from performance_schema.events_waits_summary_by_account_by_event_name; -select * from performance_schema.events_waits_summary_by_host_by_event_name; -select * from performance_schema.events_waits_summary_by_instance; -select * from performance_schema.events_waits_summary_by_thread_by_event_name; -select * from performance_schema.events_waits_summary_by_user_by_event_name; -select * from performance_schema.events_waits_summary_global_by_event_name; -select * from performance_schema.file_instances; -select * from performance_schema.file_summary_by_event_name; -select * from performance_schema.file_summary_by_instance; -select * from performance_schema.host_cache; -select * from performance_schema.hosts; -select * from performance_schema.mutex_instances; -select * from performance_schema.objects_summary_global_by_type; -select * from performance_schema.performance_timers; -select * from performance_schema.rwlock_instances; -select * from performance_schema.session_account_connect_attrs; -select * from performance_schema.session_connect_attrs; -select * from performance_schema.setup_actors; -select * from performance_schema.setup_consumers; -select * from performance_schema.setup_instruments; -select * from performance_schema.setup_objects; -select * from performance_schema.setup_timers; -select * from performance_schema.socket_instances; -select * from performance_schema.socket_summary_by_instance; -select * from performance_schema.socket_summary_by_event_name; -select * from performance_schema.table_io_waits_summary_by_index_usage; -select * from performance_schema.table_io_waits_summary_by_table; -select * from performance_schema.table_lock_waits_summary_by_table; -select * from performance_schema.threads; -select * from performance_schema.users; -show variables where -`Variable_name` != "performance_schema_max_statement_classes" and -`Variable_name` like "performance_schema%"; -Variable_name Value -performance_schema ON -performance_schema_accounts_size 100 -performance_schema_digests_size 200 -performance_schema_events_stages_history_long_size 1000 -performance_schema_events_stages_history_size 10 -performance_schema_events_statements_history_long_size 1000 -performance_schema_events_statements_history_size 10 -performance_schema_events_waits_history_long_size 10000 -performance_schema_events_waits_history_size 10 -performance_schema_hosts_size 100 -performance_schema_max_cond_classes 80 -performance_schema_max_cond_instances 1000 -performance_schema_max_digest_length 1024 -performance_schema_max_file_classes 50 -performance_schema_max_file_handles 32768 -performance_schema_max_file_instances 10000 -performance_schema_max_mutex_classes 0 -performance_schema_max_mutex_instances 5000 -performance_schema_max_rwlock_classes 40 -performance_schema_max_rwlock_instances 5000 -performance_schema_max_socket_classes 10 -performance_schema_max_socket_instances 1000 -performance_schema_max_stage_classes 150 -performance_schema_max_table_handles 1000 -performance_schema_max_table_instances 500 -performance_schema_max_thread_classes 50 -performance_schema_max_thread_instances 200 -performance_schema_session_connect_attrs_size 2048 -performance_schema_setup_actors_size 100 -performance_schema_setup_objects_size 100 -performance_schema_users_size 100 show engine PERFORMANCE_SCHEMA status; show status like "performance_schema%"; show variables like "performance_schema_max_mutex_classes"; diff --git a/mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result b/mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result index 0ea5fe44521..c443a4e58db 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result +++ b/mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result @@ -17,93 +17,6 @@ count(*) > 3 select count(*) from performance_schema.setup_timers; count(*) 4 -select * from performance_schema.accounts; -select * from performance_schema.cond_instances; -select * from performance_schema.events_stages_current; -select * from performance_schema.events_stages_history; -select * from performance_schema.events_stages_history_long; -select * from performance_schema.events_stages_summary_by_account_by_event_name; -select * from performance_schema.events_stages_summary_by_host_by_event_name; -select * from performance_schema.events_stages_summary_by_thread_by_event_name; -select * from performance_schema.events_stages_summary_by_user_by_event_name; -select * from performance_schema.events_stages_summary_global_by_event_name; -select * from performance_schema.events_statements_current; -select * from performance_schema.events_statements_history; -select * from performance_schema.events_statements_history_long; -select * from performance_schema.events_statements_summary_by_account_by_event_name; -select * from performance_schema.events_statements_summary_by_digest; -select * from performance_schema.events_statements_summary_by_host_by_event_name; -select * from performance_schema.events_statements_summary_by_thread_by_event_name; -select * from performance_schema.events_statements_summary_by_user_by_event_name; -select * from performance_schema.events_statements_summary_global_by_event_name; -select * from performance_schema.events_waits_current; -select * from performance_schema.events_waits_history; -select * from performance_schema.events_waits_history_long; -select * from performance_schema.events_waits_summary_by_account_by_event_name; -select * from performance_schema.events_waits_summary_by_host_by_event_name; -select * from performance_schema.events_waits_summary_by_instance; -select * from performance_schema.events_waits_summary_by_thread_by_event_name; -select * from performance_schema.events_waits_summary_by_user_by_event_name; -select * from performance_schema.events_waits_summary_global_by_event_name; -select * from performance_schema.file_instances; -select * from performance_schema.file_summary_by_event_name; -select * from performance_schema.file_summary_by_instance; -select * from performance_schema.host_cache; -select * from performance_schema.hosts; -select * from performance_schema.mutex_instances; -select * from performance_schema.objects_summary_global_by_type; -select * from performance_schema.performance_timers; -select * from performance_schema.rwlock_instances; -select * from performance_schema.session_account_connect_attrs; -select * from performance_schema.session_connect_attrs; -select * from performance_schema.setup_actors; -select * from performance_schema.setup_consumers; -select * from performance_schema.setup_instruments; -select * from performance_schema.setup_objects; -select * from performance_schema.setup_timers; -select * from performance_schema.socket_instances; -select * from performance_schema.socket_summary_by_instance; -select * from performance_schema.socket_summary_by_event_name; -select * from performance_schema.table_io_waits_summary_by_index_usage; -select * from performance_schema.table_io_waits_summary_by_table; -select * from performance_schema.table_lock_waits_summary_by_table; -select * from performance_schema.threads; -select * from performance_schema.users; -show variables where -`Variable_name` != "performance_schema_max_statement_classes" and -`Variable_name` like "performance_schema%"; -Variable_name Value -performance_schema ON -performance_schema_accounts_size 100 -performance_schema_digests_size 200 -performance_schema_events_stages_history_long_size 1000 -performance_schema_events_stages_history_size 10 -performance_schema_events_statements_history_long_size 1000 -performance_schema_events_statements_history_size 10 -performance_schema_events_waits_history_long_size 10000 -performance_schema_events_waits_history_size 10 -performance_schema_hosts_size 100 -performance_schema_max_cond_classes 80 -performance_schema_max_cond_instances 1000 -performance_schema_max_digest_length 1024 -performance_schema_max_file_classes 50 -performance_schema_max_file_handles 32768 -performance_schema_max_file_instances 10000 -performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 0 -performance_schema_max_rwlock_classes 40 -performance_schema_max_rwlock_instances 5000 -performance_schema_max_socket_classes 10 -performance_schema_max_socket_instances 1000 -performance_schema_max_stage_classes 150 -performance_schema_max_table_handles 1000 -performance_schema_max_table_instances 500 -performance_schema_max_thread_classes 50 -performance_schema_max_thread_instances 200 -performance_schema_session_connect_attrs_size 2048 -performance_schema_setup_actors_size 100 -performance_schema_setup_objects_size 100 -performance_schema_users_size 100 show engine PERFORMANCE_SCHEMA status; show status like "performance_schema%"; show variables like "performance_schema_max_mutex_classes"; diff --git a/mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result b/mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result index 29a17e6a3ac..c3939ced060 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result +++ b/mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result @@ -17,93 +17,6 @@ count(*) > 3 select count(*) from performance_schema.setup_timers; count(*) 4 -select * from performance_schema.accounts; -select * from performance_schema.cond_instances; -select * from performance_schema.events_stages_current; -select * from performance_schema.events_stages_history; -select * from performance_schema.events_stages_history_long; -select * from performance_schema.events_stages_summary_by_account_by_event_name; -select * from performance_schema.events_stages_summary_by_host_by_event_name; -select * from performance_schema.events_stages_summary_by_thread_by_event_name; -select * from performance_schema.events_stages_summary_by_user_by_event_name; -select * from performance_schema.events_stages_summary_global_by_event_name; -select * from performance_schema.events_statements_current; -select * from performance_schema.events_statements_history; -select * from performance_schema.events_statements_history_long; -select * from performance_schema.events_statements_summary_by_account_by_event_name; -select * from performance_schema.events_statements_summary_by_digest; -select * from performance_schema.events_statements_summary_by_host_by_event_name; -select * from performance_schema.events_statements_summary_by_thread_by_event_name; -select * from performance_schema.events_statements_summary_by_user_by_event_name; -select * from performance_schema.events_statements_summary_global_by_event_name; -select * from performance_schema.events_waits_current; -select * from performance_schema.events_waits_history; -select * from performance_schema.events_waits_history_long; -select * from performance_schema.events_waits_summary_by_account_by_event_name; -select * from performance_schema.events_waits_summary_by_host_by_event_name; -select * from performance_schema.events_waits_summary_by_instance; -select * from performance_schema.events_waits_summary_by_thread_by_event_name; -select * from performance_schema.events_waits_summary_by_user_by_event_name; -select * from performance_schema.events_waits_summary_global_by_event_name; -select * from performance_schema.file_instances; -select * from performance_schema.file_summary_by_event_name; -select * from performance_schema.file_summary_by_instance; -select * from performance_schema.host_cache; -select * from performance_schema.hosts; -select * from performance_schema.mutex_instances; -select * from performance_schema.objects_summary_global_by_type; -select * from performance_schema.performance_timers; -select * from performance_schema.rwlock_instances; -select * from performance_schema.session_account_connect_attrs; -select * from performance_schema.session_connect_attrs; -select * from performance_schema.setup_actors; -select * from performance_schema.setup_consumers; -select * from performance_schema.setup_instruments; -select * from performance_schema.setup_objects; -select * from performance_schema.setup_timers; -select * from performance_schema.socket_instances; -select * from performance_schema.socket_summary_by_instance; -select * from performance_schema.socket_summary_by_event_name; -select * from performance_schema.table_io_waits_summary_by_index_usage; -select * from performance_schema.table_io_waits_summary_by_table; -select * from performance_schema.table_lock_waits_summary_by_table; -select * from performance_schema.threads; -select * from performance_schema.users; -show variables where -`Variable_name` != "performance_schema_max_statement_classes" and -`Variable_name` like "performance_schema%"; -Variable_name Value -performance_schema ON -performance_schema_accounts_size 100 -performance_schema_digests_size 200 -performance_schema_events_stages_history_long_size 1000 -performance_schema_events_stages_history_size 10 -performance_schema_events_statements_history_long_size 1000 -performance_schema_events_statements_history_size 10 -performance_schema_events_waits_history_long_size 10000 -performance_schema_events_waits_history_size 10 -performance_schema_hosts_size 100 -performance_schema_max_cond_classes 80 -performance_schema_max_cond_instances 1000 -performance_schema_max_digest_length 1024 -performance_schema_max_file_classes 50 -performance_schema_max_file_handles 32768 -performance_schema_max_file_instances 10000 -performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 5000 -performance_schema_max_rwlock_classes 0 -performance_schema_max_rwlock_instances 5000 -performance_schema_max_socket_classes 10 -performance_schema_max_socket_instances 1000 -performance_schema_max_stage_classes 150 -performance_schema_max_table_handles 1000 -performance_schema_max_table_instances 500 -performance_schema_max_thread_classes 50 -performance_schema_max_thread_instances 200 -performance_schema_session_connect_attrs_size 2048 -performance_schema_setup_actors_size 100 -performance_schema_setup_objects_size 100 -performance_schema_users_size 100 show engine PERFORMANCE_SCHEMA status; show status like "performance_schema%"; show variables like "performance_schema_max_rwlock_classes"; diff --git a/mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result b/mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result index 8b214077f37..7892c6ba753 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result +++ b/mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result @@ -17,93 +17,6 @@ count(*) > 3 select count(*) from performance_schema.setup_timers; count(*) 4 -select * from performance_schema.accounts; -select * from performance_schema.cond_instances; -select * from performance_schema.events_stages_current; -select * from performance_schema.events_stages_history; -select * from performance_schema.events_stages_history_long; -select * from performance_schema.events_stages_summary_by_account_by_event_name; -select * from performance_schema.events_stages_summary_by_host_by_event_name; -select * from performance_schema.events_stages_summary_by_thread_by_event_name; -select * from performance_schema.events_stages_summary_by_user_by_event_name; -select * from performance_schema.events_stages_summary_global_by_event_name; -select * from performance_schema.events_statements_current; -select * from performance_schema.events_statements_history; -select * from performance_schema.events_statements_history_long; -select * from performance_schema.events_statements_summary_by_account_by_event_name; -select * from performance_schema.events_statements_summary_by_digest; -select * from performance_schema.events_statements_summary_by_host_by_event_name; -select * from performance_schema.events_statements_summary_by_thread_by_event_name; -select * from performance_schema.events_statements_summary_by_user_by_event_name; -select * from performance_schema.events_statements_summary_global_by_event_name; -select * from performance_schema.events_waits_current; -select * from performance_schema.events_waits_history; -select * from performance_schema.events_waits_history_long; -select * from performance_schema.events_waits_summary_by_account_by_event_name; -select * from performance_schema.events_waits_summary_by_host_by_event_name; -select * from performance_schema.events_waits_summary_by_instance; -select * from performance_schema.events_waits_summary_by_thread_by_event_name; -select * from performance_schema.events_waits_summary_by_user_by_event_name; -select * from performance_schema.events_waits_summary_global_by_event_name; -select * from performance_schema.file_instances; -select * from performance_schema.file_summary_by_event_name; -select * from performance_schema.file_summary_by_instance; -select * from performance_schema.host_cache; -select * from performance_schema.hosts; -select * from performance_schema.mutex_instances; -select * from performance_schema.objects_summary_global_by_type; -select * from performance_schema.performance_timers; -select * from performance_schema.rwlock_instances; -select * from performance_schema.session_account_connect_attrs; -select * from performance_schema.session_connect_attrs; -select * from performance_schema.setup_actors; -select * from performance_schema.setup_consumers; -select * from performance_schema.setup_instruments; -select * from performance_schema.setup_objects; -select * from performance_schema.setup_timers; -select * from performance_schema.socket_instances; -select * from performance_schema.socket_summary_by_instance; -select * from performance_schema.socket_summary_by_event_name; -select * from performance_schema.table_io_waits_summary_by_index_usage; -select * from performance_schema.table_io_waits_summary_by_table; -select * from performance_schema.table_lock_waits_summary_by_table; -select * from performance_schema.threads; -select * from performance_schema.users; -show variables where -`Variable_name` != "performance_schema_max_statement_classes" and -`Variable_name` like "performance_schema%"; -Variable_name Value -performance_schema ON -performance_schema_accounts_size 100 -performance_schema_digests_size 200 -performance_schema_events_stages_history_long_size 1000 -performance_schema_events_stages_history_size 10 -performance_schema_events_statements_history_long_size 1000 -performance_schema_events_statements_history_size 10 -performance_schema_events_waits_history_long_size 10000 -performance_schema_events_waits_history_size 10 -performance_schema_hosts_size 100 -performance_schema_max_cond_classes 80 -performance_schema_max_cond_instances 1000 -performance_schema_max_digest_length 1024 -performance_schema_max_file_classes 50 -performance_schema_max_file_handles 32768 -performance_schema_max_file_instances 10000 -performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 5000 -performance_schema_max_rwlock_classes 40 -performance_schema_max_rwlock_instances 0 -performance_schema_max_socket_classes 10 -performance_schema_max_socket_instances 1000 -performance_schema_max_stage_classes 150 -performance_schema_max_table_handles 1000 -performance_schema_max_table_instances 500 -performance_schema_max_thread_classes 50 -performance_schema_max_thread_instances 200 -performance_schema_session_connect_attrs_size 2048 -performance_schema_setup_actors_size 100 -performance_schema_setup_objects_size 100 -performance_schema_users_size 100 show engine PERFORMANCE_SCHEMA status; show status like "performance_schema%"; show variables like "performance_schema_max_rwlock_classes"; diff --git a/mysql-test/suite/perfschema/r/start_server_no_setup_actors.result b/mysql-test/suite/perfschema/r/start_server_no_setup_actors.result index 3a0588d616d..24b0ee16685 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_setup_actors.result +++ b/mysql-test/suite/perfschema/r/start_server_no_setup_actors.result @@ -17,93 +17,6 @@ count(*) > 3 select count(*) from performance_schema.setup_timers; count(*) 4 -select * from performance_schema.accounts; -select * from performance_schema.cond_instances; -select * from performance_schema.events_stages_current; -select * from performance_schema.events_stages_history; -select * from performance_schema.events_stages_history_long; -select * from performance_schema.events_stages_summary_by_account_by_event_name; -select * from performance_schema.events_stages_summary_by_host_by_event_name; -select * from performance_schema.events_stages_summary_by_thread_by_event_name; -select * from performance_schema.events_stages_summary_by_user_by_event_name; -select * from performance_schema.events_stages_summary_global_by_event_name; -select * from performance_schema.events_statements_current; -select * from performance_schema.events_statements_history; -select * from performance_schema.events_statements_history_long; -select * from performance_schema.events_statements_summary_by_account_by_event_name; -select * from performance_schema.events_statements_summary_by_digest; -select * from performance_schema.events_statements_summary_by_host_by_event_name; -select * from performance_schema.events_statements_summary_by_thread_by_event_name; -select * from performance_schema.events_statements_summary_by_user_by_event_name; -select * from performance_schema.events_statements_summary_global_by_event_name; -select * from performance_schema.events_waits_current; -select * from performance_schema.events_waits_history; -select * from performance_schema.events_waits_history_long; -select * from performance_schema.events_waits_summary_by_account_by_event_name; -select * from performance_schema.events_waits_summary_by_host_by_event_name; -select * from performance_schema.events_waits_summary_by_instance; -select * from performance_schema.events_waits_summary_by_thread_by_event_name; -select * from performance_schema.events_waits_summary_by_user_by_event_name; -select * from performance_schema.events_waits_summary_global_by_event_name; -select * from performance_schema.file_instances; -select * from performance_schema.file_summary_by_event_name; -select * from performance_schema.file_summary_by_instance; -select * from performance_schema.host_cache; -select * from performance_schema.hosts; -select * from performance_schema.mutex_instances; -select * from performance_schema.objects_summary_global_by_type; -select * from performance_schema.performance_timers; -select * from performance_schema.rwlock_instances; -select * from performance_schema.session_account_connect_attrs; -select * from performance_schema.session_connect_attrs; -select * from performance_schema.setup_actors; -select * from performance_schema.setup_consumers; -select * from performance_schema.setup_instruments; -select * from performance_schema.setup_objects; -select * from performance_schema.setup_timers; -select * from performance_schema.socket_instances; -select * from performance_schema.socket_summary_by_instance; -select * from performance_schema.socket_summary_by_event_name; -select * from performance_schema.table_io_waits_summary_by_index_usage; -select * from performance_schema.table_io_waits_summary_by_table; -select * from performance_schema.table_lock_waits_summary_by_table; -select * from performance_schema.threads; -select * from performance_schema.users; -show variables where -`Variable_name` != "performance_schema_max_statement_classes" and -`Variable_name` like "performance_schema%"; -Variable_name Value -performance_schema ON -performance_schema_accounts_size 100 -performance_schema_digests_size 200 -performance_schema_events_stages_history_long_size 1000 -performance_schema_events_stages_history_size 10 -performance_schema_events_statements_history_long_size 1000 -performance_schema_events_statements_history_size 10 -performance_schema_events_waits_history_long_size 10000 -performance_schema_events_waits_history_size 10 -performance_schema_hosts_size 100 -performance_schema_max_cond_classes 80 -performance_schema_max_cond_instances 1000 -performance_schema_max_digest_length 1024 -performance_schema_max_file_classes 50 -performance_schema_max_file_handles 32768 -performance_schema_max_file_instances 10000 -performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 5000 -performance_schema_max_rwlock_classes 40 -performance_schema_max_rwlock_instances 5000 -performance_schema_max_socket_classes 10 -performance_schema_max_socket_instances 1000 -performance_schema_max_stage_classes 150 -performance_schema_max_table_handles 1000 -performance_schema_max_table_instances 500 -performance_schema_max_thread_classes 50 -performance_schema_max_thread_instances 200 -performance_schema_session_connect_attrs_size 2048 -performance_schema_setup_actors_size 0 -performance_schema_setup_objects_size 100 -performance_schema_users_size 100 show engine PERFORMANCE_SCHEMA status; show status like "performance_schema%"; show variables like "performance_schema_setup_actors_size"; diff --git a/mysql-test/suite/perfschema/r/start_server_no_setup_objects.result b/mysql-test/suite/perfschema/r/start_server_no_setup_objects.result index 89763379b99..630284c69be 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_setup_objects.result +++ b/mysql-test/suite/perfschema/r/start_server_no_setup_objects.result @@ -17,93 +17,6 @@ count(*) > 3 select count(*) from performance_schema.setup_timers; count(*) 4 -select * from performance_schema.accounts; -select * from performance_schema.cond_instances; -select * from performance_schema.events_stages_current; -select * from performance_schema.events_stages_history; -select * from performance_schema.events_stages_history_long; -select * from performance_schema.events_stages_summary_by_account_by_event_name; -select * from performance_schema.events_stages_summary_by_host_by_event_name; -select * from performance_schema.events_stages_summary_by_thread_by_event_name; -select * from performance_schema.events_stages_summary_by_user_by_event_name; -select * from performance_schema.events_stages_summary_global_by_event_name; -select * from performance_schema.events_statements_current; -select * from performance_schema.events_statements_history; -select * from performance_schema.events_statements_history_long; -select * from performance_schema.events_statements_summary_by_account_by_event_name; -select * from performance_schema.events_statements_summary_by_digest; -select * from performance_schema.events_statements_summary_by_host_by_event_name; -select * from performance_schema.events_statements_summary_by_thread_by_event_name; -select * from performance_schema.events_statements_summary_by_user_by_event_name; -select * from performance_schema.events_statements_summary_global_by_event_name; -select * from performance_schema.events_waits_current; -select * from performance_schema.events_waits_history; -select * from performance_schema.events_waits_history_long; -select * from performance_schema.events_waits_summary_by_account_by_event_name; -select * from performance_schema.events_waits_summary_by_host_by_event_name; -select * from performance_schema.events_waits_summary_by_instance; -select * from performance_schema.events_waits_summary_by_thread_by_event_name; -select * from performance_schema.events_waits_summary_by_user_by_event_name; -select * from performance_schema.events_waits_summary_global_by_event_name; -select * from performance_schema.file_instances; -select * from performance_schema.file_summary_by_event_name; -select * from performance_schema.file_summary_by_instance; -select * from performance_schema.host_cache; -select * from performance_schema.hosts; -select * from performance_schema.mutex_instances; -select * from performance_schema.objects_summary_global_by_type; -select * from performance_schema.performance_timers; -select * from performance_schema.rwlock_instances; -select * from performance_schema.session_account_connect_attrs; -select * from performance_schema.session_connect_attrs; -select * from performance_schema.setup_actors; -select * from performance_schema.setup_consumers; -select * from performance_schema.setup_instruments; -select * from performance_schema.setup_objects; -select * from performance_schema.setup_timers; -select * from performance_schema.socket_instances; -select * from performance_schema.socket_summary_by_instance; -select * from performance_schema.socket_summary_by_event_name; -select * from performance_schema.table_io_waits_summary_by_index_usage; -select * from performance_schema.table_io_waits_summary_by_table; -select * from performance_schema.table_lock_waits_summary_by_table; -select * from performance_schema.threads; -select * from performance_schema.users; -show variables where -`Variable_name` != "performance_schema_max_statement_classes" and -`Variable_name` like "performance_schema%"; -Variable_name Value -performance_schema ON -performance_schema_accounts_size 100 -performance_schema_digests_size 200 -performance_schema_events_stages_history_long_size 1000 -performance_schema_events_stages_history_size 10 -performance_schema_events_statements_history_long_size 1000 -performance_schema_events_statements_history_size 10 -performance_schema_events_waits_history_long_size 10000 -performance_schema_events_waits_history_size 10 -performance_schema_hosts_size 100 -performance_schema_max_cond_classes 80 -performance_schema_max_cond_instances 1000 -performance_schema_max_digest_length 1024 -performance_schema_max_file_classes 50 -performance_schema_max_file_handles 32768 -performance_schema_max_file_instances 10000 -performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 5000 -performance_schema_max_rwlock_classes 40 -performance_schema_max_rwlock_instances 5000 -performance_schema_max_socket_classes 10 -performance_schema_max_socket_instances 1000 -performance_schema_max_stage_classes 150 -performance_schema_max_table_handles 1000 -performance_schema_max_table_instances 500 -performance_schema_max_thread_classes 50 -performance_schema_max_thread_instances 200 -performance_schema_session_connect_attrs_size 2048 -performance_schema_setup_actors_size 100 -performance_schema_setup_objects_size 0 -performance_schema_users_size 100 show engine PERFORMANCE_SCHEMA status; show status like "performance_schema%"; show variables like "performance_schema_setup_objects_size"; diff --git a/mysql-test/suite/perfschema/r/start_server_no_socket_class.result b/mysql-test/suite/perfschema/r/start_server_no_socket_class.result index 0b14c6caf15..45e353a1372 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_socket_class.result +++ b/mysql-test/suite/perfschema/r/start_server_no_socket_class.result @@ -17,93 +17,6 @@ count(*) > 3 select count(*) from performance_schema.setup_timers; count(*) 4 -select * from performance_schema.accounts; -select * from performance_schema.cond_instances; -select * from performance_schema.events_stages_current; -select * from performance_schema.events_stages_history; -select * from performance_schema.events_stages_history_long; -select * from performance_schema.events_stages_summary_by_account_by_event_name; -select * from performance_schema.events_stages_summary_by_host_by_event_name; -select * from performance_schema.events_stages_summary_by_thread_by_event_name; -select * from performance_schema.events_stages_summary_by_user_by_event_name; -select * from performance_schema.events_stages_summary_global_by_event_name; -select * from performance_schema.events_statements_current; -select * from performance_schema.events_statements_history; -select * from performance_schema.events_statements_history_long; -select * from performance_schema.events_statements_summary_by_account_by_event_name; -select * from performance_schema.events_statements_summary_by_digest; -select * from performance_schema.events_statements_summary_by_host_by_event_name; -select * from performance_schema.events_statements_summary_by_thread_by_event_name; -select * from performance_schema.events_statements_summary_by_user_by_event_name; -select * from performance_schema.events_statements_summary_global_by_event_name; -select * from performance_schema.events_waits_current; -select * from performance_schema.events_waits_history; -select * from performance_schema.events_waits_history_long; -select * from performance_schema.events_waits_summary_by_account_by_event_name; -select * from performance_schema.events_waits_summary_by_host_by_event_name; -select * from performance_schema.events_waits_summary_by_instance; -select * from performance_schema.events_waits_summary_by_thread_by_event_name; -select * from performance_schema.events_waits_summary_by_user_by_event_name; -select * from performance_schema.events_waits_summary_global_by_event_name; -select * from performance_schema.file_instances; -select * from performance_schema.file_summary_by_event_name; -select * from performance_schema.file_summary_by_instance; -select * from performance_schema.host_cache; -select * from performance_schema.hosts; -select * from performance_schema.mutex_instances; -select * from performance_schema.objects_summary_global_by_type; -select * from performance_schema.performance_timers; -select * from performance_schema.rwlock_instances; -select * from performance_schema.session_account_connect_attrs; -select * from performance_schema.session_connect_attrs; -select * from performance_schema.setup_actors; -select * from performance_schema.setup_consumers; -select * from performance_schema.setup_instruments; -select * from performance_schema.setup_objects; -select * from performance_schema.setup_timers; -select * from performance_schema.socket_instances; -select * from performance_schema.socket_summary_by_instance; -select * from performance_schema.socket_summary_by_event_name; -select * from performance_schema.table_io_waits_summary_by_index_usage; -select * from performance_schema.table_io_waits_summary_by_table; -select * from performance_schema.table_lock_waits_summary_by_table; -select * from performance_schema.threads; -select * from performance_schema.users; -show variables where -`Variable_name` != "performance_schema_max_statement_classes" and -`Variable_name` like "performance_schema%"; -Variable_name Value -performance_schema ON -performance_schema_accounts_size 100 -performance_schema_digests_size 200 -performance_schema_events_stages_history_long_size 1000 -performance_schema_events_stages_history_size 10 -performance_schema_events_statements_history_long_size 1000 -performance_schema_events_statements_history_size 10 -performance_schema_events_waits_history_long_size 10000 -performance_schema_events_waits_history_size 10 -performance_schema_hosts_size 100 -performance_schema_max_cond_classes 80 -performance_schema_max_cond_instances 1000 -performance_schema_max_digest_length 1024 -performance_schema_max_file_classes 50 -performance_schema_max_file_handles 32768 -performance_schema_max_file_instances 10000 -performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 5000 -performance_schema_max_rwlock_classes 40 -performance_schema_max_rwlock_instances 5000 -performance_schema_max_socket_classes 0 -performance_schema_max_socket_instances 1000 -performance_schema_max_stage_classes 150 -performance_schema_max_table_handles 1000 -performance_schema_max_table_instances 500 -performance_schema_max_thread_classes 50 -performance_schema_max_thread_instances 200 -performance_schema_session_connect_attrs_size 2048 -performance_schema_setup_actors_size 100 -performance_schema_setup_objects_size 100 -performance_schema_users_size 100 show engine PERFORMANCE_SCHEMA status; show status like "performance_schema%"; show variables like "performance_schema_max_socket_classes"; diff --git a/mysql-test/suite/perfschema/r/start_server_no_socket_inst.result b/mysql-test/suite/perfschema/r/start_server_no_socket_inst.result index 599e09f6c99..0c78ec66db9 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_socket_inst.result +++ b/mysql-test/suite/perfschema/r/start_server_no_socket_inst.result @@ -17,93 +17,6 @@ count(*) > 3 select count(*) from performance_schema.setup_timers; count(*) 4 -select * from performance_schema.accounts; -select * from performance_schema.cond_instances; -select * from performance_schema.events_stages_current; -select * from performance_schema.events_stages_history; -select * from performance_schema.events_stages_history_long; -select * from performance_schema.events_stages_summary_by_account_by_event_name; -select * from performance_schema.events_stages_summary_by_host_by_event_name; -select * from performance_schema.events_stages_summary_by_thread_by_event_name; -select * from performance_schema.events_stages_summary_by_user_by_event_name; -select * from performance_schema.events_stages_summary_global_by_event_name; -select * from performance_schema.events_statements_current; -select * from performance_schema.events_statements_history; -select * from performance_schema.events_statements_history_long; -select * from performance_schema.events_statements_summary_by_account_by_event_name; -select * from performance_schema.events_statements_summary_by_digest; -select * from performance_schema.events_statements_summary_by_host_by_event_name; -select * from performance_schema.events_statements_summary_by_thread_by_event_name; -select * from performance_schema.events_statements_summary_by_user_by_event_name; -select * from performance_schema.events_statements_summary_global_by_event_name; -select * from performance_schema.events_waits_current; -select * from performance_schema.events_waits_history; -select * from performance_schema.events_waits_history_long; -select * from performance_schema.events_waits_summary_by_account_by_event_name; -select * from performance_schema.events_waits_summary_by_host_by_event_name; -select * from performance_schema.events_waits_summary_by_instance; -select * from performance_schema.events_waits_summary_by_thread_by_event_name; -select * from performance_schema.events_waits_summary_by_user_by_event_name; -select * from performance_schema.events_waits_summary_global_by_event_name; -select * from performance_schema.file_instances; -select * from performance_schema.file_summary_by_event_name; -select * from performance_schema.file_summary_by_instance; -select * from performance_schema.host_cache; -select * from performance_schema.hosts; -select * from performance_schema.mutex_instances; -select * from performance_schema.objects_summary_global_by_type; -select * from performance_schema.performance_timers; -select * from performance_schema.rwlock_instances; -select * from performance_schema.session_account_connect_attrs; -select * from performance_schema.session_connect_attrs; -select * from performance_schema.setup_actors; -select * from performance_schema.setup_consumers; -select * from performance_schema.setup_instruments; -select * from performance_schema.setup_objects; -select * from performance_schema.setup_timers; -select * from performance_schema.socket_instances; -select * from performance_schema.socket_summary_by_instance; -select * from performance_schema.socket_summary_by_event_name; -select * from performance_schema.table_io_waits_summary_by_index_usage; -select * from performance_schema.table_io_waits_summary_by_table; -select * from performance_schema.table_lock_waits_summary_by_table; -select * from performance_schema.threads; -select * from performance_schema.users; -show variables where -`Variable_name` != "performance_schema_max_statement_classes" and -`Variable_name` like "performance_schema%"; -Variable_name Value -performance_schema ON -performance_schema_accounts_size 100 -performance_schema_digests_size 200 -performance_schema_events_stages_history_long_size 1000 -performance_schema_events_stages_history_size 10 -performance_schema_events_statements_history_long_size 1000 -performance_schema_events_statements_history_size 10 -performance_schema_events_waits_history_long_size 10000 -performance_schema_events_waits_history_size 10 -performance_schema_hosts_size 100 -performance_schema_max_cond_classes 80 -performance_schema_max_cond_instances 1000 -performance_schema_max_digest_length 1024 -performance_schema_max_file_classes 50 -performance_schema_max_file_handles 32768 -performance_schema_max_file_instances 10000 -performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 5000 -performance_schema_max_rwlock_classes 40 -performance_schema_max_rwlock_instances 5000 -performance_schema_max_socket_classes 10 -performance_schema_max_socket_instances 0 -performance_schema_max_stage_classes 150 -performance_schema_max_table_handles 1000 -performance_schema_max_table_instances 500 -performance_schema_max_thread_classes 50 -performance_schema_max_thread_instances 200 -performance_schema_session_connect_attrs_size 2048 -performance_schema_setup_actors_size 100 -performance_schema_setup_objects_size 100 -performance_schema_users_size 100 show engine PERFORMANCE_SCHEMA status; show status like "performance_schema%"; show variables like "performance_schema_max_socket_classes"; diff --git a/mysql-test/suite/perfschema/r/start_server_no_stage_class.result b/mysql-test/suite/perfschema/r/start_server_no_stage_class.result index 1d53efc500c..f3e95c3ac7b 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_stage_class.result +++ b/mysql-test/suite/perfschema/r/start_server_no_stage_class.result @@ -17,93 +17,6 @@ count(*) > 3 select count(*) from performance_schema.setup_timers; count(*) 4 -select * from performance_schema.accounts; -select * from performance_schema.cond_instances; -select * from performance_schema.events_stages_current; -select * from performance_schema.events_stages_history; -select * from performance_schema.events_stages_history_long; -select * from performance_schema.events_stages_summary_by_account_by_event_name; -select * from performance_schema.events_stages_summary_by_host_by_event_name; -select * from performance_schema.events_stages_summary_by_thread_by_event_name; -select * from performance_schema.events_stages_summary_by_user_by_event_name; -select * from performance_schema.events_stages_summary_global_by_event_name; -select * from performance_schema.events_statements_current; -select * from performance_schema.events_statements_history; -select * from performance_schema.events_statements_history_long; -select * from performance_schema.events_statements_summary_by_account_by_event_name; -select * from performance_schema.events_statements_summary_by_digest; -select * from performance_schema.events_statements_summary_by_host_by_event_name; -select * from performance_schema.events_statements_summary_by_thread_by_event_name; -select * from performance_schema.events_statements_summary_by_user_by_event_name; -select * from performance_schema.events_statements_summary_global_by_event_name; -select * from performance_schema.events_waits_current; -select * from performance_schema.events_waits_history; -select * from performance_schema.events_waits_history_long; -select * from performance_schema.events_waits_summary_by_account_by_event_name; -select * from performance_schema.events_waits_summary_by_host_by_event_name; -select * from performance_schema.events_waits_summary_by_instance; -select * from performance_schema.events_waits_summary_by_thread_by_event_name; -select * from performance_schema.events_waits_summary_by_user_by_event_name; -select * from performance_schema.events_waits_summary_global_by_event_name; -select * from performance_schema.file_instances; -select * from performance_schema.file_summary_by_event_name; -select * from performance_schema.file_summary_by_instance; -select * from performance_schema.host_cache; -select * from performance_schema.hosts; -select * from performance_schema.mutex_instances; -select * from performance_schema.objects_summary_global_by_type; -select * from performance_schema.performance_timers; -select * from performance_schema.rwlock_instances; -select * from performance_schema.session_account_connect_attrs; -select * from performance_schema.session_connect_attrs; -select * from performance_schema.setup_actors; -select * from performance_schema.setup_consumers; -select * from performance_schema.setup_instruments; -select * from performance_schema.setup_objects; -select * from performance_schema.setup_timers; -select * from performance_schema.socket_instances; -select * from performance_schema.socket_summary_by_instance; -select * from performance_schema.socket_summary_by_event_name; -select * from performance_schema.table_io_waits_summary_by_index_usage; -select * from performance_schema.table_io_waits_summary_by_table; -select * from performance_schema.table_lock_waits_summary_by_table; -select * from performance_schema.threads; -select * from performance_schema.users; -show variables where -`Variable_name` != "performance_schema_max_statement_classes" and -`Variable_name` like "performance_schema%"; -Variable_name Value -performance_schema ON -performance_schema_accounts_size 100 -performance_schema_digests_size 200 -performance_schema_events_stages_history_long_size 1000 -performance_schema_events_stages_history_size 10 -performance_schema_events_statements_history_long_size 1000 -performance_schema_events_statements_history_size 10 -performance_schema_events_waits_history_long_size 10000 -performance_schema_events_waits_history_size 10 -performance_schema_hosts_size 100 -performance_schema_max_cond_classes 80 -performance_schema_max_cond_instances 1000 -performance_schema_max_digest_length 1024 -performance_schema_max_file_classes 50 -performance_schema_max_file_handles 32768 -performance_schema_max_file_instances 10000 -performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 5000 -performance_schema_max_rwlock_classes 40 -performance_schema_max_rwlock_instances 5000 -performance_schema_max_socket_classes 10 -performance_schema_max_socket_instances 1000 -performance_schema_max_stage_classes 0 -performance_schema_max_table_handles 1000 -performance_schema_max_table_instances 500 -performance_schema_max_thread_classes 50 -performance_schema_max_thread_instances 200 -performance_schema_session_connect_attrs_size 2048 -performance_schema_setup_actors_size 100 -performance_schema_setup_objects_size 100 -performance_schema_users_size 100 show engine PERFORMANCE_SCHEMA status; show status like "performance_schema%"; show variables like "performance_schema_max_stage_classes"; diff --git a/mysql-test/suite/perfschema/r/start_server_no_stages_history.result b/mysql-test/suite/perfschema/r/start_server_no_stages_history.result index 370ec61ff67..2e5005323dd 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_stages_history.result +++ b/mysql-test/suite/perfschema/r/start_server_no_stages_history.result @@ -17,93 +17,6 @@ count(*) > 3 select count(*) from performance_schema.setup_timers; count(*) 4 -select * from performance_schema.accounts; -select * from performance_schema.cond_instances; -select * from performance_schema.events_stages_current; -select * from performance_schema.events_stages_history; -select * from performance_schema.events_stages_history_long; -select * from performance_schema.events_stages_summary_by_account_by_event_name; -select * from performance_schema.events_stages_summary_by_host_by_event_name; -select * from performance_schema.events_stages_summary_by_thread_by_event_name; -select * from performance_schema.events_stages_summary_by_user_by_event_name; -select * from performance_schema.events_stages_summary_global_by_event_name; -select * from performance_schema.events_statements_current; -select * from performance_schema.events_statements_history; -select * from performance_schema.events_statements_history_long; -select * from performance_schema.events_statements_summary_by_account_by_event_name; -select * from performance_schema.events_statements_summary_by_digest; -select * from performance_schema.events_statements_summary_by_host_by_event_name; -select * from performance_schema.events_statements_summary_by_thread_by_event_name; -select * from performance_schema.events_statements_summary_by_user_by_event_name; -select * from performance_schema.events_statements_summary_global_by_event_name; -select * from performance_schema.events_waits_current; -select * from performance_schema.events_waits_history; -select * from performance_schema.events_waits_history_long; -select * from performance_schema.events_waits_summary_by_account_by_event_name; -select * from performance_schema.events_waits_summary_by_host_by_event_name; -select * from performance_schema.events_waits_summary_by_instance; -select * from performance_schema.events_waits_summary_by_thread_by_event_name; -select * from performance_schema.events_waits_summary_by_user_by_event_name; -select * from performance_schema.events_waits_summary_global_by_event_name; -select * from performance_schema.file_instances; -select * from performance_schema.file_summary_by_event_name; -select * from performance_schema.file_summary_by_instance; -select * from performance_schema.host_cache; -select * from performance_schema.hosts; -select * from performance_schema.mutex_instances; -select * from performance_schema.objects_summary_global_by_type; -select * from performance_schema.performance_timers; -select * from performance_schema.rwlock_instances; -select * from performance_schema.session_account_connect_attrs; -select * from performance_schema.session_connect_attrs; -select * from performance_schema.setup_actors; -select * from performance_schema.setup_consumers; -select * from performance_schema.setup_instruments; -select * from performance_schema.setup_objects; -select * from performance_schema.setup_timers; -select * from performance_schema.socket_instances; -select * from performance_schema.socket_summary_by_instance; -select * from performance_schema.socket_summary_by_event_name; -select * from performance_schema.table_io_waits_summary_by_index_usage; -select * from performance_schema.table_io_waits_summary_by_table; -select * from performance_schema.table_lock_waits_summary_by_table; -select * from performance_schema.threads; -select * from performance_schema.users; -show variables where -`Variable_name` != "performance_schema_max_statement_classes" and -`Variable_name` like "performance_schema%"; -Variable_name Value -performance_schema ON -performance_schema_accounts_size 100 -performance_schema_digests_size 200 -performance_schema_events_stages_history_long_size 1000 -performance_schema_events_stages_history_size 0 -performance_schema_events_statements_history_long_size 1000 -performance_schema_events_statements_history_size 10 -performance_schema_events_waits_history_long_size 10000 -performance_schema_events_waits_history_size 10 -performance_schema_hosts_size 100 -performance_schema_max_cond_classes 80 -performance_schema_max_cond_instances 1000 -performance_schema_max_digest_length 1024 -performance_schema_max_file_classes 50 -performance_schema_max_file_handles 32768 -performance_schema_max_file_instances 10000 -performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 5000 -performance_schema_max_rwlock_classes 40 -performance_schema_max_rwlock_instances 5000 -performance_schema_max_socket_classes 10 -performance_schema_max_socket_instances 1000 -performance_schema_max_stage_classes 150 -performance_schema_max_table_handles 1000 -performance_schema_max_table_instances 500 -performance_schema_max_thread_classes 50 -performance_schema_max_thread_instances 200 -performance_schema_session_connect_attrs_size 2048 -performance_schema_setup_actors_size 100 -performance_schema_setup_objects_size 100 -performance_schema_users_size 100 show engine PERFORMANCE_SCHEMA status; show status like "performance_schema%"; show variables like "performance_schema_events_stages_history_size"; diff --git a/mysql-test/suite/perfschema/r/start_server_no_stages_history_long.result b/mysql-test/suite/perfschema/r/start_server_no_stages_history_long.result index d8018e0ba44..cb29a5812fc 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_stages_history_long.result +++ b/mysql-test/suite/perfschema/r/start_server_no_stages_history_long.result @@ -17,93 +17,6 @@ count(*) > 3 select count(*) from performance_schema.setup_timers; count(*) 4 -select * from performance_schema.accounts; -select * from performance_schema.cond_instances; -select * from performance_schema.events_stages_current; -select * from performance_schema.events_stages_history; -select * from performance_schema.events_stages_history_long; -select * from performance_schema.events_stages_summary_by_account_by_event_name; -select * from performance_schema.events_stages_summary_by_host_by_event_name; -select * from performance_schema.events_stages_summary_by_thread_by_event_name; -select * from performance_schema.events_stages_summary_by_user_by_event_name; -select * from performance_schema.events_stages_summary_global_by_event_name; -select * from performance_schema.events_statements_current; -select * from performance_schema.events_statements_history; -select * from performance_schema.events_statements_history_long; -select * from performance_schema.events_statements_summary_by_account_by_event_name; -select * from performance_schema.events_statements_summary_by_digest; -select * from performance_schema.events_statements_summary_by_host_by_event_name; -select * from performance_schema.events_statements_summary_by_thread_by_event_name; -select * from performance_schema.events_statements_summary_by_user_by_event_name; -select * from performance_schema.events_statements_summary_global_by_event_name; -select * from performance_schema.events_waits_current; -select * from performance_schema.events_waits_history; -select * from performance_schema.events_waits_history_long; -select * from performance_schema.events_waits_summary_by_account_by_event_name; -select * from performance_schema.events_waits_summary_by_host_by_event_name; -select * from performance_schema.events_waits_summary_by_instance; -select * from performance_schema.events_waits_summary_by_thread_by_event_name; -select * from performance_schema.events_waits_summary_by_user_by_event_name; -select * from performance_schema.events_waits_summary_global_by_event_name; -select * from performance_schema.file_instances; -select * from performance_schema.file_summary_by_event_name; -select * from performance_schema.file_summary_by_instance; -select * from performance_schema.host_cache; -select * from performance_schema.hosts; -select * from performance_schema.mutex_instances; -select * from performance_schema.objects_summary_global_by_type; -select * from performance_schema.performance_timers; -select * from performance_schema.rwlock_instances; -select * from performance_schema.session_account_connect_attrs; -select * from performance_schema.session_connect_attrs; -select * from performance_schema.setup_actors; -select * from performance_schema.setup_consumers; -select * from performance_schema.setup_instruments; -select * from performance_schema.setup_objects; -select * from performance_schema.setup_timers; -select * from performance_schema.socket_instances; -select * from performance_schema.socket_summary_by_instance; -select * from performance_schema.socket_summary_by_event_name; -select * from performance_schema.table_io_waits_summary_by_index_usage; -select * from performance_schema.table_io_waits_summary_by_table; -select * from performance_schema.table_lock_waits_summary_by_table; -select * from performance_schema.threads; -select * from performance_schema.users; -show variables where -`Variable_name` != "performance_schema_max_statement_classes" and -`Variable_name` like "performance_schema%"; -Variable_name Value -performance_schema ON -performance_schema_accounts_size 100 -performance_schema_digests_size 200 -performance_schema_events_stages_history_long_size 0 -performance_schema_events_stages_history_size 10 -performance_schema_events_statements_history_long_size 1000 -performance_schema_events_statements_history_size 10 -performance_schema_events_waits_history_long_size 10000 -performance_schema_events_waits_history_size 10 -performance_schema_hosts_size 100 -performance_schema_max_cond_classes 80 -performance_schema_max_cond_instances 1000 -performance_schema_max_digest_length 1024 -performance_schema_max_file_classes 50 -performance_schema_max_file_handles 32768 -performance_schema_max_file_instances 10000 -performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 5000 -performance_schema_max_rwlock_classes 40 -performance_schema_max_rwlock_instances 5000 -performance_schema_max_socket_classes 10 -performance_schema_max_socket_instances 1000 -performance_schema_max_stage_classes 150 -performance_schema_max_table_handles 1000 -performance_schema_max_table_instances 500 -performance_schema_max_thread_classes 50 -performance_schema_max_thread_instances 200 -performance_schema_session_connect_attrs_size 2048 -performance_schema_setup_actors_size 100 -performance_schema_setup_objects_size 100 -performance_schema_users_size 100 show engine PERFORMANCE_SCHEMA status; show status like "performance_schema%"; show variables like "performance_schema_events_stages_history_long_size"; diff --git a/mysql-test/suite/perfschema/r/start_server_no_statement_class.result b/mysql-test/suite/perfschema/r/start_server_no_statement_class.result index a617e7edb0a..d62b4ba1daa 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_statement_class.result +++ b/mysql-test/suite/perfschema/r/start_server_no_statement_class.result @@ -17,93 +17,6 @@ count(*) > 3 select count(*) from performance_schema.setup_timers; count(*) 4 -select * from performance_schema.accounts; -select * from performance_schema.cond_instances; -select * from performance_schema.events_stages_current; -select * from performance_schema.events_stages_history; -select * from performance_schema.events_stages_history_long; -select * from performance_schema.events_stages_summary_by_account_by_event_name; -select * from performance_schema.events_stages_summary_by_host_by_event_name; -select * from performance_schema.events_stages_summary_by_thread_by_event_name; -select * from performance_schema.events_stages_summary_by_user_by_event_name; -select * from performance_schema.events_stages_summary_global_by_event_name; -select * from performance_schema.events_statements_current; -select * from performance_schema.events_statements_history; -select * from performance_schema.events_statements_history_long; -select * from performance_schema.events_statements_summary_by_account_by_event_name; -select * from performance_schema.events_statements_summary_by_digest; -select * from performance_schema.events_statements_summary_by_host_by_event_name; -select * from performance_schema.events_statements_summary_by_thread_by_event_name; -select * from performance_schema.events_statements_summary_by_user_by_event_name; -select * from performance_schema.events_statements_summary_global_by_event_name; -select * from performance_schema.events_waits_current; -select * from performance_schema.events_waits_history; -select * from performance_schema.events_waits_history_long; -select * from performance_schema.events_waits_summary_by_account_by_event_name; -select * from performance_schema.events_waits_summary_by_host_by_event_name; -select * from performance_schema.events_waits_summary_by_instance; -select * from performance_schema.events_waits_summary_by_thread_by_event_name; -select * from performance_schema.events_waits_summary_by_user_by_event_name; -select * from performance_schema.events_waits_summary_global_by_event_name; -select * from performance_schema.file_instances; -select * from performance_schema.file_summary_by_event_name; -select * from performance_schema.file_summary_by_instance; -select * from performance_schema.host_cache; -select * from performance_schema.hosts; -select * from performance_schema.mutex_instances; -select * from performance_schema.objects_summary_global_by_type; -select * from performance_schema.performance_timers; -select * from performance_schema.rwlock_instances; -select * from performance_schema.session_account_connect_attrs; -select * from performance_schema.session_connect_attrs; -select * from performance_schema.setup_actors; -select * from performance_schema.setup_consumers; -select * from performance_schema.setup_instruments; -select * from performance_schema.setup_objects; -select * from performance_schema.setup_timers; -select * from performance_schema.socket_instances; -select * from performance_schema.socket_summary_by_instance; -select * from performance_schema.socket_summary_by_event_name; -select * from performance_schema.table_io_waits_summary_by_index_usage; -select * from performance_schema.table_io_waits_summary_by_table; -select * from performance_schema.table_lock_waits_summary_by_table; -select * from performance_schema.threads; -select * from performance_schema.users; -show variables where -`Variable_name` != "performance_schema_max_statement_classes" and -`Variable_name` like "performance_schema%"; -Variable_name Value -performance_schema ON -performance_schema_accounts_size 100 -performance_schema_digests_size 200 -performance_schema_events_stages_history_long_size 1000 -performance_schema_events_stages_history_size 10 -performance_schema_events_statements_history_long_size 1000 -performance_schema_events_statements_history_size 10 -performance_schema_events_waits_history_long_size 10000 -performance_schema_events_waits_history_size 10 -performance_schema_hosts_size 100 -performance_schema_max_cond_classes 80 -performance_schema_max_cond_instances 1000 -performance_schema_max_digest_length 1024 -performance_schema_max_file_classes 50 -performance_schema_max_file_handles 32768 -performance_schema_max_file_instances 10000 -performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 5000 -performance_schema_max_rwlock_classes 40 -performance_schema_max_rwlock_instances 5000 -performance_schema_max_socket_classes 10 -performance_schema_max_socket_instances 1000 -performance_schema_max_stage_classes 150 -performance_schema_max_table_handles 1000 -performance_schema_max_table_instances 500 -performance_schema_max_thread_classes 50 -performance_schema_max_thread_instances 200 -performance_schema_session_connect_attrs_size 2048 -performance_schema_setup_actors_size 100 -performance_schema_setup_objects_size 100 -performance_schema_users_size 100 show engine PERFORMANCE_SCHEMA status; show status like "performance_schema%"; show variables like "performance_schema_max_statement_classes"; diff --git a/mysql-test/suite/perfschema/r/start_server_no_statements_history.result b/mysql-test/suite/perfschema/r/start_server_no_statements_history.result index 8d196aa9a4a..ed4b2870e6d 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_statements_history.result +++ b/mysql-test/suite/perfschema/r/start_server_no_statements_history.result @@ -17,93 +17,6 @@ count(*) > 3 select count(*) from performance_schema.setup_timers; count(*) 4 -select * from performance_schema.accounts; -select * from performance_schema.cond_instances; -select * from performance_schema.events_stages_current; -select * from performance_schema.events_stages_history; -select * from performance_schema.events_stages_history_long; -select * from performance_schema.events_stages_summary_by_account_by_event_name; -select * from performance_schema.events_stages_summary_by_host_by_event_name; -select * from performance_schema.events_stages_summary_by_thread_by_event_name; -select * from performance_schema.events_stages_summary_by_user_by_event_name; -select * from performance_schema.events_stages_summary_global_by_event_name; -select * from performance_schema.events_statements_current; -select * from performance_schema.events_statements_history; -select * from performance_schema.events_statements_history_long; -select * from performance_schema.events_statements_summary_by_account_by_event_name; -select * from performance_schema.events_statements_summary_by_digest; -select * from performance_schema.events_statements_summary_by_host_by_event_name; -select * from performance_schema.events_statements_summary_by_thread_by_event_name; -select * from performance_schema.events_statements_summary_by_user_by_event_name; -select * from performance_schema.events_statements_summary_global_by_event_name; -select * from performance_schema.events_waits_current; -select * from performance_schema.events_waits_history; -select * from performance_schema.events_waits_history_long; -select * from performance_schema.events_waits_summary_by_account_by_event_name; -select * from performance_schema.events_waits_summary_by_host_by_event_name; -select * from performance_schema.events_waits_summary_by_instance; -select * from performance_schema.events_waits_summary_by_thread_by_event_name; -select * from performance_schema.events_waits_summary_by_user_by_event_name; -select * from performance_schema.events_waits_summary_global_by_event_name; -select * from performance_schema.file_instances; -select * from performance_schema.file_summary_by_event_name; -select * from performance_schema.file_summary_by_instance; -select * from performance_schema.host_cache; -select * from performance_schema.hosts; -select * from performance_schema.mutex_instances; -select * from performance_schema.objects_summary_global_by_type; -select * from performance_schema.performance_timers; -select * from performance_schema.rwlock_instances; -select * from performance_schema.session_account_connect_attrs; -select * from performance_schema.session_connect_attrs; -select * from performance_schema.setup_actors; -select * from performance_schema.setup_consumers; -select * from performance_schema.setup_instruments; -select * from performance_schema.setup_objects; -select * from performance_schema.setup_timers; -select * from performance_schema.socket_instances; -select * from performance_schema.socket_summary_by_instance; -select * from performance_schema.socket_summary_by_event_name; -select * from performance_schema.table_io_waits_summary_by_index_usage; -select * from performance_schema.table_io_waits_summary_by_table; -select * from performance_schema.table_lock_waits_summary_by_table; -select * from performance_schema.threads; -select * from performance_schema.users; -show variables where -`Variable_name` != "performance_schema_max_statement_classes" and -`Variable_name` like "performance_schema%"; -Variable_name Value -performance_schema ON -performance_schema_accounts_size 100 -performance_schema_digests_size 200 -performance_schema_events_stages_history_long_size 1000 -performance_schema_events_stages_history_size 10 -performance_schema_events_statements_history_long_size 1000 -performance_schema_events_statements_history_size 0 -performance_schema_events_waits_history_long_size 10000 -performance_schema_events_waits_history_size 10 -performance_schema_hosts_size 100 -performance_schema_max_cond_classes 80 -performance_schema_max_cond_instances 1000 -performance_schema_max_digest_length 1024 -performance_schema_max_file_classes 50 -performance_schema_max_file_handles 32768 -performance_schema_max_file_instances 10000 -performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 5000 -performance_schema_max_rwlock_classes 40 -performance_schema_max_rwlock_instances 5000 -performance_schema_max_socket_classes 10 -performance_schema_max_socket_instances 1000 -performance_schema_max_stage_classes 150 -performance_schema_max_table_handles 1000 -performance_schema_max_table_instances 500 -performance_schema_max_thread_classes 50 -performance_schema_max_thread_instances 200 -performance_schema_session_connect_attrs_size 2048 -performance_schema_setup_actors_size 100 -performance_schema_setup_objects_size 100 -performance_schema_users_size 100 show engine PERFORMANCE_SCHEMA status; show status like "performance_schema%"; show variables like "performance_schema_events_statements_history_size"; diff --git a/mysql-test/suite/perfschema/r/start_server_no_statements_history_long.result b/mysql-test/suite/perfschema/r/start_server_no_statements_history_long.result index 360e8db910b..a48d5fa9339 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_statements_history_long.result +++ b/mysql-test/suite/perfschema/r/start_server_no_statements_history_long.result @@ -17,93 +17,6 @@ count(*) > 3 select count(*) from performance_schema.setup_timers; count(*) 4 -select * from performance_schema.accounts; -select * from performance_schema.cond_instances; -select * from performance_schema.events_stages_current; -select * from performance_schema.events_stages_history; -select * from performance_schema.events_stages_history_long; -select * from performance_schema.events_stages_summary_by_account_by_event_name; -select * from performance_schema.events_stages_summary_by_host_by_event_name; -select * from performance_schema.events_stages_summary_by_thread_by_event_name; -select * from performance_schema.events_stages_summary_by_user_by_event_name; -select * from performance_schema.events_stages_summary_global_by_event_name; -select * from performance_schema.events_statements_current; -select * from performance_schema.events_statements_history; -select * from performance_schema.events_statements_history_long; -select * from performance_schema.events_statements_summary_by_account_by_event_name; -select * from performance_schema.events_statements_summary_by_digest; -select * from performance_schema.events_statements_summary_by_host_by_event_name; -select * from performance_schema.events_statements_summary_by_thread_by_event_name; -select * from performance_schema.events_statements_summary_by_user_by_event_name; -select * from performance_schema.events_statements_summary_global_by_event_name; -select * from performance_schema.events_waits_current; -select * from performance_schema.events_waits_history; -select * from performance_schema.events_waits_history_long; -select * from performance_schema.events_waits_summary_by_account_by_event_name; -select * from performance_schema.events_waits_summary_by_host_by_event_name; -select * from performance_schema.events_waits_summary_by_instance; -select * from performance_schema.events_waits_summary_by_thread_by_event_name; -select * from performance_schema.events_waits_summary_by_user_by_event_name; -select * from performance_schema.events_waits_summary_global_by_event_name; -select * from performance_schema.file_instances; -select * from performance_schema.file_summary_by_event_name; -select * from performance_schema.file_summary_by_instance; -select * from performance_schema.host_cache; -select * from performance_schema.hosts; -select * from performance_schema.mutex_instances; -select * from performance_schema.objects_summary_global_by_type; -select * from performance_schema.performance_timers; -select * from performance_schema.rwlock_instances; -select * from performance_schema.session_account_connect_attrs; -select * from performance_schema.session_connect_attrs; -select * from performance_schema.setup_actors; -select * from performance_schema.setup_consumers; -select * from performance_schema.setup_instruments; -select * from performance_schema.setup_objects; -select * from performance_schema.setup_timers; -select * from performance_schema.socket_instances; -select * from performance_schema.socket_summary_by_instance; -select * from performance_schema.socket_summary_by_event_name; -select * from performance_schema.table_io_waits_summary_by_index_usage; -select * from performance_schema.table_io_waits_summary_by_table; -select * from performance_schema.table_lock_waits_summary_by_table; -select * from performance_schema.threads; -select * from performance_schema.users; -show variables where -`Variable_name` != "performance_schema_max_statement_classes" and -`Variable_name` like "performance_schema%"; -Variable_name Value -performance_schema ON -performance_schema_accounts_size 100 -performance_schema_digests_size 200 -performance_schema_events_stages_history_long_size 1000 -performance_schema_events_stages_history_size 10 -performance_schema_events_statements_history_long_size 0 -performance_schema_events_statements_history_size 10 -performance_schema_events_waits_history_long_size 10000 -performance_schema_events_waits_history_size 10 -performance_schema_hosts_size 100 -performance_schema_max_cond_classes 80 -performance_schema_max_cond_instances 1000 -performance_schema_max_digest_length 1024 -performance_schema_max_file_classes 50 -performance_schema_max_file_handles 32768 -performance_schema_max_file_instances 10000 -performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 5000 -performance_schema_max_rwlock_classes 40 -performance_schema_max_rwlock_instances 5000 -performance_schema_max_socket_classes 10 -performance_schema_max_socket_instances 1000 -performance_schema_max_stage_classes 150 -performance_schema_max_table_handles 1000 -performance_schema_max_table_instances 500 -performance_schema_max_thread_classes 50 -performance_schema_max_thread_instances 200 -performance_schema_session_connect_attrs_size 2048 -performance_schema_setup_actors_size 100 -performance_schema_setup_objects_size 100 -performance_schema_users_size 100 show engine PERFORMANCE_SCHEMA status; show status like "performance_schema%"; show variables like "performance_schema_events_statements_history_long_size"; diff --git a/mysql-test/suite/perfschema/r/start_server_no_table_hdl.result b/mysql-test/suite/perfschema/r/start_server_no_table_hdl.result index 01b7233582e..5bc38231122 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_table_hdl.result +++ b/mysql-test/suite/perfschema/r/start_server_no_table_hdl.result @@ -17,93 +17,6 @@ count(*) > 3 select count(*) from performance_schema.setup_timers; count(*) 4 -select * from performance_schema.accounts; -select * from performance_schema.cond_instances; -select * from performance_schema.events_stages_current; -select * from performance_schema.events_stages_history; -select * from performance_schema.events_stages_history_long; -select * from performance_schema.events_stages_summary_by_account_by_event_name; -select * from performance_schema.events_stages_summary_by_host_by_event_name; -select * from performance_schema.events_stages_summary_by_thread_by_event_name; -select * from performance_schema.events_stages_summary_by_user_by_event_name; -select * from performance_schema.events_stages_summary_global_by_event_name; -select * from performance_schema.events_statements_current; -select * from performance_schema.events_statements_history; -select * from performance_schema.events_statements_history_long; -select * from performance_schema.events_statements_summary_by_account_by_event_name; -select * from performance_schema.events_statements_summary_by_digest; -select * from performance_schema.events_statements_summary_by_host_by_event_name; -select * from performance_schema.events_statements_summary_by_thread_by_event_name; -select * from performance_schema.events_statements_summary_by_user_by_event_name; -select * from performance_schema.events_statements_summary_global_by_event_name; -select * from performance_schema.events_waits_current; -select * from performance_schema.events_waits_history; -select * from performance_schema.events_waits_history_long; -select * from performance_schema.events_waits_summary_by_account_by_event_name; -select * from performance_schema.events_waits_summary_by_host_by_event_name; -select * from performance_schema.events_waits_summary_by_instance; -select * from performance_schema.events_waits_summary_by_thread_by_event_name; -select * from performance_schema.events_waits_summary_by_user_by_event_name; -select * from performance_schema.events_waits_summary_global_by_event_name; -select * from performance_schema.file_instances; -select * from performance_schema.file_summary_by_event_name; -select * from performance_schema.file_summary_by_instance; -select * from performance_schema.host_cache; -select * from performance_schema.hosts; -select * from performance_schema.mutex_instances; -select * from performance_schema.objects_summary_global_by_type; -select * from performance_schema.performance_timers; -select * from performance_schema.rwlock_instances; -select * from performance_schema.session_account_connect_attrs; -select * from performance_schema.session_connect_attrs; -select * from performance_schema.setup_actors; -select * from performance_schema.setup_consumers; -select * from performance_schema.setup_instruments; -select * from performance_schema.setup_objects; -select * from performance_schema.setup_timers; -select * from performance_schema.socket_instances; -select * from performance_schema.socket_summary_by_instance; -select * from performance_schema.socket_summary_by_event_name; -select * from performance_schema.table_io_waits_summary_by_index_usage; -select * from performance_schema.table_io_waits_summary_by_table; -select * from performance_schema.table_lock_waits_summary_by_table; -select * from performance_schema.threads; -select * from performance_schema.users; -show variables where -`Variable_name` != "performance_schema_max_statement_classes" and -`Variable_name` like "performance_schema%"; -Variable_name Value -performance_schema ON -performance_schema_accounts_size 100 -performance_schema_digests_size 200 -performance_schema_events_stages_history_long_size 1000 -performance_schema_events_stages_history_size 10 -performance_schema_events_statements_history_long_size 1000 -performance_schema_events_statements_history_size 10 -performance_schema_events_waits_history_long_size 10000 -performance_schema_events_waits_history_size 10 -performance_schema_hosts_size 100 -performance_schema_max_cond_classes 80 -performance_schema_max_cond_instances 1000 -performance_schema_max_digest_length 1024 -performance_schema_max_file_classes 50 -performance_schema_max_file_handles 32768 -performance_schema_max_file_instances 10000 -performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 5000 -performance_schema_max_rwlock_classes 40 -performance_schema_max_rwlock_instances 5000 -performance_schema_max_socket_classes 10 -performance_schema_max_socket_instances 1000 -performance_schema_max_stage_classes 150 -performance_schema_max_table_handles 0 -performance_schema_max_table_instances 500 -performance_schema_max_thread_classes 50 -performance_schema_max_thread_instances 200 -performance_schema_session_connect_attrs_size 2048 -performance_schema_setup_actors_size 100 -performance_schema_setup_objects_size 100 -performance_schema_users_size 100 show engine PERFORMANCE_SCHEMA status; show status like "performance_schema%"; show variables like "performance_schema_max_table_instances"; diff --git a/mysql-test/suite/perfschema/r/start_server_no_table_inst.result b/mysql-test/suite/perfschema/r/start_server_no_table_inst.result index 5608c324321..def59b8b54b 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_table_inst.result +++ b/mysql-test/suite/perfschema/r/start_server_no_table_inst.result @@ -17,93 +17,6 @@ count(*) > 3 select count(*) from performance_schema.setup_timers; count(*) 4 -select * from performance_schema.accounts; -select * from performance_schema.cond_instances; -select * from performance_schema.events_stages_current; -select * from performance_schema.events_stages_history; -select * from performance_schema.events_stages_history_long; -select * from performance_schema.events_stages_summary_by_account_by_event_name; -select * from performance_schema.events_stages_summary_by_host_by_event_name; -select * from performance_schema.events_stages_summary_by_thread_by_event_name; -select * from performance_schema.events_stages_summary_by_user_by_event_name; -select * from performance_schema.events_stages_summary_global_by_event_name; -select * from performance_schema.events_statements_current; -select * from performance_schema.events_statements_history; -select * from performance_schema.events_statements_history_long; -select * from performance_schema.events_statements_summary_by_account_by_event_name; -select * from performance_schema.events_statements_summary_by_digest; -select * from performance_schema.events_statements_summary_by_host_by_event_name; -select * from performance_schema.events_statements_summary_by_thread_by_event_name; -select * from performance_schema.events_statements_summary_by_user_by_event_name; -select * from performance_schema.events_statements_summary_global_by_event_name; -select * from performance_schema.events_waits_current; -select * from performance_schema.events_waits_history; -select * from performance_schema.events_waits_history_long; -select * from performance_schema.events_waits_summary_by_account_by_event_name; -select * from performance_schema.events_waits_summary_by_host_by_event_name; -select * from performance_schema.events_waits_summary_by_instance; -select * from performance_schema.events_waits_summary_by_thread_by_event_name; -select * from performance_schema.events_waits_summary_by_user_by_event_name; -select * from performance_schema.events_waits_summary_global_by_event_name; -select * from performance_schema.file_instances; -select * from performance_schema.file_summary_by_event_name; -select * from performance_schema.file_summary_by_instance; -select * from performance_schema.host_cache; -select * from performance_schema.hosts; -select * from performance_schema.mutex_instances; -select * from performance_schema.objects_summary_global_by_type; -select * from performance_schema.performance_timers; -select * from performance_schema.rwlock_instances; -select * from performance_schema.session_account_connect_attrs; -select * from performance_schema.session_connect_attrs; -select * from performance_schema.setup_actors; -select * from performance_schema.setup_consumers; -select * from performance_schema.setup_instruments; -select * from performance_schema.setup_objects; -select * from performance_schema.setup_timers; -select * from performance_schema.socket_instances; -select * from performance_schema.socket_summary_by_instance; -select * from performance_schema.socket_summary_by_event_name; -select * from performance_schema.table_io_waits_summary_by_index_usage; -select * from performance_schema.table_io_waits_summary_by_table; -select * from performance_schema.table_lock_waits_summary_by_table; -select * from performance_schema.threads; -select * from performance_schema.users; -show variables where -`Variable_name` != "performance_schema_max_statement_classes" and -`Variable_name` like "performance_schema%"; -Variable_name Value -performance_schema ON -performance_schema_accounts_size 100 -performance_schema_digests_size 200 -performance_schema_events_stages_history_long_size 1000 -performance_schema_events_stages_history_size 10 -performance_schema_events_statements_history_long_size 1000 -performance_schema_events_statements_history_size 10 -performance_schema_events_waits_history_long_size 10000 -performance_schema_events_waits_history_size 10 -performance_schema_hosts_size 100 -performance_schema_max_cond_classes 80 -performance_schema_max_cond_instances 1000 -performance_schema_max_digest_length 1024 -performance_schema_max_file_classes 50 -performance_schema_max_file_handles 32768 -performance_schema_max_file_instances 10000 -performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 5000 -performance_schema_max_rwlock_classes 40 -performance_schema_max_rwlock_instances 5000 -performance_schema_max_socket_classes 10 -performance_schema_max_socket_instances 1000 -performance_schema_max_stage_classes 150 -performance_schema_max_table_handles 1000 -performance_schema_max_table_instances 0 -performance_schema_max_thread_classes 50 -performance_schema_max_thread_instances 200 -performance_schema_session_connect_attrs_size 2048 -performance_schema_setup_actors_size 100 -performance_schema_setup_objects_size 100 -performance_schema_users_size 100 show engine PERFORMANCE_SCHEMA status; show status like "performance_schema%"; show variables like "performance_schema_max_table_instances"; diff --git a/mysql-test/suite/perfschema/r/start_server_no_thread_class.result b/mysql-test/suite/perfschema/r/start_server_no_thread_class.result index b1a7758a9d8..16952409b56 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_thread_class.result +++ b/mysql-test/suite/perfschema/r/start_server_no_thread_class.result @@ -17,93 +17,6 @@ count(*) > 3 select count(*) from performance_schema.setup_timers; count(*) 4 -select * from performance_schema.accounts; -select * from performance_schema.cond_instances; -select * from performance_schema.events_stages_current; -select * from performance_schema.events_stages_history; -select * from performance_schema.events_stages_history_long; -select * from performance_schema.events_stages_summary_by_account_by_event_name; -select * from performance_schema.events_stages_summary_by_host_by_event_name; -select * from performance_schema.events_stages_summary_by_thread_by_event_name; -select * from performance_schema.events_stages_summary_by_user_by_event_name; -select * from performance_schema.events_stages_summary_global_by_event_name; -select * from performance_schema.events_statements_current; -select * from performance_schema.events_statements_history; -select * from performance_schema.events_statements_history_long; -select * from performance_schema.events_statements_summary_by_account_by_event_name; -select * from performance_schema.events_statements_summary_by_digest; -select * from performance_schema.events_statements_summary_by_host_by_event_name; -select * from performance_schema.events_statements_summary_by_thread_by_event_name; -select * from performance_schema.events_statements_summary_by_user_by_event_name; -select * from performance_schema.events_statements_summary_global_by_event_name; -select * from performance_schema.events_waits_current; -select * from performance_schema.events_waits_history; -select * from performance_schema.events_waits_history_long; -select * from performance_schema.events_waits_summary_by_account_by_event_name; -select * from performance_schema.events_waits_summary_by_host_by_event_name; -select * from performance_schema.events_waits_summary_by_instance; -select * from performance_schema.events_waits_summary_by_thread_by_event_name; -select * from performance_schema.events_waits_summary_by_user_by_event_name; -select * from performance_schema.events_waits_summary_global_by_event_name; -select * from performance_schema.file_instances; -select * from performance_schema.file_summary_by_event_name; -select * from performance_schema.file_summary_by_instance; -select * from performance_schema.host_cache; -select * from performance_schema.hosts; -select * from performance_schema.mutex_instances; -select * from performance_schema.objects_summary_global_by_type; -select * from performance_schema.performance_timers; -select * from performance_schema.rwlock_instances; -select * from performance_schema.session_account_connect_attrs; -select * from performance_schema.session_connect_attrs; -select * from performance_schema.setup_actors; -select * from performance_schema.setup_consumers; -select * from performance_schema.setup_instruments; -select * from performance_schema.setup_objects; -select * from performance_schema.setup_timers; -select * from performance_schema.socket_instances; -select * from performance_schema.socket_summary_by_instance; -select * from performance_schema.socket_summary_by_event_name; -select * from performance_schema.table_io_waits_summary_by_index_usage; -select * from performance_schema.table_io_waits_summary_by_table; -select * from performance_schema.table_lock_waits_summary_by_table; -select * from performance_schema.threads; -select * from performance_schema.users; -show variables where -`Variable_name` != "performance_schema_max_statement_classes" and -`Variable_name` like "performance_schema%"; -Variable_name Value -performance_schema ON -performance_schema_accounts_size 100 -performance_schema_digests_size 200 -performance_schema_events_stages_history_long_size 1000 -performance_schema_events_stages_history_size 10 -performance_schema_events_statements_history_long_size 1000 -performance_schema_events_statements_history_size 10 -performance_schema_events_waits_history_long_size 10000 -performance_schema_events_waits_history_size 10 -performance_schema_hosts_size 100 -performance_schema_max_cond_classes 80 -performance_schema_max_cond_instances 1000 -performance_schema_max_digest_length 1024 -performance_schema_max_file_classes 50 -performance_schema_max_file_handles 32768 -performance_schema_max_file_instances 10000 -performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 5000 -performance_schema_max_rwlock_classes 40 -performance_schema_max_rwlock_instances 5000 -performance_schema_max_socket_classes 10 -performance_schema_max_socket_instances 1000 -performance_schema_max_stage_classes 150 -performance_schema_max_table_handles 1000 -performance_schema_max_table_instances 500 -performance_schema_max_thread_classes 0 -performance_schema_max_thread_instances 200 -performance_schema_session_connect_attrs_size 2048 -performance_schema_setup_actors_size 100 -performance_schema_setup_objects_size 100 -performance_schema_users_size 100 show engine PERFORMANCE_SCHEMA status; show status like "performance_schema%"; show variables like "performance_schema_max_thread_classes"; diff --git a/mysql-test/suite/perfschema/r/start_server_no_thread_inst.result b/mysql-test/suite/perfschema/r/start_server_no_thread_inst.result index ad0353589ad..e3ccd3f91e6 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_thread_inst.result +++ b/mysql-test/suite/perfschema/r/start_server_no_thread_inst.result @@ -17,93 +17,6 @@ count(*) > 3 select count(*) from performance_schema.setup_timers; count(*) 4 -select * from performance_schema.accounts; -select * from performance_schema.cond_instances; -select * from performance_schema.events_stages_current; -select * from performance_schema.events_stages_history; -select * from performance_schema.events_stages_history_long; -select * from performance_schema.events_stages_summary_by_account_by_event_name; -select * from performance_schema.events_stages_summary_by_host_by_event_name; -select * from performance_schema.events_stages_summary_by_thread_by_event_name; -select * from performance_schema.events_stages_summary_by_user_by_event_name; -select * from performance_schema.events_stages_summary_global_by_event_name; -select * from performance_schema.events_statements_current; -select * from performance_schema.events_statements_history; -select * from performance_schema.events_statements_history_long; -select * from performance_schema.events_statements_summary_by_account_by_event_name; -select * from performance_schema.events_statements_summary_by_digest; -select * from performance_schema.events_statements_summary_by_host_by_event_name; -select * from performance_schema.events_statements_summary_by_thread_by_event_name; -select * from performance_schema.events_statements_summary_by_user_by_event_name; -select * from performance_schema.events_statements_summary_global_by_event_name; -select * from performance_schema.events_waits_current; -select * from performance_schema.events_waits_history; -select * from performance_schema.events_waits_history_long; -select * from performance_schema.events_waits_summary_by_account_by_event_name; -select * from performance_schema.events_waits_summary_by_host_by_event_name; -select * from performance_schema.events_waits_summary_by_instance; -select * from performance_schema.events_waits_summary_by_thread_by_event_name; -select * from performance_schema.events_waits_summary_by_user_by_event_name; -select * from performance_schema.events_waits_summary_global_by_event_name; -select * from performance_schema.file_instances; -select * from performance_schema.file_summary_by_event_name; -select * from performance_schema.file_summary_by_instance; -select * from performance_schema.host_cache; -select * from performance_schema.hosts; -select * from performance_schema.mutex_instances; -select * from performance_schema.objects_summary_global_by_type; -select * from performance_schema.performance_timers; -select * from performance_schema.rwlock_instances; -select * from performance_schema.session_account_connect_attrs; -select * from performance_schema.session_connect_attrs; -select * from performance_schema.setup_actors; -select * from performance_schema.setup_consumers; -select * from performance_schema.setup_instruments; -select * from performance_schema.setup_objects; -select * from performance_schema.setup_timers; -select * from performance_schema.socket_instances; -select * from performance_schema.socket_summary_by_instance; -select * from performance_schema.socket_summary_by_event_name; -select * from performance_schema.table_io_waits_summary_by_index_usage; -select * from performance_schema.table_io_waits_summary_by_table; -select * from performance_schema.table_lock_waits_summary_by_table; -select * from performance_schema.threads; -select * from performance_schema.users; -show variables where -`Variable_name` != "performance_schema_max_statement_classes" and -`Variable_name` like "performance_schema%"; -Variable_name Value -performance_schema ON -performance_schema_accounts_size 100 -performance_schema_digests_size 200 -performance_schema_events_stages_history_long_size 1000 -performance_schema_events_stages_history_size 10 -performance_schema_events_statements_history_long_size 1000 -performance_schema_events_statements_history_size 10 -performance_schema_events_waits_history_long_size 10000 -performance_schema_events_waits_history_size 10 -performance_schema_hosts_size 100 -performance_schema_max_cond_classes 80 -performance_schema_max_cond_instances 1000 -performance_schema_max_digest_length 1024 -performance_schema_max_file_classes 50 -performance_schema_max_file_handles 32768 -performance_schema_max_file_instances 10000 -performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 5000 -performance_schema_max_rwlock_classes 40 -performance_schema_max_rwlock_instances 5000 -performance_schema_max_socket_classes 10 -performance_schema_max_socket_instances 1000 -performance_schema_max_stage_classes 150 -performance_schema_max_table_handles 1000 -performance_schema_max_table_instances 500 -performance_schema_max_thread_classes 50 -performance_schema_max_thread_instances 0 -performance_schema_session_connect_attrs_size 2048 -performance_schema_setup_actors_size 100 -performance_schema_setup_objects_size 100 -performance_schema_users_size 100 show engine PERFORMANCE_SCHEMA status; show status like "performance_schema%"; show variables like "performance_schema_max_thread_classes"; diff --git a/mysql-test/suite/perfschema/r/start_server_no_user.result b/mysql-test/suite/perfschema/r/start_server_no_user.result index 2e1c097e28b..7f006d6b47a 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_user.result +++ b/mysql-test/suite/perfschema/r/start_server_no_user.result @@ -17,93 +17,6 @@ count(*) > 3 select count(*) from performance_schema.setup_timers; count(*) 4 -select * from performance_schema.accounts; -select * from performance_schema.cond_instances; -select * from performance_schema.events_stages_current; -select * from performance_schema.events_stages_history; -select * from performance_schema.events_stages_history_long; -select * from performance_schema.events_stages_summary_by_account_by_event_name; -select * from performance_schema.events_stages_summary_by_host_by_event_name; -select * from performance_schema.events_stages_summary_by_thread_by_event_name; -select * from performance_schema.events_stages_summary_by_user_by_event_name; -select * from performance_schema.events_stages_summary_global_by_event_name; -select * from performance_schema.events_statements_current; -select * from performance_schema.events_statements_history; -select * from performance_schema.events_statements_history_long; -select * from performance_schema.events_statements_summary_by_account_by_event_name; -select * from performance_schema.events_statements_summary_by_digest; -select * from performance_schema.events_statements_summary_by_host_by_event_name; -select * from performance_schema.events_statements_summary_by_thread_by_event_name; -select * from performance_schema.events_statements_summary_by_user_by_event_name; -select * from performance_schema.events_statements_summary_global_by_event_name; -select * from performance_schema.events_waits_current; -select * from performance_schema.events_waits_history; -select * from performance_schema.events_waits_history_long; -select * from performance_schema.events_waits_summary_by_account_by_event_name; -select * from performance_schema.events_waits_summary_by_host_by_event_name; -select * from performance_schema.events_waits_summary_by_instance; -select * from performance_schema.events_waits_summary_by_thread_by_event_name; -select * from performance_schema.events_waits_summary_by_user_by_event_name; -select * from performance_schema.events_waits_summary_global_by_event_name; -select * from performance_schema.file_instances; -select * from performance_schema.file_summary_by_event_name; -select * from performance_schema.file_summary_by_instance; -select * from performance_schema.host_cache; -select * from performance_schema.hosts; -select * from performance_schema.mutex_instances; -select * from performance_schema.objects_summary_global_by_type; -select * from performance_schema.performance_timers; -select * from performance_schema.rwlock_instances; -select * from performance_schema.session_account_connect_attrs; -select * from performance_schema.session_connect_attrs; -select * from performance_schema.setup_actors; -select * from performance_schema.setup_consumers; -select * from performance_schema.setup_instruments; -select * from performance_schema.setup_objects; -select * from performance_schema.setup_timers; -select * from performance_schema.socket_instances; -select * from performance_schema.socket_summary_by_instance; -select * from performance_schema.socket_summary_by_event_name; -select * from performance_schema.table_io_waits_summary_by_index_usage; -select * from performance_schema.table_io_waits_summary_by_table; -select * from performance_schema.table_lock_waits_summary_by_table; -select * from performance_schema.threads; -select * from performance_schema.users; -show variables where -`Variable_name` != "performance_schema_max_statement_classes" and -`Variable_name` like "performance_schema%"; -Variable_name Value -performance_schema ON -performance_schema_accounts_size 100 -performance_schema_digests_size 200 -performance_schema_events_stages_history_long_size 1000 -performance_schema_events_stages_history_size 10 -performance_schema_events_statements_history_long_size 1000 -performance_schema_events_statements_history_size 10 -performance_schema_events_waits_history_long_size 10000 -performance_schema_events_waits_history_size 10 -performance_schema_hosts_size 100 -performance_schema_max_cond_classes 80 -performance_schema_max_cond_instances 1000 -performance_schema_max_digest_length 1024 -performance_schema_max_file_classes 50 -performance_schema_max_file_handles 32768 -performance_schema_max_file_instances 10000 -performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 5000 -performance_schema_max_rwlock_classes 40 -performance_schema_max_rwlock_instances 5000 -performance_schema_max_socket_classes 10 -performance_schema_max_socket_instances 1000 -performance_schema_max_stage_classes 150 -performance_schema_max_table_handles 1000 -performance_schema_max_table_instances 500 -performance_schema_max_thread_classes 50 -performance_schema_max_thread_instances 200 -performance_schema_session_connect_attrs_size 2048 -performance_schema_setup_actors_size 100 -performance_schema_setup_objects_size 100 -performance_schema_users_size 0 show engine PERFORMANCE_SCHEMA status; show status like "performance_schema%"; show variables like "performance_schema_users_size"; diff --git a/mysql-test/suite/perfschema/r/start_server_no_waits_history.result b/mysql-test/suite/perfschema/r/start_server_no_waits_history.result index a3a9cbeee11..27122723030 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_waits_history.result +++ b/mysql-test/suite/perfschema/r/start_server_no_waits_history.result @@ -17,93 +17,6 @@ count(*) > 3 select count(*) from performance_schema.setup_timers; count(*) 4 -select * from performance_schema.accounts; -select * from performance_schema.cond_instances; -select * from performance_schema.events_stages_current; -select * from performance_schema.events_stages_history; -select * from performance_schema.events_stages_history_long; -select * from performance_schema.events_stages_summary_by_account_by_event_name; -select * from performance_schema.events_stages_summary_by_host_by_event_name; -select * from performance_schema.events_stages_summary_by_thread_by_event_name; -select * from performance_schema.events_stages_summary_by_user_by_event_name; -select * from performance_schema.events_stages_summary_global_by_event_name; -select * from performance_schema.events_statements_current; -select * from performance_schema.events_statements_history; -select * from performance_schema.events_statements_history_long; -select * from performance_schema.events_statements_summary_by_account_by_event_name; -select * from performance_schema.events_statements_summary_by_digest; -select * from performance_schema.events_statements_summary_by_host_by_event_name; -select * from performance_schema.events_statements_summary_by_thread_by_event_name; -select * from performance_schema.events_statements_summary_by_user_by_event_name; -select * from performance_schema.events_statements_summary_global_by_event_name; -select * from performance_schema.events_waits_current; -select * from performance_schema.events_waits_history; -select * from performance_schema.events_waits_history_long; -select * from performance_schema.events_waits_summary_by_account_by_event_name; -select * from performance_schema.events_waits_summary_by_host_by_event_name; -select * from performance_schema.events_waits_summary_by_instance; -select * from performance_schema.events_waits_summary_by_thread_by_event_name; -select * from performance_schema.events_waits_summary_by_user_by_event_name; -select * from performance_schema.events_waits_summary_global_by_event_name; -select * from performance_schema.file_instances; -select * from performance_schema.file_summary_by_event_name; -select * from performance_schema.file_summary_by_instance; -select * from performance_schema.host_cache; -select * from performance_schema.hosts; -select * from performance_schema.mutex_instances; -select * from performance_schema.objects_summary_global_by_type; -select * from performance_schema.performance_timers; -select * from performance_schema.rwlock_instances; -select * from performance_schema.session_account_connect_attrs; -select * from performance_schema.session_connect_attrs; -select * from performance_schema.setup_actors; -select * from performance_schema.setup_consumers; -select * from performance_schema.setup_instruments; -select * from performance_schema.setup_objects; -select * from performance_schema.setup_timers; -select * from performance_schema.socket_instances; -select * from performance_schema.socket_summary_by_instance; -select * from performance_schema.socket_summary_by_event_name; -select * from performance_schema.table_io_waits_summary_by_index_usage; -select * from performance_schema.table_io_waits_summary_by_table; -select * from performance_schema.table_lock_waits_summary_by_table; -select * from performance_schema.threads; -select * from performance_schema.users; -show variables where -`Variable_name` != "performance_schema_max_statement_classes" and -`Variable_name` like "performance_schema%"; -Variable_name Value -performance_schema ON -performance_schema_accounts_size 100 -performance_schema_digests_size 200 -performance_schema_events_stages_history_long_size 1000 -performance_schema_events_stages_history_size 10 -performance_schema_events_statements_history_long_size 1000 -performance_schema_events_statements_history_size 10 -performance_schema_events_waits_history_long_size 10000 -performance_schema_events_waits_history_size 0 -performance_schema_hosts_size 100 -performance_schema_max_cond_classes 80 -performance_schema_max_cond_instances 1000 -performance_schema_max_digest_length 1024 -performance_schema_max_file_classes 50 -performance_schema_max_file_handles 32768 -performance_schema_max_file_instances 10000 -performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 5000 -performance_schema_max_rwlock_classes 40 -performance_schema_max_rwlock_instances 5000 -performance_schema_max_socket_classes 10 -performance_schema_max_socket_instances 1000 -performance_schema_max_stage_classes 150 -performance_schema_max_table_handles 1000 -performance_schema_max_table_instances 500 -performance_schema_max_thread_classes 50 -performance_schema_max_thread_instances 200 -performance_schema_session_connect_attrs_size 2048 -performance_schema_setup_actors_size 100 -performance_schema_setup_objects_size 100 -performance_schema_users_size 100 show engine PERFORMANCE_SCHEMA status; show status like "performance_schema%"; show variables like "performance_schema_events_waits_history_size"; diff --git a/mysql-test/suite/perfschema/r/start_server_no_waits_history_long.result b/mysql-test/suite/perfschema/r/start_server_no_waits_history_long.result index e5465aa6bbb..16ee8a30343 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_waits_history_long.result +++ b/mysql-test/suite/perfschema/r/start_server_no_waits_history_long.result @@ -17,93 +17,6 @@ count(*) > 3 select count(*) from performance_schema.setup_timers; count(*) 4 -select * from performance_schema.accounts; -select * from performance_schema.cond_instances; -select * from performance_schema.events_stages_current; -select * from performance_schema.events_stages_history; -select * from performance_schema.events_stages_history_long; -select * from performance_schema.events_stages_summary_by_account_by_event_name; -select * from performance_schema.events_stages_summary_by_host_by_event_name; -select * from performance_schema.events_stages_summary_by_thread_by_event_name; -select * from performance_schema.events_stages_summary_by_user_by_event_name; -select * from performance_schema.events_stages_summary_global_by_event_name; -select * from performance_schema.events_statements_current; -select * from performance_schema.events_statements_history; -select * from performance_schema.events_statements_history_long; -select * from performance_schema.events_statements_summary_by_account_by_event_name; -select * from performance_schema.events_statements_summary_by_digest; -select * from performance_schema.events_statements_summary_by_host_by_event_name; -select * from performance_schema.events_statements_summary_by_thread_by_event_name; -select * from performance_schema.events_statements_summary_by_user_by_event_name; -select * from performance_schema.events_statements_summary_global_by_event_name; -select * from performance_schema.events_waits_current; -select * from performance_schema.events_waits_history; -select * from performance_schema.events_waits_history_long; -select * from performance_schema.events_waits_summary_by_account_by_event_name; -select * from performance_schema.events_waits_summary_by_host_by_event_name; -select * from performance_schema.events_waits_summary_by_instance; -select * from performance_schema.events_waits_summary_by_thread_by_event_name; -select * from performance_schema.events_waits_summary_by_user_by_event_name; -select * from performance_schema.events_waits_summary_global_by_event_name; -select * from performance_schema.file_instances; -select * from performance_schema.file_summary_by_event_name; -select * from performance_schema.file_summary_by_instance; -select * from performance_schema.host_cache; -select * from performance_schema.hosts; -select * from performance_schema.mutex_instances; -select * from performance_schema.objects_summary_global_by_type; -select * from performance_schema.performance_timers; -select * from performance_schema.rwlock_instances; -select * from performance_schema.session_account_connect_attrs; -select * from performance_schema.session_connect_attrs; -select * from performance_schema.setup_actors; -select * from performance_schema.setup_consumers; -select * from performance_schema.setup_instruments; -select * from performance_schema.setup_objects; -select * from performance_schema.setup_timers; -select * from performance_schema.socket_instances; -select * from performance_schema.socket_summary_by_instance; -select * from performance_schema.socket_summary_by_event_name; -select * from performance_schema.table_io_waits_summary_by_index_usage; -select * from performance_schema.table_io_waits_summary_by_table; -select * from performance_schema.table_lock_waits_summary_by_table; -select * from performance_schema.threads; -select * from performance_schema.users; -show variables where -`Variable_name` != "performance_schema_max_statement_classes" and -`Variable_name` like "performance_schema%"; -Variable_name Value -performance_schema ON -performance_schema_accounts_size 100 -performance_schema_digests_size 200 -performance_schema_events_stages_history_long_size 1000 -performance_schema_events_stages_history_size 10 -performance_schema_events_statements_history_long_size 1000 -performance_schema_events_statements_history_size 10 -performance_schema_events_waits_history_long_size 0 -performance_schema_events_waits_history_size 10 -performance_schema_hosts_size 100 -performance_schema_max_cond_classes 80 -performance_schema_max_cond_instances 1000 -performance_schema_max_digest_length 1024 -performance_schema_max_file_classes 50 -performance_schema_max_file_handles 32768 -performance_schema_max_file_instances 10000 -performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 5000 -performance_schema_max_rwlock_classes 40 -performance_schema_max_rwlock_instances 5000 -performance_schema_max_socket_classes 10 -performance_schema_max_socket_instances 1000 -performance_schema_max_stage_classes 150 -performance_schema_max_table_handles 1000 -performance_schema_max_table_instances 500 -performance_schema_max_thread_classes 50 -performance_schema_max_thread_instances 200 -performance_schema_session_connect_attrs_size 2048 -performance_schema_setup_actors_size 100 -performance_schema_setup_objects_size 100 -performance_schema_users_size 100 show engine PERFORMANCE_SCHEMA status; show status like "performance_schema%"; show variables like "performance_schema_events_waits_history_long_size"; diff --git a/mysql-test/suite/perfschema/r/start_server_nothing.result b/mysql-test/suite/perfschema/r/start_server_nothing.result index d28eed31e7d..2aa5658f98c 100644 --- a/mysql-test/suite/perfschema/r/start_server_nothing.result +++ b/mysql-test/suite/perfschema/r/start_server_nothing.result @@ -17,93 +17,6 @@ count(*) > 3 select count(*) from performance_schema.setup_timers; count(*) 4 -select * from performance_schema.accounts; -select * from performance_schema.cond_instances; -select * from performance_schema.events_stages_current; -select * from performance_schema.events_stages_history; -select * from performance_schema.events_stages_history_long; -select * from performance_schema.events_stages_summary_by_account_by_event_name; -select * from performance_schema.events_stages_summary_by_host_by_event_name; -select * from performance_schema.events_stages_summary_by_thread_by_event_name; -select * from performance_schema.events_stages_summary_by_user_by_event_name; -select * from performance_schema.events_stages_summary_global_by_event_name; -select * from performance_schema.events_statements_current; -select * from performance_schema.events_statements_history; -select * from performance_schema.events_statements_history_long; -select * from performance_schema.events_statements_summary_by_account_by_event_name; -select * from performance_schema.events_statements_summary_by_digest; -select * from performance_schema.events_statements_summary_by_host_by_event_name; -select * from performance_schema.events_statements_summary_by_thread_by_event_name; -select * from performance_schema.events_statements_summary_by_user_by_event_name; -select * from performance_schema.events_statements_summary_global_by_event_name; -select * from performance_schema.events_waits_current; -select * from performance_schema.events_waits_history; -select * from performance_schema.events_waits_history_long; -select * from performance_schema.events_waits_summary_by_account_by_event_name; -select * from performance_schema.events_waits_summary_by_host_by_event_name; -select * from performance_schema.events_waits_summary_by_instance; -select * from performance_schema.events_waits_summary_by_thread_by_event_name; -select * from performance_schema.events_waits_summary_by_user_by_event_name; -select * from performance_schema.events_waits_summary_global_by_event_name; -select * from performance_schema.file_instances; -select * from performance_schema.file_summary_by_event_name; -select * from performance_schema.file_summary_by_instance; -select * from performance_schema.host_cache; -select * from performance_schema.hosts; -select * from performance_schema.mutex_instances; -select * from performance_schema.objects_summary_global_by_type; -select * from performance_schema.performance_timers; -select * from performance_schema.rwlock_instances; -select * from performance_schema.session_account_connect_attrs; -select * from performance_schema.session_connect_attrs; -select * from performance_schema.setup_actors; -select * from performance_schema.setup_consumers; -select * from performance_schema.setup_instruments; -select * from performance_schema.setup_objects; -select * from performance_schema.setup_timers; -select * from performance_schema.socket_instances; -select * from performance_schema.socket_summary_by_instance; -select * from performance_schema.socket_summary_by_event_name; -select * from performance_schema.table_io_waits_summary_by_index_usage; -select * from performance_schema.table_io_waits_summary_by_table; -select * from performance_schema.table_lock_waits_summary_by_table; -select * from performance_schema.threads; -select * from performance_schema.users; -show variables where -`Variable_name` != "performance_schema_max_statement_classes" and -`Variable_name` like "performance_schema%"; -Variable_name Value -performance_schema ON -performance_schema_accounts_size 0 -performance_schema_digests_size 200 -performance_schema_events_stages_history_long_size 0 -performance_schema_events_stages_history_size 0 -performance_schema_events_statements_history_long_size 0 -performance_schema_events_statements_history_size 0 -performance_schema_events_waits_history_long_size 0 -performance_schema_events_waits_history_size 0 -performance_schema_hosts_size 0 -performance_schema_max_cond_classes 0 -performance_schema_max_cond_instances 0 -performance_schema_max_digest_length 1024 -performance_schema_max_file_classes 0 -performance_schema_max_file_handles 0 -performance_schema_max_file_instances 0 -performance_schema_max_mutex_classes 0 -performance_schema_max_mutex_instances 0 -performance_schema_max_rwlock_classes 0 -performance_schema_max_rwlock_instances 0 -performance_schema_max_socket_classes 0 -performance_schema_max_socket_instances 0 -performance_schema_max_stage_classes 0 -performance_schema_max_table_handles 0 -performance_schema_max_table_instances 0 -performance_schema_max_thread_classes 0 -performance_schema_max_thread_instances 0 -performance_schema_session_connect_attrs_size 0 -performance_schema_setup_actors_size 0 -performance_schema_setup_objects_size 0 -performance_schema_users_size 0 show engine PERFORMANCE_SCHEMA status; show status like "performance_schema%"; show variables like "performance_schema%"; diff --git a/mysql-test/suite/perfschema/r/start_server_off.result b/mysql-test/suite/perfschema/r/start_server_off.result index 5666b96be8e..8c8b8a3a7bb 100644 --- a/mysql-test/suite/perfschema/r/start_server_off.result +++ b/mysql-test/suite/perfschema/r/start_server_off.result @@ -17,93 +17,6 @@ count(*) > 3 select count(*) from performance_schema.setup_timers; count(*) 0 -select * from performance_schema.accounts; -select * from performance_schema.cond_instances; -select * from performance_schema.events_stages_current; -select * from performance_schema.events_stages_history; -select * from performance_schema.events_stages_history_long; -select * from performance_schema.events_stages_summary_by_account_by_event_name; -select * from performance_schema.events_stages_summary_by_host_by_event_name; -select * from performance_schema.events_stages_summary_by_thread_by_event_name; -select * from performance_schema.events_stages_summary_by_user_by_event_name; -select * from performance_schema.events_stages_summary_global_by_event_name; -select * from performance_schema.events_statements_current; -select * from performance_schema.events_statements_history; -select * from performance_schema.events_statements_history_long; -select * from performance_schema.events_statements_summary_by_account_by_event_name; -select * from performance_schema.events_statements_summary_by_digest; -select * from performance_schema.events_statements_summary_by_host_by_event_name; -select * from performance_schema.events_statements_summary_by_thread_by_event_name; -select * from performance_schema.events_statements_summary_by_user_by_event_name; -select * from performance_schema.events_statements_summary_global_by_event_name; -select * from performance_schema.events_waits_current; -select * from performance_schema.events_waits_history; -select * from performance_schema.events_waits_history_long; -select * from performance_schema.events_waits_summary_by_account_by_event_name; -select * from performance_schema.events_waits_summary_by_host_by_event_name; -select * from performance_schema.events_waits_summary_by_instance; -select * from performance_schema.events_waits_summary_by_thread_by_event_name; -select * from performance_schema.events_waits_summary_by_user_by_event_name; -select * from performance_schema.events_waits_summary_global_by_event_name; -select * from performance_schema.file_instances; -select * from performance_schema.file_summary_by_event_name; -select * from performance_schema.file_summary_by_instance; -select * from performance_schema.host_cache; -select * from performance_schema.hosts; -select * from performance_schema.mutex_instances; -select * from performance_schema.objects_summary_global_by_type; -select * from performance_schema.performance_timers; -select * from performance_schema.rwlock_instances; -select * from performance_schema.session_account_connect_attrs; -select * from performance_schema.session_connect_attrs; -select * from performance_schema.setup_actors; -select * from performance_schema.setup_consumers; -select * from performance_schema.setup_instruments; -select * from performance_schema.setup_objects; -select * from performance_schema.setup_timers; -select * from performance_schema.socket_instances; -select * from performance_schema.socket_summary_by_instance; -select * from performance_schema.socket_summary_by_event_name; -select * from performance_schema.table_io_waits_summary_by_index_usage; -select * from performance_schema.table_io_waits_summary_by_table; -select * from performance_schema.table_lock_waits_summary_by_table; -select * from performance_schema.threads; -select * from performance_schema.users; -show variables where -`Variable_name` != "performance_schema_max_statement_classes" and -`Variable_name` like "performance_schema%"; -Variable_name Value -performance_schema OFF -performance_schema_accounts_size 100 -performance_schema_digests_size 200 -performance_schema_events_stages_history_long_size 1000 -performance_schema_events_stages_history_size 10 -performance_schema_events_statements_history_long_size 1000 -performance_schema_events_statements_history_size 10 -performance_schema_events_waits_history_long_size 10000 -performance_schema_events_waits_history_size 10 -performance_schema_hosts_size 100 -performance_schema_max_cond_classes 80 -performance_schema_max_cond_instances 1000 -performance_schema_max_digest_length 1024 -performance_schema_max_file_classes 50 -performance_schema_max_file_handles 32768 -performance_schema_max_file_instances 10000 -performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 5000 -performance_schema_max_rwlock_classes 40 -performance_schema_max_rwlock_instances 5000 -performance_schema_max_socket_classes 10 -performance_schema_max_socket_instances 1000 -performance_schema_max_stage_classes 150 -performance_schema_max_table_handles 1000 -performance_schema_max_table_instances 500 -performance_schema_max_thread_classes 50 -performance_schema_max_thread_instances 200 -performance_schema_session_connect_attrs_size 2048 -performance_schema_setup_actors_size 100 -performance_schema_setup_objects_size 100 -performance_schema_users_size 100 show engine PERFORMANCE_SCHEMA status; show status like "performance_schema%"; show status like "performance_schema%"; @@ -131,6 +44,9 @@ Performance_schema_table_instances_lost 0 Performance_schema_thread_classes_lost 0 Performance_schema_thread_instances_lost 0 Performance_schema_users_lost 0 +show variables like "performance_schema"; +Variable_name Value +performance_schema OFF select * from performance_schema.setup_consumers; NAME ENABLED select * from performance_schema.setup_instruments; diff --git a/mysql-test/suite/perfschema/r/start_server_on.result b/mysql-test/suite/perfschema/r/start_server_on.result index a270b4a6320..cf210c0935c 100644 --- a/mysql-test/suite/perfschema/r/start_server_on.result +++ b/mysql-test/suite/perfschema/r/start_server_on.result @@ -17,93 +17,6 @@ count(*) > 3 select count(*) from performance_schema.setup_timers; count(*) 4 -select * from performance_schema.accounts; -select * from performance_schema.cond_instances; -select * from performance_schema.events_stages_current; -select * from performance_schema.events_stages_history; -select * from performance_schema.events_stages_history_long; -select * from performance_schema.events_stages_summary_by_account_by_event_name; -select * from performance_schema.events_stages_summary_by_host_by_event_name; -select * from performance_schema.events_stages_summary_by_thread_by_event_name; -select * from performance_schema.events_stages_summary_by_user_by_event_name; -select * from performance_schema.events_stages_summary_global_by_event_name; -select * from performance_schema.events_statements_current; -select * from performance_schema.events_statements_history; -select * from performance_schema.events_statements_history_long; -select * from performance_schema.events_statements_summary_by_account_by_event_name; -select * from performance_schema.events_statements_summary_by_digest; -select * from performance_schema.events_statements_summary_by_host_by_event_name; -select * from performance_schema.events_statements_summary_by_thread_by_event_name; -select * from performance_schema.events_statements_summary_by_user_by_event_name; -select * from performance_schema.events_statements_summary_global_by_event_name; -select * from performance_schema.events_waits_current; -select * from performance_schema.events_waits_history; -select * from performance_schema.events_waits_history_long; -select * from performance_schema.events_waits_summary_by_account_by_event_name; -select * from performance_schema.events_waits_summary_by_host_by_event_name; -select * from performance_schema.events_waits_summary_by_instance; -select * from performance_schema.events_waits_summary_by_thread_by_event_name; -select * from performance_schema.events_waits_summary_by_user_by_event_name; -select * from performance_schema.events_waits_summary_global_by_event_name; -select * from performance_schema.file_instances; -select * from performance_schema.file_summary_by_event_name; -select * from performance_schema.file_summary_by_instance; -select * from performance_schema.host_cache; -select * from performance_schema.hosts; -select * from performance_schema.mutex_instances; -select * from performance_schema.objects_summary_global_by_type; -select * from performance_schema.performance_timers; -select * from performance_schema.rwlock_instances; -select * from performance_schema.session_account_connect_attrs; -select * from performance_schema.session_connect_attrs; -select * from performance_schema.setup_actors; -select * from performance_schema.setup_consumers; -select * from performance_schema.setup_instruments; -select * from performance_schema.setup_objects; -select * from performance_schema.setup_timers; -select * from performance_schema.socket_instances; -select * from performance_schema.socket_summary_by_instance; -select * from performance_schema.socket_summary_by_event_name; -select * from performance_schema.table_io_waits_summary_by_index_usage; -select * from performance_schema.table_io_waits_summary_by_table; -select * from performance_schema.table_lock_waits_summary_by_table; -select * from performance_schema.threads; -select * from performance_schema.users; -show variables where -`Variable_name` != "performance_schema_max_statement_classes" and -`Variable_name` like "performance_schema%"; -Variable_name Value -performance_schema ON -performance_schema_accounts_size 100 -performance_schema_digests_size 200 -performance_schema_events_stages_history_long_size 1000 -performance_schema_events_stages_history_size 10 -performance_schema_events_statements_history_long_size 1000 -performance_schema_events_statements_history_size 10 -performance_schema_events_waits_history_long_size 10000 -performance_schema_events_waits_history_size 10 -performance_schema_hosts_size 100 -performance_schema_max_cond_classes 80 -performance_schema_max_cond_instances 1000 -performance_schema_max_digest_length 1024 -performance_schema_max_file_classes 50 -performance_schema_max_file_handles 32768 -performance_schema_max_file_instances 10000 -performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 5000 -performance_schema_max_rwlock_classes 40 -performance_schema_max_rwlock_instances 5000 -performance_schema_max_socket_classes 10 -performance_schema_max_socket_instances 1000 -performance_schema_max_stage_classes 150 -performance_schema_max_table_handles 1000 -performance_schema_max_table_instances 500 -performance_schema_max_thread_classes 50 -performance_schema_max_thread_instances 200 -performance_schema_session_connect_attrs_size 2048 -performance_schema_setup_actors_size 100 -performance_schema_setup_objects_size 100 -performance_schema_users_size 100 show engine PERFORMANCE_SCHEMA status; show status like "performance_schema%"; show status like "performance_schema%"; diff --git a/mysql-test/suite/perfschema/r/start_server_variables.result b/mysql-test/suite/perfschema/r/start_server_variables.result new file mode 100644 index 00000000000..3f2df9603b3 --- /dev/null +++ b/mysql-test/suite/perfschema/r/start_server_variables.result @@ -0,0 +1,56 @@ +show databases; +Database +information_schema +mtr +mysql +performance_schema +test +select count(*) from performance_schema.performance_timers; +count(*) +5 +select count(*) from performance_schema.setup_consumers; +count(*) +12 +select count(*) > 3 from performance_schema.setup_instruments; +count(*) > 3 +1 +select count(*) from performance_schema.setup_timers; +count(*) +4 +show engine PERFORMANCE_SCHEMA status; +show status like "performance_schema%"; +show variables where +`Variable_name` != "performance_schema_max_statement_classes" and +`Variable_name` like "performance_schema%"; +Variable_name Value +performance_schema ON +performance_schema_accounts_size 100 +performance_schema_digests_size 200 +performance_schema_events_stages_history_long_size 1000 +performance_schema_events_stages_history_size 10 +performance_schema_events_statements_history_long_size 1000 +performance_schema_events_statements_history_size 10 +performance_schema_events_waits_history_long_size 10000 +performance_schema_events_waits_history_size 10 +performance_schema_hosts_size 100 +performance_schema_max_cond_classes 80 +performance_schema_max_cond_instances 1000 +performance_schema_max_digest_length 1024 +performance_schema_max_file_classes 50 +performance_schema_max_file_handles 32768 +performance_schema_max_file_instances 10000 +performance_schema_max_mutex_classes 200 +performance_schema_max_mutex_instances 5000 +performance_schema_max_rwlock_classes 40 +performance_schema_max_rwlock_instances 5000 +performance_schema_max_socket_classes 10 +performance_schema_max_socket_instances 1000 +performance_schema_max_stage_classes 160 +performance_schema_max_table_handles 1000 +performance_schema_max_table_instances 500 +performance_schema_max_thread_classes 50 +performance_schema_max_thread_instances 200 +performance_schema_session_connect_attrs_size 2048 +performance_schema_setup_actors_size 100 +performance_schema_setup_objects_size 100 +performance_schema_users_size 100 diff --git a/mysql-test/suite/perfschema/r/table_aggregate_global_2u_2t.result b/mysql-test/suite/perfschema/r/table_aggregate_global_2u_2t.result index 73a4696070d..dfaa91a3fbc 100644 --- a/mysql-test/suite/perfschema/r/table_aggregate_global_2u_2t.result +++ b/mysql-test/suite/perfschema/r/table_aggregate_global_2u_2t.result @@ -39,66 +39,6 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name; truncate performance_schema.events_waits_summary_by_host_by_event_name; truncate performance_schema.events_waits_summary_global_by_event_name; truncate performance_schema.events_waits_history_long; -show variables where -`Variable_name` != "performance_schema_max_statement_classes" and -`Variable_name` like "performance_schema%"; -Variable_name Value -performance_schema ON -performance_schema_accounts_size 100 -performance_schema_digests_size 200 -performance_schema_events_stages_history_long_size 1000 -performance_schema_events_stages_history_size 10 -performance_schema_events_statements_history_long_size 1000 -performance_schema_events_statements_history_size 10 -performance_schema_events_waits_history_long_size 10000 -performance_schema_events_waits_history_size 10 -performance_schema_hosts_size 100 -performance_schema_max_cond_classes 80 -performance_schema_max_cond_instances 1000 -performance_schema_max_digest_length 1024 -performance_schema_max_file_classes 50 -performance_schema_max_file_handles 32768 -performance_schema_max_file_instances 10000 -performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 5000 -performance_schema_max_rwlock_classes 40 -performance_schema_max_rwlock_instances 5000 -performance_schema_max_socket_classes 10 -performance_schema_max_socket_instances 1000 -performance_schema_max_stage_classes 150 -performance_schema_max_table_handles 1000 -performance_schema_max_table_instances 500 -performance_schema_max_thread_classes 50 -performance_schema_max_thread_instances 200 -performance_schema_session_connect_attrs_size 2048 -performance_schema_setup_actors_size 100 -performance_schema_setup_objects_size 100 -performance_schema_users_size 100 -show status like "performance_schema%"; -Variable_name Value -Performance_schema_accounts_lost 0 -Performance_schema_cond_classes_lost 0 -Performance_schema_cond_instances_lost 0 -Performance_schema_digest_lost 0 -Performance_schema_file_classes_lost 0 -Performance_schema_file_handles_lost 0 -Performance_schema_file_instances_lost 0 -Performance_schema_hosts_lost 0 -Performance_schema_locker_lost 0 -Performance_schema_mutex_classes_lost 0 -Performance_schema_mutex_instances_lost 0 -Performance_schema_rwlock_classes_lost 0 -Performance_schema_rwlock_instances_lost 0 -Performance_schema_session_connect_attrs_lost 0 -Performance_schema_socket_classes_lost 0 -Performance_schema_socket_instances_lost 0 -Performance_schema_stage_classes_lost 0 -Performance_schema_statement_classes_lost 0 -Performance_schema_table_handles_lost 0 -Performance_schema_table_instances_lost 0 -Performance_schema_thread_classes_lost 0 -Performance_schema_thread_instances_lost 0 -Performance_schema_users_lost 0 "================== Step 1 ==================" call dump_thread(); username status diff --git a/mysql-test/suite/perfschema/r/table_aggregate_global_2u_3t.result b/mysql-test/suite/perfschema/r/table_aggregate_global_2u_3t.result index bb7cfdc92c7..2a6537fd6bd 100644 --- a/mysql-test/suite/perfschema/r/table_aggregate_global_2u_3t.result +++ b/mysql-test/suite/perfschema/r/table_aggregate_global_2u_3t.result @@ -38,66 +38,6 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name; truncate performance_schema.events_waits_summary_by_host_by_event_name; truncate performance_schema.events_waits_summary_global_by_event_name; truncate performance_schema.events_waits_history_long; -show variables where -`Variable_name` != "performance_schema_max_statement_classes" and -`Variable_name` like "performance_schema%"; -Variable_name Value -performance_schema ON -performance_schema_accounts_size 100 -performance_schema_digests_size 200 -performance_schema_events_stages_history_long_size 1000 -performance_schema_events_stages_history_size 10 -performance_schema_events_statements_history_long_size 1000 -performance_schema_events_statements_history_size 10 -performance_schema_events_waits_history_long_size 10000 -performance_schema_events_waits_history_size 10 -performance_schema_hosts_size 100 -performance_schema_max_cond_classes 80 -performance_schema_max_cond_instances 1000 -performance_schema_max_digest_length 1024 -performance_schema_max_file_classes 50 -performance_schema_max_file_handles 32768 -performance_schema_max_file_instances 10000 -performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 5000 -performance_schema_max_rwlock_classes 40 -performance_schema_max_rwlock_instances 5000 -performance_schema_max_socket_classes 10 -performance_schema_max_socket_instances 1000 -performance_schema_max_stage_classes 150 -performance_schema_max_table_handles 1000 -performance_schema_max_table_instances 500 -performance_schema_max_thread_classes 50 -performance_schema_max_thread_instances 200 -performance_schema_session_connect_attrs_size 2048 -performance_schema_setup_actors_size 100 -performance_schema_setup_objects_size 100 -performance_schema_users_size 100 -show status like "performance_schema%"; -Variable_name Value -Performance_schema_accounts_lost 0 -Performance_schema_cond_classes_lost 0 -Performance_schema_cond_instances_lost 0 -Performance_schema_digest_lost 0 -Performance_schema_file_classes_lost 0 -Performance_schema_file_handles_lost 0 -Performance_schema_file_instances_lost 0 -Performance_schema_hosts_lost 0 -Performance_schema_locker_lost 0 -Performance_schema_mutex_classes_lost 0 -Performance_schema_mutex_instances_lost 0 -Performance_schema_rwlock_classes_lost 0 -Performance_schema_rwlock_instances_lost 0 -Performance_schema_session_connect_attrs_lost 0 -Performance_schema_socket_classes_lost 0 -Performance_schema_socket_instances_lost 0 -Performance_schema_stage_classes_lost 0 -Performance_schema_statement_classes_lost 0 -Performance_schema_table_handles_lost 0 -Performance_schema_table_instances_lost 0 -Performance_schema_thread_classes_lost 0 -Performance_schema_thread_instances_lost 0 -Performance_schema_users_lost 0 "================== Step 1 ==================" call dump_thread(); username status diff --git a/mysql-test/suite/perfschema/r/table_aggregate_global_4u_2t.result b/mysql-test/suite/perfschema/r/table_aggregate_global_4u_2t.result index 816df3de09a..3eddd735aa2 100644 --- a/mysql-test/suite/perfschema/r/table_aggregate_global_4u_2t.result +++ b/mysql-test/suite/perfschema/r/table_aggregate_global_4u_2t.result @@ -39,66 +39,6 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name; truncate performance_schema.events_waits_summary_by_host_by_event_name; truncate performance_schema.events_waits_summary_global_by_event_name; truncate performance_schema.events_waits_history_long; -show variables where -`Variable_name` != "performance_schema_max_statement_classes" and -`Variable_name` like "performance_schema%"; -Variable_name Value -performance_schema ON -performance_schema_accounts_size 100 -performance_schema_digests_size 200 -performance_schema_events_stages_history_long_size 1000 -performance_schema_events_stages_history_size 10 -performance_schema_events_statements_history_long_size 1000 -performance_schema_events_statements_history_size 10 -performance_schema_events_waits_history_long_size 10000 -performance_schema_events_waits_history_size 10 -performance_schema_hosts_size 100 -performance_schema_max_cond_classes 80 -performance_schema_max_cond_instances 1000 -performance_schema_max_digest_length 1024 -performance_schema_max_file_classes 50 -performance_schema_max_file_handles 32768 -performance_schema_max_file_instances 10000 -performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 5000 -performance_schema_max_rwlock_classes 40 -performance_schema_max_rwlock_instances 5000 -performance_schema_max_socket_classes 10 -performance_schema_max_socket_instances 1000 -performance_schema_max_stage_classes 150 -performance_schema_max_table_handles 1000 -performance_schema_max_table_instances 500 -performance_schema_max_thread_classes 50 -performance_schema_max_thread_instances 200 -performance_schema_session_connect_attrs_size 2048 -performance_schema_setup_actors_size 100 -performance_schema_setup_objects_size 100 -performance_schema_users_size 100 -show status like "performance_schema%"; -Variable_name Value -Performance_schema_accounts_lost 0 -Performance_schema_cond_classes_lost 0 -Performance_schema_cond_instances_lost 0 -Performance_schema_digest_lost 0 -Performance_schema_file_classes_lost 0 -Performance_schema_file_handles_lost 0 -Performance_schema_file_instances_lost 0 -Performance_schema_hosts_lost 0 -Performance_schema_locker_lost 0 -Performance_schema_mutex_classes_lost 0 -Performance_schema_mutex_instances_lost 0 -Performance_schema_rwlock_classes_lost 0 -Performance_schema_rwlock_instances_lost 0 -Performance_schema_session_connect_attrs_lost 0 -Performance_schema_socket_classes_lost 0 -Performance_schema_socket_instances_lost 0 -Performance_schema_stage_classes_lost 0 -Performance_schema_statement_classes_lost 0 -Performance_schema_table_handles_lost 0 -Performance_schema_table_instances_lost 0 -Performance_schema_thread_classes_lost 0 -Performance_schema_thread_instances_lost 0 -Performance_schema_users_lost 0 "================== Step 1 ==================" call dump_thread(); username status diff --git a/mysql-test/suite/perfschema/r/table_aggregate_global_4u_3t.result b/mysql-test/suite/perfschema/r/table_aggregate_global_4u_3t.result index d44488d75f9..fed189a7667 100644 --- a/mysql-test/suite/perfschema/r/table_aggregate_global_4u_3t.result +++ b/mysql-test/suite/perfschema/r/table_aggregate_global_4u_3t.result @@ -38,66 +38,6 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name; truncate performance_schema.events_waits_summary_by_host_by_event_name; truncate performance_schema.events_waits_summary_global_by_event_name; truncate performance_schema.events_waits_history_long; -show variables where -`Variable_name` != "performance_schema_max_statement_classes" and -`Variable_name` like "performance_schema%"; -Variable_name Value -performance_schema ON -performance_schema_accounts_size 100 -performance_schema_digests_size 200 -performance_schema_events_stages_history_long_size 1000 -performance_schema_events_stages_history_size 10 -performance_schema_events_statements_history_long_size 1000 -performance_schema_events_statements_history_size 10 -performance_schema_events_waits_history_long_size 10000 -performance_schema_events_waits_history_size 10 -performance_schema_hosts_size 100 -performance_schema_max_cond_classes 80 -performance_schema_max_cond_instances 1000 -performance_schema_max_digest_length 1024 -performance_schema_max_file_classes 50 -performance_schema_max_file_handles 32768 -performance_schema_max_file_instances 10000 -performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 5000 -performance_schema_max_rwlock_classes 40 -performance_schema_max_rwlock_instances 5000 -performance_schema_max_socket_classes 10 -performance_schema_max_socket_instances 1000 -performance_schema_max_stage_classes 150 -performance_schema_max_table_handles 1000 -performance_schema_max_table_instances 500 -performance_schema_max_thread_classes 50 -performance_schema_max_thread_instances 200 -performance_schema_session_connect_attrs_size 2048 -performance_schema_setup_actors_size 100 -performance_schema_setup_objects_size 100 -performance_schema_users_size 100 -show status like "performance_schema%"; -Variable_name Value -Performance_schema_accounts_lost 0 -Performance_schema_cond_classes_lost 0 -Performance_schema_cond_instances_lost 0 -Performance_schema_digest_lost 0 -Performance_schema_file_classes_lost 0 -Performance_schema_file_handles_lost 0 -Performance_schema_file_instances_lost 0 -Performance_schema_hosts_lost 0 -Performance_schema_locker_lost 0 -Performance_schema_mutex_classes_lost 0 -Performance_schema_mutex_instances_lost 0 -Performance_schema_rwlock_classes_lost 0 -Performance_schema_rwlock_instances_lost 0 -Performance_schema_session_connect_attrs_lost 0 -Performance_schema_socket_classes_lost 0 -Performance_schema_socket_instances_lost 0 -Performance_schema_stage_classes_lost 0 -Performance_schema_statement_classes_lost 0 -Performance_schema_table_handles_lost 0 -Performance_schema_table_instances_lost 0 -Performance_schema_thread_classes_lost 0 -Performance_schema_thread_instances_lost 0 -Performance_schema_users_lost 0 "================== Step 1 ==================" call dump_thread(); username status diff --git a/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_2t.result b/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_2t.result index a70e6ee1df5..ee95e4c0417 100644 --- a/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_2t.result +++ b/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_2t.result @@ -37,66 +37,6 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name; truncate performance_schema.events_waits_summary_by_host_by_event_name; truncate performance_schema.events_waits_summary_global_by_event_name; truncate performance_schema.events_waits_history_long; -show variables where -`Variable_name` != "performance_schema_max_statement_classes" and -`Variable_name` like "performance_schema%"; -Variable_name Value -performance_schema ON -performance_schema_accounts_size 100 -performance_schema_digests_size 200 -performance_schema_events_stages_history_long_size 1000 -performance_schema_events_stages_history_size 10 -performance_schema_events_statements_history_long_size 1000 -performance_schema_events_statements_history_size 10 -performance_schema_events_waits_history_long_size 10000 -performance_schema_events_waits_history_size 10 -performance_schema_hosts_size 100 -performance_schema_max_cond_classes 80 -performance_schema_max_cond_instances 1000 -performance_schema_max_digest_length 1024 -performance_schema_max_file_classes 50 -performance_schema_max_file_handles 32768 -performance_schema_max_file_instances 10000 -performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 5000 -performance_schema_max_rwlock_classes 40 -performance_schema_max_rwlock_instances 5000 -performance_schema_max_socket_classes 10 -performance_schema_max_socket_instances 1000 -performance_schema_max_stage_classes 150 -performance_schema_max_table_handles 1000 -performance_schema_max_table_instances 500 -performance_schema_max_thread_classes 50 -performance_schema_max_thread_instances 200 -performance_schema_session_connect_attrs_size 2048 -performance_schema_setup_actors_size 100 -performance_schema_setup_objects_size 100 -performance_schema_users_size 100 -show status like "performance_schema%"; -Variable_name Value -Performance_schema_accounts_lost 0 -Performance_schema_cond_classes_lost 0 -Performance_schema_cond_instances_lost 0 -Performance_schema_digest_lost 0 -Performance_schema_file_classes_lost 0 -Performance_schema_file_handles_lost 0 -Performance_schema_file_instances_lost 0 -Performance_schema_hosts_lost 0 -Performance_schema_locker_lost 0 -Performance_schema_mutex_classes_lost 0 -Performance_schema_mutex_instances_lost 0 -Performance_schema_rwlock_classes_lost 0 -Performance_schema_rwlock_instances_lost 0 -Performance_schema_session_connect_attrs_lost 0 -Performance_schema_socket_classes_lost 0 -Performance_schema_socket_instances_lost 0 -Performance_schema_stage_classes_lost 0 -Performance_schema_statement_classes_lost 0 -Performance_schema_table_handles_lost 0 -Performance_schema_table_instances_lost 0 -Performance_schema_thread_classes_lost 0 -Performance_schema_thread_instances_lost 0 -Performance_schema_users_lost 0 "================== Step 1 ==================" call dump_thread(); username status diff --git a/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_3t.result b/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_3t.result index d4d19f5db05..d6e4e674258 100644 --- a/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_3t.result +++ b/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_3t.result @@ -36,66 +36,6 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name; truncate performance_schema.events_waits_summary_by_host_by_event_name; truncate performance_schema.events_waits_summary_global_by_event_name; truncate performance_schema.events_waits_history_long; -show variables where -`Variable_name` != "performance_schema_max_statement_classes" and -`Variable_name` like "performance_schema%"; -Variable_name Value -performance_schema ON -performance_schema_accounts_size 100 -performance_schema_digests_size 200 -performance_schema_events_stages_history_long_size 1000 -performance_schema_events_stages_history_size 10 -performance_schema_events_statements_history_long_size 1000 -performance_schema_events_statements_history_size 10 -performance_schema_events_waits_history_long_size 10000 -performance_schema_events_waits_history_size 10 -performance_schema_hosts_size 100 -performance_schema_max_cond_classes 80 -performance_schema_max_cond_instances 1000 -performance_schema_max_digest_length 1024 -performance_schema_max_file_classes 50 -performance_schema_max_file_handles 32768 -performance_schema_max_file_instances 10000 -performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 5000 -performance_schema_max_rwlock_classes 40 -performance_schema_max_rwlock_instances 5000 -performance_schema_max_socket_classes 10 -performance_schema_max_socket_instances 1000 -performance_schema_max_stage_classes 150 -performance_schema_max_table_handles 1000 -performance_schema_max_table_instances 500 -performance_schema_max_thread_classes 50 -performance_schema_max_thread_instances 200 -performance_schema_session_connect_attrs_size 2048 -performance_schema_setup_actors_size 100 -performance_schema_setup_objects_size 100 -performance_schema_users_size 100 -show status like "performance_schema%"; -Variable_name Value -Performance_schema_accounts_lost 0 -Performance_schema_cond_classes_lost 0 -Performance_schema_cond_instances_lost 0 -Performance_schema_digest_lost 0 -Performance_schema_file_classes_lost 0 -Performance_schema_file_handles_lost 0 -Performance_schema_file_instances_lost 0 -Performance_schema_hosts_lost 0 -Performance_schema_locker_lost 0 -Performance_schema_mutex_classes_lost 0 -Performance_schema_mutex_instances_lost 0 -Performance_schema_rwlock_classes_lost 0 -Performance_schema_rwlock_instances_lost 0 -Performance_schema_session_connect_attrs_lost 0 -Performance_schema_socket_classes_lost 0 -Performance_schema_socket_instances_lost 0 -Performance_schema_stage_classes_lost 0 -Performance_schema_statement_classes_lost 0 -Performance_schema_table_handles_lost 0 -Performance_schema_table_instances_lost 0 -Performance_schema_thread_classes_lost 0 -Performance_schema_thread_instances_lost 0 -Performance_schema_users_lost 0 "================== Step 1 ==================" call dump_thread(); username status diff --git a/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_2t.result b/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_2t.result index 7fa8781ad49..2d2a55efa77 100644 --- a/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_2t.result +++ b/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_2t.result @@ -37,66 +37,6 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name; truncate performance_schema.events_waits_summary_by_host_by_event_name; truncate performance_schema.events_waits_summary_global_by_event_name; truncate performance_schema.events_waits_history_long; -show variables where -`Variable_name` != "performance_schema_max_statement_classes" and -`Variable_name` like "performance_schema%"; -Variable_name Value -performance_schema ON -performance_schema_accounts_size 100 -performance_schema_digests_size 200 -performance_schema_events_stages_history_long_size 1000 -performance_schema_events_stages_history_size 10 -performance_schema_events_statements_history_long_size 1000 -performance_schema_events_statements_history_size 10 -performance_schema_events_waits_history_long_size 10000 -performance_schema_events_waits_history_size 10 -performance_schema_hosts_size 100 -performance_schema_max_cond_classes 80 -performance_schema_max_cond_instances 1000 -performance_schema_max_digest_length 1024 -performance_schema_max_file_classes 50 -performance_schema_max_file_handles 32768 -performance_schema_max_file_instances 10000 -performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 5000 -performance_schema_max_rwlock_classes 40 -performance_schema_max_rwlock_instances 5000 -performance_schema_max_socket_classes 10 -performance_schema_max_socket_instances 1000 -performance_schema_max_stage_classes 150 -performance_schema_max_table_handles 1000 -performance_schema_max_table_instances 500 -performance_schema_max_thread_classes 50 -performance_schema_max_thread_instances 200 -performance_schema_session_connect_attrs_size 2048 -performance_schema_setup_actors_size 100 -performance_schema_setup_objects_size 100 -performance_schema_users_size 100 -show status like "performance_schema%"; -Variable_name Value -Performance_schema_accounts_lost 0 -Performance_schema_cond_classes_lost 0 -Performance_schema_cond_instances_lost 0 -Performance_schema_digest_lost 0 -Performance_schema_file_classes_lost 0 -Performance_schema_file_handles_lost 0 -Performance_schema_file_instances_lost 0 -Performance_schema_hosts_lost 0 -Performance_schema_locker_lost 0 -Performance_schema_mutex_classes_lost 0 -Performance_schema_mutex_instances_lost 0 -Performance_schema_rwlock_classes_lost 0 -Performance_schema_rwlock_instances_lost 0 -Performance_schema_session_connect_attrs_lost 0 -Performance_schema_socket_classes_lost 0 -Performance_schema_socket_instances_lost 0 -Performance_schema_stage_classes_lost 0 -Performance_schema_statement_classes_lost 0 -Performance_schema_table_handles_lost 0 -Performance_schema_table_instances_lost 0 -Performance_schema_thread_classes_lost 0 -Performance_schema_thread_instances_lost 0 -Performance_schema_users_lost 0 "================== Step 1 ==================" call dump_thread(); username status diff --git a/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_3t.result b/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_3t.result index e138ad6542a..de8fc4702a6 100644 --- a/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_3t.result +++ b/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_3t.result @@ -36,66 +36,6 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name; truncate performance_schema.events_waits_summary_by_host_by_event_name; truncate performance_schema.events_waits_summary_global_by_event_name; truncate performance_schema.events_waits_history_long; -show variables where -`Variable_name` != "performance_schema_max_statement_classes" and -`Variable_name` like "performance_schema%"; -Variable_name Value -performance_schema ON -performance_schema_accounts_size 100 -performance_schema_digests_size 200 -performance_schema_events_stages_history_long_size 1000 -performance_schema_events_stages_history_size 10 -performance_schema_events_statements_history_long_size 1000 -performance_schema_events_statements_history_size 10 -performance_schema_events_waits_history_long_size 10000 -performance_schema_events_waits_history_size 10 -performance_schema_hosts_size 100 -performance_schema_max_cond_classes 80 -performance_schema_max_cond_instances 1000 -performance_schema_max_digest_length 1024 -performance_schema_max_file_classes 50 -performance_schema_max_file_handles 32768 -performance_schema_max_file_instances 10000 -performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 5000 -performance_schema_max_rwlock_classes 40 -performance_schema_max_rwlock_instances 5000 -performance_schema_max_socket_classes 10 -performance_schema_max_socket_instances 1000 -performance_schema_max_stage_classes 150 -performance_schema_max_table_handles 1000 -performance_schema_max_table_instances 500 -performance_schema_max_thread_classes 50 -performance_schema_max_thread_instances 200 -performance_schema_session_connect_attrs_size 2048 -performance_schema_setup_actors_size 100 -performance_schema_setup_objects_size 100 -performance_schema_users_size 100 -show status like "performance_schema%"; -Variable_name Value -Performance_schema_accounts_lost 0 -Performance_schema_cond_classes_lost 0 -Performance_schema_cond_instances_lost 0 -Performance_schema_digest_lost 0 -Performance_schema_file_classes_lost 0 -Performance_schema_file_handles_lost 0 -Performance_schema_file_instances_lost 0 -Performance_schema_hosts_lost 0 -Performance_schema_locker_lost 0 -Performance_schema_mutex_classes_lost 0 -Performance_schema_mutex_instances_lost 0 -Performance_schema_rwlock_classes_lost 0 -Performance_schema_rwlock_instances_lost 0 -Performance_schema_session_connect_attrs_lost 0 -Performance_schema_socket_classes_lost 0 -Performance_schema_socket_instances_lost 0 -Performance_schema_stage_classes_lost 0 -Performance_schema_statement_classes_lost 0 -Performance_schema_table_handles_lost 0 -Performance_schema_table_instances_lost 0 -Performance_schema_thread_classes_lost 0 -Performance_schema_thread_instances_lost 0 -Performance_schema_users_lost 0 "================== Step 1 ==================" call dump_thread(); username status diff --git a/mysql-test/suite/perfschema/r/table_aggregate_off.result b/mysql-test/suite/perfschema/r/table_aggregate_off.result index 9384f07f0f0..77a714563fe 100644 --- a/mysql-test/suite/perfschema/r/table_aggregate_off.result +++ b/mysql-test/suite/perfschema/r/table_aggregate_off.result @@ -38,66 +38,6 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name; truncate performance_schema.events_waits_summary_by_host_by_event_name; truncate performance_schema.events_waits_summary_global_by_event_name; truncate performance_schema.events_waits_history_long; -show variables where -`Variable_name` != "performance_schema_max_statement_classes" and -`Variable_name` like "performance_schema%"; -Variable_name Value -performance_schema ON -performance_schema_accounts_size 100 -performance_schema_digests_size 200 -performance_schema_events_stages_history_long_size 1000 -performance_schema_events_stages_history_size 10 -performance_schema_events_statements_history_long_size 1000 -performance_schema_events_statements_history_size 10 -performance_schema_events_waits_history_long_size 10000 -performance_schema_events_waits_history_size 10 -performance_schema_hosts_size 100 -performance_schema_max_cond_classes 80 -performance_schema_max_cond_instances 1000 -performance_schema_max_digest_length 1024 -performance_schema_max_file_classes 50 -performance_schema_max_file_handles 32768 -performance_schema_max_file_instances 10000 -performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 5000 -performance_schema_max_rwlock_classes 40 -performance_schema_max_rwlock_instances 5000 -performance_schema_max_socket_classes 10 -performance_schema_max_socket_instances 1000 -performance_schema_max_stage_classes 150 -performance_schema_max_table_handles 1000 -performance_schema_max_table_instances 500 -performance_schema_max_thread_classes 50 -performance_schema_max_thread_instances 200 -performance_schema_session_connect_attrs_size 2048 -performance_schema_setup_actors_size 100 -performance_schema_setup_objects_size 100 -performance_schema_users_size 100 -show status like "performance_schema%"; -Variable_name Value -Performance_schema_accounts_lost 0 -Performance_schema_cond_classes_lost 0 -Performance_schema_cond_instances_lost 0 -Performance_schema_digest_lost 0 -Performance_schema_file_classes_lost 0 -Performance_schema_file_handles_lost 0 -Performance_schema_file_instances_lost 0 -Performance_schema_hosts_lost 0 -Performance_schema_locker_lost 0 -Performance_schema_mutex_classes_lost 0 -Performance_schema_mutex_instances_lost 0 -Performance_schema_rwlock_classes_lost 0 -Performance_schema_rwlock_instances_lost 0 -Performance_schema_session_connect_attrs_lost 0 -Performance_schema_socket_classes_lost 0 -Performance_schema_socket_instances_lost 0 -Performance_schema_stage_classes_lost 0 -Performance_schema_statement_classes_lost 0 -Performance_schema_table_handles_lost 0 -Performance_schema_table_instances_lost 0 -Performance_schema_thread_classes_lost 0 -Performance_schema_thread_instances_lost 0 -Performance_schema_users_lost 0 "================== Step 1 ==================" call dump_thread(); username status diff --git a/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_2t.result b/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_2t.result index 42785a22c32..c176679a95d 100644 --- a/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_2t.result +++ b/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_2t.result @@ -39,66 +39,6 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name; truncate performance_schema.events_waits_summary_by_host_by_event_name; truncate performance_schema.events_waits_summary_global_by_event_name; truncate performance_schema.events_waits_history_long; -show variables where -`Variable_name` != "performance_schema_max_statement_classes" and -`Variable_name` like "performance_schema%"; -Variable_name Value -performance_schema ON -performance_schema_accounts_size 100 -performance_schema_digests_size 200 -performance_schema_events_stages_history_long_size 1000 -performance_schema_events_stages_history_size 10 -performance_schema_events_statements_history_long_size 1000 -performance_schema_events_statements_history_size 10 -performance_schema_events_waits_history_long_size 10000 -performance_schema_events_waits_history_size 10 -performance_schema_hosts_size 100 -performance_schema_max_cond_classes 80 -performance_schema_max_cond_instances 1000 -performance_schema_max_digest_length 1024 -performance_schema_max_file_classes 50 -performance_schema_max_file_handles 32768 -performance_schema_max_file_instances 10000 -performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 5000 -performance_schema_max_rwlock_classes 40 -performance_schema_max_rwlock_instances 5000 -performance_schema_max_socket_classes 10 -performance_schema_max_socket_instances 1000 -performance_schema_max_stage_classes 150 -performance_schema_max_table_handles 1000 -performance_schema_max_table_instances 500 -performance_schema_max_thread_classes 50 -performance_schema_max_thread_instances 200 -performance_schema_session_connect_attrs_size 2048 -performance_schema_setup_actors_size 100 -performance_schema_setup_objects_size 100 -performance_schema_users_size 100 -show status like "performance_schema%"; -Variable_name Value -Performance_schema_accounts_lost 0 -Performance_schema_cond_classes_lost 0 -Performance_schema_cond_instances_lost 0 -Performance_schema_digest_lost 0 -Performance_schema_file_classes_lost 0 -Performance_schema_file_handles_lost 0 -Performance_schema_file_instances_lost 0 -Performance_schema_hosts_lost 0 -Performance_schema_locker_lost 0 -Performance_schema_mutex_classes_lost 0 -Performance_schema_mutex_instances_lost 0 -Performance_schema_rwlock_classes_lost 0 -Performance_schema_rwlock_instances_lost 0 -Performance_schema_session_connect_attrs_lost 0 -Performance_schema_socket_classes_lost 0 -Performance_schema_socket_instances_lost 0 -Performance_schema_stage_classes_lost 0 -Performance_schema_statement_classes_lost 0 -Performance_schema_table_handles_lost 0 -Performance_schema_table_instances_lost 0 -Performance_schema_thread_classes_lost 0 -Performance_schema_thread_instances_lost 0 -Performance_schema_users_lost 0 "================== Step 1 ==================" call dump_thread(); username status diff --git a/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_3t.result b/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_3t.result index 1066228199d..38c8813ea18 100644 --- a/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_3t.result +++ b/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_3t.result @@ -38,66 +38,6 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name; truncate performance_schema.events_waits_summary_by_host_by_event_name; truncate performance_schema.events_waits_summary_global_by_event_name; truncate performance_schema.events_waits_history_long; -show variables where -`Variable_name` != "performance_schema_max_statement_classes" and -`Variable_name` like "performance_schema%"; -Variable_name Value -performance_schema ON -performance_schema_accounts_size 100 -performance_schema_digests_size 200 -performance_schema_events_stages_history_long_size 1000 -performance_schema_events_stages_history_size 10 -performance_schema_events_statements_history_long_size 1000 -performance_schema_events_statements_history_size 10 -performance_schema_events_waits_history_long_size 10000 -performance_schema_events_waits_history_size 10 -performance_schema_hosts_size 100 -performance_schema_max_cond_classes 80 -performance_schema_max_cond_instances 1000 -performance_schema_max_digest_length 1024 -performance_schema_max_file_classes 50 -performance_schema_max_file_handles 32768 -performance_schema_max_file_instances 10000 -performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 5000 -performance_schema_max_rwlock_classes 40 -performance_schema_max_rwlock_instances 5000 -performance_schema_max_socket_classes 10 -performance_schema_max_socket_instances 1000 -performance_schema_max_stage_classes 150 -performance_schema_max_table_handles 1000 -performance_schema_max_table_instances 500 -performance_schema_max_thread_classes 50 -performance_schema_max_thread_instances 200 -performance_schema_session_connect_attrs_size 2048 -performance_schema_setup_actors_size 100 -performance_schema_setup_objects_size 100 -performance_schema_users_size 100 -show status like "performance_schema%"; -Variable_name Value -Performance_schema_accounts_lost 0 -Performance_schema_cond_classes_lost 0 -Performance_schema_cond_instances_lost 0 -Performance_schema_digest_lost 0 -Performance_schema_file_classes_lost 0 -Performance_schema_file_handles_lost 0 -Performance_schema_file_instances_lost 0 -Performance_schema_hosts_lost 0 -Performance_schema_locker_lost 0 -Performance_schema_mutex_classes_lost 0 -Performance_schema_mutex_instances_lost 0 -Performance_schema_rwlock_classes_lost 0 -Performance_schema_rwlock_instances_lost 0 -Performance_schema_session_connect_attrs_lost 0 -Performance_schema_socket_classes_lost 0 -Performance_schema_socket_instances_lost 0 -Performance_schema_stage_classes_lost 0 -Performance_schema_statement_classes_lost 0 -Performance_schema_table_handles_lost 0 -Performance_schema_table_instances_lost 0 -Performance_schema_thread_classes_lost 0 -Performance_schema_thread_instances_lost 0 -Performance_schema_users_lost 0 "================== Step 1 ==================" call dump_thread(); username status diff --git a/mysql-test/suite/perfschema/r/table_aggregate_thread_4u_2t.result b/mysql-test/suite/perfschema/r/table_aggregate_thread_4u_2t.result index 4e36b9d75a6..9144d81c8a0 100644 --- a/mysql-test/suite/perfschema/r/table_aggregate_thread_4u_2t.result +++ b/mysql-test/suite/perfschema/r/table_aggregate_thread_4u_2t.result @@ -39,66 +39,6 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name; truncate performance_schema.events_waits_summary_by_host_by_event_name; truncate performance_schema.events_waits_summary_global_by_event_name; truncate performance_schema.events_waits_history_long; -show variables where -`Variable_name` != "performance_schema_max_statement_classes" and -`Variable_name` like "performance_schema%"; -Variable_name Value -performance_schema ON -performance_schema_accounts_size 100 -performance_schema_digests_size 200 -performance_schema_events_stages_history_long_size 1000 -performance_schema_events_stages_history_size 10 -performance_schema_events_statements_history_long_size 1000 -performance_schema_events_statements_history_size 10 -performance_schema_events_waits_history_long_size 10000 -performance_schema_events_waits_history_size 10 -performance_schema_hosts_size 100 -performance_schema_max_cond_classes 80 -performance_schema_max_cond_instances 1000 -performance_schema_max_digest_length 1024 -performance_schema_max_file_classes 50 -performance_schema_max_file_handles 32768 -performance_schema_max_file_instances 10000 -performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 5000 -performance_schema_max_rwlock_classes 40 -performance_schema_max_rwlock_instances 5000 -performance_schema_max_socket_classes 10 -performance_schema_max_socket_instances 1000 -performance_schema_max_stage_classes 150 -performance_schema_max_table_handles 1000 -performance_schema_max_table_instances 500 -performance_schema_max_thread_classes 50 -performance_schema_max_thread_instances 200 -performance_schema_session_connect_attrs_size 2048 -performance_schema_setup_actors_size 100 -performance_schema_setup_objects_size 100 -performance_schema_users_size 100 -show status like "performance_schema%"; -Variable_name Value -Performance_schema_accounts_lost 0 -Performance_schema_cond_classes_lost 0 -Performance_schema_cond_instances_lost 0 -Performance_schema_digest_lost 0 -Performance_schema_file_classes_lost 0 -Performance_schema_file_handles_lost 0 -Performance_schema_file_instances_lost 0 -Performance_schema_hosts_lost 0 -Performance_schema_locker_lost 0 -Performance_schema_mutex_classes_lost 0 -Performance_schema_mutex_instances_lost 0 -Performance_schema_rwlock_classes_lost 0 -Performance_schema_rwlock_instances_lost 0 -Performance_schema_session_connect_attrs_lost 0 -Performance_schema_socket_classes_lost 0 -Performance_schema_socket_instances_lost 0 -Performance_schema_stage_classes_lost 0 -Performance_schema_statement_classes_lost 0 -Performance_schema_table_handles_lost 0 -Performance_schema_table_instances_lost 0 -Performance_schema_thread_classes_lost 0 -Performance_schema_thread_instances_lost 0 -Performance_schema_users_lost 0 "================== Step 1 ==================" call dump_thread(); username status diff --git a/mysql-test/suite/perfschema/r/table_aggregate_thread_4u_3t.result b/mysql-test/suite/perfschema/r/table_aggregate_thread_4u_3t.result index ee32194b651..10736990dbe 100644 --- a/mysql-test/suite/perfschema/r/table_aggregate_thread_4u_3t.result +++ b/mysql-test/suite/perfschema/r/table_aggregate_thread_4u_3t.result @@ -38,66 +38,6 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name; truncate performance_schema.events_waits_summary_by_host_by_event_name; truncate performance_schema.events_waits_summary_global_by_event_name; truncate performance_schema.events_waits_history_long; -show variables where -`Variable_name` != "performance_schema_max_statement_classes" and -`Variable_name` like "performance_schema%"; -Variable_name Value -performance_schema ON -performance_schema_accounts_size 100 -performance_schema_digests_size 200 -performance_schema_events_stages_history_long_size 1000 -performance_schema_events_stages_history_size 10 -performance_schema_events_statements_history_long_size 1000 -performance_schema_events_statements_history_size 10 -performance_schema_events_waits_history_long_size 10000 -performance_schema_events_waits_history_size 10 -performance_schema_hosts_size 100 -performance_schema_max_cond_classes 80 -performance_schema_max_cond_instances 1000 -performance_schema_max_digest_length 1024 -performance_schema_max_file_classes 50 -performance_schema_max_file_handles 32768 -performance_schema_max_file_instances 10000 -performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 5000 -performance_schema_max_rwlock_classes 40 -performance_schema_max_rwlock_instances 5000 -performance_schema_max_socket_classes 10 -performance_schema_max_socket_instances 1000 -performance_schema_max_stage_classes 150 -performance_schema_max_table_handles 1000 -performance_schema_max_table_instances 500 -performance_schema_max_thread_classes 50 -performance_schema_max_thread_instances 200 -performance_schema_session_connect_attrs_size 2048 -performance_schema_setup_actors_size 100 -performance_schema_setup_objects_size 100 -performance_schema_users_size 100 -show status like "performance_schema%"; -Variable_name Value -Performance_schema_accounts_lost 0 -Performance_schema_cond_classes_lost 0 -Performance_schema_cond_instances_lost 0 -Performance_schema_digest_lost 0 -Performance_schema_file_classes_lost 0 -Performance_schema_file_handles_lost 0 -Performance_schema_file_instances_lost 0 -Performance_schema_hosts_lost 0 -Performance_schema_locker_lost 0 -Performance_schema_mutex_classes_lost 0 -Performance_schema_mutex_instances_lost 0 -Performance_schema_rwlock_classes_lost 0 -Performance_schema_rwlock_instances_lost 0 -Performance_schema_session_connect_attrs_lost 0 -Performance_schema_socket_classes_lost 0 -Performance_schema_socket_instances_lost 0 -Performance_schema_stage_classes_lost 0 -Performance_schema_statement_classes_lost 0 -Performance_schema_table_handles_lost 0 -Performance_schema_table_instances_lost 0 -Performance_schema_thread_classes_lost 0 -Performance_schema_thread_instances_lost 0 -Performance_schema_users_lost 0 "================== Step 1 ==================" call dump_thread(); username status diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_2t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_2t.result index 2d3d2d38079..a8fd0a7eb72 100644 --- a/mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_2t.result +++ b/mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_2t.result @@ -41,66 +41,6 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name; truncate performance_schema.events_waits_summary_by_host_by_event_name; truncate performance_schema.events_waits_summary_global_by_event_name; truncate performance_schema.events_waits_history_long; -show variables where -`Variable_name` != "performance_schema_max_statement_classes" and -`Variable_name` like "performance_schema%"; -Variable_name Value -performance_schema ON -performance_schema_accounts_size 100 -performance_schema_digests_size 200 -performance_schema_events_stages_history_long_size 1000 -performance_schema_events_stages_history_size 10 -performance_schema_events_statements_history_long_size 1000 -performance_schema_events_statements_history_size 10 -performance_schema_events_waits_history_long_size 10000 -performance_schema_events_waits_history_size 10 -performance_schema_hosts_size 100 -performance_schema_max_cond_classes 80 -performance_schema_max_cond_instances 1000 -performance_schema_max_digest_length 1024 -performance_schema_max_file_classes 50 -performance_schema_max_file_handles 32768 -performance_schema_max_file_instances 10000 -performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 5000 -performance_schema_max_rwlock_classes 40 -performance_schema_max_rwlock_instances 5000 -performance_schema_max_socket_classes 10 -performance_schema_max_socket_instances 1000 -performance_schema_max_stage_classes 150 -performance_schema_max_table_handles 1000 -performance_schema_max_table_instances 500 -performance_schema_max_thread_classes 50 -performance_schema_max_thread_instances 200 -performance_schema_session_connect_attrs_size 2048 -performance_schema_setup_actors_size 100 -performance_schema_setup_objects_size 100 -performance_schema_users_size 100 -show status like "performance_schema%"; -Variable_name Value -Performance_schema_accounts_lost 0 -Performance_schema_cond_classes_lost 0 -Performance_schema_cond_instances_lost 0 -Performance_schema_digest_lost 0 -Performance_schema_file_classes_lost 0 -Performance_schema_file_handles_lost 0 -Performance_schema_file_instances_lost 0 -Performance_schema_hosts_lost 0 -Performance_schema_locker_lost 0 -Performance_schema_mutex_classes_lost 0 -Performance_schema_mutex_instances_lost 0 -Performance_schema_rwlock_classes_lost 0 -Performance_schema_rwlock_instances_lost 0 -Performance_schema_session_connect_attrs_lost 0 -Performance_schema_socket_classes_lost 0 -Performance_schema_socket_instances_lost 0 -Performance_schema_stage_classes_lost 0 -Performance_schema_statement_classes_lost 0 -Performance_schema_table_handles_lost 0 -Performance_schema_table_instances_lost 0 -Performance_schema_thread_classes_lost 0 -Performance_schema_thread_instances_lost 0 -Performance_schema_users_lost 0 "================== Step 1 ==================" call dump_thread(); username status diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_3t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_3t.result index b47bf2dbe1e..701a25194f4 100644 --- a/mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_3t.result +++ b/mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_3t.result @@ -40,66 +40,6 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name; truncate performance_schema.events_waits_summary_by_host_by_event_name; truncate performance_schema.events_waits_summary_global_by_event_name; truncate performance_schema.events_waits_history_long; -show variables where -`Variable_name` != "performance_schema_max_statement_classes" and -`Variable_name` like "performance_schema%"; -Variable_name Value -performance_schema ON -performance_schema_accounts_size 100 -performance_schema_digests_size 200 -performance_schema_events_stages_history_long_size 1000 -performance_schema_events_stages_history_size 10 -performance_schema_events_statements_history_long_size 1000 -performance_schema_events_statements_history_size 10 -performance_schema_events_waits_history_long_size 10000 -performance_schema_events_waits_history_size 10 -performance_schema_hosts_size 100 -performance_schema_max_cond_classes 80 -performance_schema_max_cond_instances 1000 -performance_schema_max_digest_length 1024 -performance_schema_max_file_classes 50 -performance_schema_max_file_handles 32768 -performance_schema_max_file_instances 10000 -performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 5000 -performance_schema_max_rwlock_classes 40 -performance_schema_max_rwlock_instances 5000 -performance_schema_max_socket_classes 10 -performance_schema_max_socket_instances 1000 -performance_schema_max_stage_classes 150 -performance_schema_max_table_handles 1000 -performance_schema_max_table_instances 500 -performance_schema_max_thread_classes 50 -performance_schema_max_thread_instances 200 -performance_schema_session_connect_attrs_size 2048 -performance_schema_setup_actors_size 100 -performance_schema_setup_objects_size 100 -performance_schema_users_size 100 -show status like "performance_schema%"; -Variable_name Value -Performance_schema_accounts_lost 0 -Performance_schema_cond_classes_lost 0 -Performance_schema_cond_instances_lost 0 -Performance_schema_digest_lost 0 -Performance_schema_file_classes_lost 0 -Performance_schema_file_handles_lost 0 -Performance_schema_file_instances_lost 0 -Performance_schema_hosts_lost 0 -Performance_schema_locker_lost 0 -Performance_schema_mutex_classes_lost 0 -Performance_schema_mutex_instances_lost 0 -Performance_schema_rwlock_classes_lost 0 -Performance_schema_rwlock_instances_lost 0 -Performance_schema_session_connect_attrs_lost 0 -Performance_schema_socket_classes_lost 0 -Performance_schema_socket_instances_lost 0 -Performance_schema_stage_classes_lost 0 -Performance_schema_statement_classes_lost 0 -Performance_schema_table_handles_lost 0 -Performance_schema_table_instances_lost 0 -Performance_schema_thread_classes_lost 0 -Performance_schema_thread_instances_lost 0 -Performance_schema_users_lost 0 "================== Step 1 ==================" call dump_thread(); username status diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_2t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_2t.result index 92c12d84f0f..4d8d625ee00 100644 --- a/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_2t.result +++ b/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_2t.result @@ -41,66 +41,6 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name; truncate performance_schema.events_waits_summary_by_host_by_event_name; truncate performance_schema.events_waits_summary_global_by_event_name; truncate performance_schema.events_waits_history_long; -show variables where -`Variable_name` != "performance_schema_max_statement_classes" and -`Variable_name` like "performance_schema%"; -Variable_name Value -performance_schema ON -performance_schema_accounts_size 100 -performance_schema_digests_size 200 -performance_schema_events_stages_history_long_size 1000 -performance_schema_events_stages_history_size 10 -performance_schema_events_statements_history_long_size 1000 -performance_schema_events_statements_history_size 10 -performance_schema_events_waits_history_long_size 10000 -performance_schema_events_waits_history_size 10 -performance_schema_hosts_size 100 -performance_schema_max_cond_classes 80 -performance_schema_max_cond_instances 1000 -performance_schema_max_digest_length 1024 -performance_schema_max_file_classes 50 -performance_schema_max_file_handles 32768 -performance_schema_max_file_instances 10000 -performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 5000 -performance_schema_max_rwlock_classes 40 -performance_schema_max_rwlock_instances 5000 -performance_schema_max_socket_classes 10 -performance_schema_max_socket_instances 1000 -performance_schema_max_stage_classes 150 -performance_schema_max_table_handles 1000 -performance_schema_max_table_instances 500 -performance_schema_max_thread_classes 50 -performance_schema_max_thread_instances 200 -performance_schema_session_connect_attrs_size 2048 -performance_schema_setup_actors_size 100 -performance_schema_setup_objects_size 100 -performance_schema_users_size 100 -show status like "performance_schema%"; -Variable_name Value -Performance_schema_accounts_lost 0 -Performance_schema_cond_classes_lost 0 -Performance_schema_cond_instances_lost 0 -Performance_schema_digest_lost 0 -Performance_schema_file_classes_lost 0 -Performance_schema_file_handles_lost 0 -Performance_schema_file_instances_lost 0 -Performance_schema_hosts_lost 0 -Performance_schema_locker_lost 0 -Performance_schema_mutex_classes_lost 0 -Performance_schema_mutex_instances_lost 0 -Performance_schema_rwlock_classes_lost 0 -Performance_schema_rwlock_instances_lost 0 -Performance_schema_session_connect_attrs_lost 0 -Performance_schema_socket_classes_lost 0 -Performance_schema_socket_instances_lost 0 -Performance_schema_stage_classes_lost 0 -Performance_schema_statement_classes_lost 0 -Performance_schema_table_handles_lost 0 -Performance_schema_table_instances_lost 0 -Performance_schema_thread_classes_lost 0 -Performance_schema_thread_instances_lost 0 -Performance_schema_users_lost 0 "================== Step 1 ==================" call dump_thread(); username status diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_3t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_3t.result index 9b78d257e0e..8a8de99fd4f 100644 --- a/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_3t.result +++ b/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_3t.result @@ -40,66 +40,6 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name; truncate performance_schema.events_waits_summary_by_host_by_event_name; truncate performance_schema.events_waits_summary_global_by_event_name; truncate performance_schema.events_waits_history_long; -show variables where -`Variable_name` != "performance_schema_max_statement_classes" and -`Variable_name` like "performance_schema%"; -Variable_name Value -performance_schema ON -performance_schema_accounts_size 100 -performance_schema_digests_size 200 -performance_schema_events_stages_history_long_size 1000 -performance_schema_events_stages_history_size 10 -performance_schema_events_statements_history_long_size 1000 -performance_schema_events_statements_history_size 10 -performance_schema_events_waits_history_long_size 10000 -performance_schema_events_waits_history_size 10 -performance_schema_hosts_size 100 -performance_schema_max_cond_classes 80 -performance_schema_max_cond_instances 1000 -performance_schema_max_digest_length 1024 -performance_schema_max_file_classes 50 -performance_schema_max_file_handles 32768 -performance_schema_max_file_instances 10000 -performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 5000 -performance_schema_max_rwlock_classes 40 -performance_schema_max_rwlock_instances 5000 -performance_schema_max_socket_classes 10 -performance_schema_max_socket_instances 1000 -performance_schema_max_stage_classes 150 -performance_schema_max_table_handles 1000 -performance_schema_max_table_instances 500 -performance_schema_max_thread_classes 50 -performance_schema_max_thread_instances 200 -performance_schema_session_connect_attrs_size 2048 -performance_schema_setup_actors_size 100 -performance_schema_setup_objects_size 100 -performance_schema_users_size 100 -show status like "performance_schema%"; -Variable_name Value -Performance_schema_accounts_lost 0 -Performance_schema_cond_classes_lost 0 -Performance_schema_cond_instances_lost 0 -Performance_schema_digest_lost 0 -Performance_schema_file_classes_lost 0 -Performance_schema_file_handles_lost 0 -Performance_schema_file_instances_lost 0 -Performance_schema_hosts_lost 0 -Performance_schema_locker_lost 0 -Performance_schema_mutex_classes_lost 0 -Performance_schema_mutex_instances_lost 0 -Performance_schema_rwlock_classes_lost 0 -Performance_schema_rwlock_instances_lost 0 -Performance_schema_session_connect_attrs_lost 0 -Performance_schema_socket_classes_lost 0 -Performance_schema_socket_instances_lost 0 -Performance_schema_stage_classes_lost 0 -Performance_schema_statement_classes_lost 0 -Performance_schema_table_handles_lost 0 -Performance_schema_table_instances_lost 0 -Performance_schema_thread_classes_lost 0 -Performance_schema_thread_instances_lost 0 -Performance_schema_users_lost 0 "================== Step 1 ==================" call dump_thread(); username status diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_2t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_2t.result index c5481451fd3..987732538c4 100644 --- a/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_2t.result +++ b/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_2t.result @@ -39,66 +39,6 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name; truncate performance_schema.events_waits_summary_by_host_by_event_name; truncate performance_schema.events_waits_summary_global_by_event_name; truncate performance_schema.events_waits_history_long; -show variables where -`Variable_name` != "performance_schema_max_statement_classes" and -`Variable_name` like "performance_schema%"; -Variable_name Value -performance_schema ON -performance_schema_accounts_size 100 -performance_schema_digests_size 200 -performance_schema_events_stages_history_long_size 1000 -performance_schema_events_stages_history_size 10 -performance_schema_events_statements_history_long_size 1000 -performance_schema_events_statements_history_size 10 -performance_schema_events_waits_history_long_size 10000 -performance_schema_events_waits_history_size 10 -performance_schema_hosts_size 100 -performance_schema_max_cond_classes 80 -performance_schema_max_cond_instances 1000 -performance_schema_max_digest_length 1024 -performance_schema_max_file_classes 50 -performance_schema_max_file_handles 32768 -performance_schema_max_file_instances 10000 -performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 5000 -performance_schema_max_rwlock_classes 40 -performance_schema_max_rwlock_instances 5000 -performance_schema_max_socket_classes 10 -performance_schema_max_socket_instances 1000 -performance_schema_max_stage_classes 150 -performance_schema_max_table_handles 1000 -performance_schema_max_table_instances 500 -performance_schema_max_thread_classes 50 -performance_schema_max_thread_instances 200 -performance_schema_session_connect_attrs_size 2048 -performance_schema_setup_actors_size 100 -performance_schema_setup_objects_size 100 -performance_schema_users_size 100 -show status like "performance_schema%"; -Variable_name Value -Performance_schema_accounts_lost 0 -Performance_schema_cond_classes_lost 0 -Performance_schema_cond_instances_lost 0 -Performance_schema_digest_lost 0 -Performance_schema_file_classes_lost 0 -Performance_schema_file_handles_lost 0 -Performance_schema_file_instances_lost 0 -Performance_schema_hosts_lost 0 -Performance_schema_locker_lost 0 -Performance_schema_mutex_classes_lost 0 -Performance_schema_mutex_instances_lost 0 -Performance_schema_rwlock_classes_lost 0 -Performance_schema_rwlock_instances_lost 0 -Performance_schema_session_connect_attrs_lost 0 -Performance_schema_socket_classes_lost 0 -Performance_schema_socket_instances_lost 0 -Performance_schema_stage_classes_lost 0 -Performance_schema_statement_classes_lost 0 -Performance_schema_table_handles_lost 0 -Performance_schema_table_instances_lost 0 -Performance_schema_thread_classes_lost 0 -Performance_schema_thread_instances_lost 0 -Performance_schema_users_lost 0 "================== Step 1 ==================" call dump_thread(); username status diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_3t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_3t.result index 81f424800d6..324c6534303 100644 --- a/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_3t.result +++ b/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_3t.result @@ -38,66 +38,6 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name; truncate performance_schema.events_waits_summary_by_host_by_event_name; truncate performance_schema.events_waits_summary_global_by_event_name; truncate performance_schema.events_waits_history_long; -show variables where -`Variable_name` != "performance_schema_max_statement_classes" and -`Variable_name` like "performance_schema%"; -Variable_name Value -performance_schema ON -performance_schema_accounts_size 100 -performance_schema_digests_size 200 -performance_schema_events_stages_history_long_size 1000 -performance_schema_events_stages_history_size 10 -performance_schema_events_statements_history_long_size 1000 -performance_schema_events_statements_history_size 10 -performance_schema_events_waits_history_long_size 10000 -performance_schema_events_waits_history_size 10 -performance_schema_hosts_size 100 -performance_schema_max_cond_classes 80 -performance_schema_max_cond_instances 1000 -performance_schema_max_digest_length 1024 -performance_schema_max_file_classes 50 -performance_schema_max_file_handles 32768 -performance_schema_max_file_instances 10000 -performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 5000 -performance_schema_max_rwlock_classes 40 -performance_schema_max_rwlock_instances 5000 -performance_schema_max_socket_classes 10 -performance_schema_max_socket_instances 1000 -performance_schema_max_stage_classes 150 -performance_schema_max_table_handles 1000 -performance_schema_max_table_instances 500 -performance_schema_max_thread_classes 50 -performance_schema_max_thread_instances 200 -performance_schema_session_connect_attrs_size 2048 -performance_schema_setup_actors_size 100 -performance_schema_setup_objects_size 100 -performance_schema_users_size 100 -show status like "performance_schema%"; -Variable_name Value -Performance_schema_accounts_lost 0 -Performance_schema_cond_classes_lost 0 -Performance_schema_cond_instances_lost 0 -Performance_schema_digest_lost 0 -Performance_schema_file_classes_lost 0 -Performance_schema_file_handles_lost 0 -Performance_schema_file_instances_lost 0 -Performance_schema_hosts_lost 0 -Performance_schema_locker_lost 0 -Performance_schema_mutex_classes_lost 0 -Performance_schema_mutex_instances_lost 0 -Performance_schema_rwlock_classes_lost 0 -Performance_schema_rwlock_instances_lost 0 -Performance_schema_session_connect_attrs_lost 0 -Performance_schema_socket_classes_lost 0 -Performance_schema_socket_instances_lost 0 -Performance_schema_stage_classes_lost 0 -Performance_schema_statement_classes_lost 0 -Performance_schema_table_handles_lost 0 -Performance_schema_table_instances_lost 0 -Performance_schema_thread_classes_lost 0 -Performance_schema_thread_instances_lost 0 -Performance_schema_users_lost 0 "================== Step 1 ==================" call dump_thread(); username status diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_2t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_2t.result index 15e62be4b22..914bcc7084b 100644 --- a/mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_2t.result +++ b/mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_2t.result @@ -39,66 +39,6 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name; truncate performance_schema.events_waits_summary_by_host_by_event_name; truncate performance_schema.events_waits_summary_global_by_event_name; truncate performance_schema.events_waits_history_long; -show variables where -`Variable_name` != "performance_schema_max_statement_classes" and -`Variable_name` like "performance_schema%"; -Variable_name Value -performance_schema ON -performance_schema_accounts_size 100 -performance_schema_digests_size 200 -performance_schema_events_stages_history_long_size 1000 -performance_schema_events_stages_history_size 10 -performance_schema_events_statements_history_long_size 1000 -performance_schema_events_statements_history_size 10 -performance_schema_events_waits_history_long_size 10000 -performance_schema_events_waits_history_size 10 -performance_schema_hosts_size 100 -performance_schema_max_cond_classes 80 -performance_schema_max_cond_instances 1000 -performance_schema_max_digest_length 1024 -performance_schema_max_file_classes 50 -performance_schema_max_file_handles 32768 -performance_schema_max_file_instances 10000 -performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 5000 -performance_schema_max_rwlock_classes 40 -performance_schema_max_rwlock_instances 5000 -performance_schema_max_socket_classes 10 -performance_schema_max_socket_instances 1000 -performance_schema_max_stage_classes 150 -performance_schema_max_table_handles 1000 -performance_schema_max_table_instances 500 -performance_schema_max_thread_classes 50 -performance_schema_max_thread_instances 200 -performance_schema_session_connect_attrs_size 2048 -performance_schema_setup_actors_size 100 -performance_schema_setup_objects_size 100 -performance_schema_users_size 100 -show status like "performance_schema%"; -Variable_name Value -Performance_schema_accounts_lost 0 -Performance_schema_cond_classes_lost 0 -Performance_schema_cond_instances_lost 0 -Performance_schema_digest_lost 0 -Performance_schema_file_classes_lost 0 -Performance_schema_file_handles_lost 0 -Performance_schema_file_instances_lost 0 -Performance_schema_hosts_lost 0 -Performance_schema_locker_lost 0 -Performance_schema_mutex_classes_lost 0 -Performance_schema_mutex_instances_lost 0 -Performance_schema_rwlock_classes_lost 0 -Performance_schema_rwlock_instances_lost 0 -Performance_schema_session_connect_attrs_lost 0 -Performance_schema_socket_classes_lost 0 -Performance_schema_socket_instances_lost 0 -Performance_schema_stage_classes_lost 0 -Performance_schema_statement_classes_lost 0 -Performance_schema_table_handles_lost 0 -Performance_schema_table_instances_lost 0 -Performance_schema_thread_classes_lost 0 -Performance_schema_thread_instances_lost 0 -Performance_schema_users_lost 0 "================== Step 1 ==================" call dump_thread(); username status diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_3t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_3t.result index dbcf7aca9a4..f92ebe8e467 100644 --- a/mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_3t.result +++ b/mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_3t.result @@ -38,66 +38,6 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name; truncate performance_schema.events_waits_summary_by_host_by_event_name; truncate performance_schema.events_waits_summary_global_by_event_name; truncate performance_schema.events_waits_history_long; -show variables where -`Variable_name` != "performance_schema_max_statement_classes" and -`Variable_name` like "performance_schema%"; -Variable_name Value -performance_schema ON -performance_schema_accounts_size 100 -performance_schema_digests_size 200 -performance_schema_events_stages_history_long_size 1000 -performance_schema_events_stages_history_size 10 -performance_schema_events_statements_history_long_size 1000 -performance_schema_events_statements_history_size 10 -performance_schema_events_waits_history_long_size 10000 -performance_schema_events_waits_history_size 10 -performance_schema_hosts_size 100 -performance_schema_max_cond_classes 80 -performance_schema_max_cond_instances 1000 -performance_schema_max_digest_length 1024 -performance_schema_max_file_classes 50 -performance_schema_max_file_handles 32768 -performance_schema_max_file_instances 10000 -performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 5000 -performance_schema_max_rwlock_classes 40 -performance_schema_max_rwlock_instances 5000 -performance_schema_max_socket_classes 10 -performance_schema_max_socket_instances 1000 -performance_schema_max_stage_classes 150 -performance_schema_max_table_handles 1000 -performance_schema_max_table_instances 500 -performance_schema_max_thread_classes 50 -performance_schema_max_thread_instances 200 -performance_schema_session_connect_attrs_size 2048 -performance_schema_setup_actors_size 100 -performance_schema_setup_objects_size 100 -performance_schema_users_size 100 -show status like "performance_schema%"; -Variable_name Value -Performance_schema_accounts_lost 0 -Performance_schema_cond_classes_lost 0 -Performance_schema_cond_instances_lost 0 -Performance_schema_digest_lost 0 -Performance_schema_file_classes_lost 0 -Performance_schema_file_handles_lost 0 -Performance_schema_file_instances_lost 0 -Performance_schema_hosts_lost 0 -Performance_schema_locker_lost 0 -Performance_schema_mutex_classes_lost 0 -Performance_schema_mutex_instances_lost 0 -Performance_schema_rwlock_classes_lost 0 -Performance_schema_rwlock_instances_lost 0 -Performance_schema_session_connect_attrs_lost 0 -Performance_schema_socket_classes_lost 0 -Performance_schema_socket_instances_lost 0 -Performance_schema_stage_classes_lost 0 -Performance_schema_statement_classes_lost 0 -Performance_schema_table_handles_lost 0 -Performance_schema_table_instances_lost 0 -Performance_schema_thread_classes_lost 0 -Performance_schema_thread_instances_lost 0 -Performance_schema_users_lost 0 "================== Step 1 ==================" call dump_thread(); username status diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_2t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_2t.result index 1230f1e91fe..8eb52d58efc 100644 --- a/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_2t.result +++ b/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_2t.result @@ -41,66 +41,6 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name; truncate performance_schema.events_waits_summary_by_host_by_event_name; truncate performance_schema.events_waits_summary_global_by_event_name; truncate performance_schema.events_waits_history_long; -show variables where -`Variable_name` != "performance_schema_max_statement_classes" and -`Variable_name` like "performance_schema%"; -Variable_name Value -performance_schema ON -performance_schema_accounts_size 100 -performance_schema_digests_size 200 -performance_schema_events_stages_history_long_size 1000 -performance_schema_events_stages_history_size 10 -performance_schema_events_statements_history_long_size 1000 -performance_schema_events_statements_history_size 10 -performance_schema_events_waits_history_long_size 10000 -performance_schema_events_waits_history_size 10 -performance_schema_hosts_size 100 -performance_schema_max_cond_classes 80 -performance_schema_max_cond_instances 1000 -performance_schema_max_digest_length 1024 -performance_schema_max_file_classes 50 -performance_schema_max_file_handles 32768 -performance_schema_max_file_instances 10000 -performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 5000 -performance_schema_max_rwlock_classes 40 -performance_schema_max_rwlock_instances 5000 -performance_schema_max_socket_classes 10 -performance_schema_max_socket_instances 1000 -performance_schema_max_stage_classes 150 -performance_schema_max_table_handles 1000 -performance_schema_max_table_instances 500 -performance_schema_max_thread_classes 50 -performance_schema_max_thread_instances 200 -performance_schema_session_connect_attrs_size 2048 -performance_schema_setup_actors_size 100 -performance_schema_setup_objects_size 100 -performance_schema_users_size 100 -show status like "performance_schema%"; -Variable_name Value -Performance_schema_accounts_lost 0 -Performance_schema_cond_classes_lost 0 -Performance_schema_cond_instances_lost 0 -Performance_schema_digest_lost 0 -Performance_schema_file_classes_lost 0 -Performance_schema_file_handles_lost 0 -Performance_schema_file_instances_lost 0 -Performance_schema_hosts_lost 0 -Performance_schema_locker_lost 0 -Performance_schema_mutex_classes_lost 0 -Performance_schema_mutex_instances_lost 0 -Performance_schema_rwlock_classes_lost 0 -Performance_schema_rwlock_instances_lost 0 -Performance_schema_session_connect_attrs_lost 0 -Performance_schema_socket_classes_lost 0 -Performance_schema_socket_instances_lost 0 -Performance_schema_stage_classes_lost 0 -Performance_schema_statement_classes_lost 0 -Performance_schema_table_handles_lost 0 -Performance_schema_table_instances_lost 0 -Performance_schema_thread_classes_lost 0 -Performance_schema_thread_instances_lost 0 -Performance_schema_users_lost 0 "================== Step 1 ==================" call dump_thread(); username status diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_3t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_3t.result index 1b04e9fe898..fba8a48ad35 100644 --- a/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_3t.result +++ b/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_3t.result @@ -40,66 +40,6 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name; truncate performance_schema.events_waits_summary_by_host_by_event_name; truncate performance_schema.events_waits_summary_global_by_event_name; truncate performance_schema.events_waits_history_long; -show variables where -`Variable_name` != "performance_schema_max_statement_classes" and -`Variable_name` like "performance_schema%"; -Variable_name Value -performance_schema ON -performance_schema_accounts_size 100 -performance_schema_digests_size 200 -performance_schema_events_stages_history_long_size 1000 -performance_schema_events_stages_history_size 10 -performance_schema_events_statements_history_long_size 1000 -performance_schema_events_statements_history_size 10 -performance_schema_events_waits_history_long_size 10000 -performance_schema_events_waits_history_size 10 -performance_schema_hosts_size 100 -performance_schema_max_cond_classes 80 -performance_schema_max_cond_instances 1000 -performance_schema_max_digest_length 1024 -performance_schema_max_file_classes 50 -performance_schema_max_file_handles 32768 -performance_schema_max_file_instances 10000 -performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 5000 -performance_schema_max_rwlock_classes 40 -performance_schema_max_rwlock_instances 5000 -performance_schema_max_socket_classes 10 -performance_schema_max_socket_instances 1000 -performance_schema_max_stage_classes 150 -performance_schema_max_table_handles 1000 -performance_schema_max_table_instances 500 -performance_schema_max_thread_classes 50 -performance_schema_max_thread_instances 200 -performance_schema_session_connect_attrs_size 2048 -performance_schema_setup_actors_size 100 -performance_schema_setup_objects_size 100 -performance_schema_users_size 100 -show status like "performance_schema%"; -Variable_name Value -Performance_schema_accounts_lost 0 -Performance_schema_cond_classes_lost 0 -Performance_schema_cond_instances_lost 0 -Performance_schema_digest_lost 0 -Performance_schema_file_classes_lost 0 -Performance_schema_file_handles_lost 0 -Performance_schema_file_instances_lost 0 -Performance_schema_hosts_lost 0 -Performance_schema_locker_lost 0 -Performance_schema_mutex_classes_lost 0 -Performance_schema_mutex_instances_lost 0 -Performance_schema_rwlock_classes_lost 0 -Performance_schema_rwlock_instances_lost 0 -Performance_schema_session_connect_attrs_lost 0 -Performance_schema_socket_classes_lost 0 -Performance_schema_socket_instances_lost 0 -Performance_schema_stage_classes_lost 0 -Performance_schema_statement_classes_lost 0 -Performance_schema_table_handles_lost 0 -Performance_schema_table_instances_lost 0 -Performance_schema_thread_classes_lost 0 -Performance_schema_thread_instances_lost 0 -Performance_schema_users_lost 0 "================== Step 1 ==================" call dump_thread(); username status diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_2t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_2t.result index f376160939d..2bcabb81def 100644 --- a/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_2t.result +++ b/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_2t.result @@ -41,66 +41,6 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name; truncate performance_schema.events_waits_summary_by_host_by_event_name; truncate performance_schema.events_waits_summary_global_by_event_name; truncate performance_schema.events_waits_history_long; -show variables where -`Variable_name` != "performance_schema_max_statement_classes" and -`Variable_name` like "performance_schema%"; -Variable_name Value -performance_schema ON -performance_schema_accounts_size 100 -performance_schema_digests_size 200 -performance_schema_events_stages_history_long_size 1000 -performance_schema_events_stages_history_size 10 -performance_schema_events_statements_history_long_size 1000 -performance_schema_events_statements_history_size 10 -performance_schema_events_waits_history_long_size 10000 -performance_schema_events_waits_history_size 10 -performance_schema_hosts_size 100 -performance_schema_max_cond_classes 80 -performance_schema_max_cond_instances 1000 -performance_schema_max_digest_length 1024 -performance_schema_max_file_classes 50 -performance_schema_max_file_handles 32768 -performance_schema_max_file_instances 10000 -performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 5000 -performance_schema_max_rwlock_classes 40 -performance_schema_max_rwlock_instances 5000 -performance_schema_max_socket_classes 10 -performance_schema_max_socket_instances 1000 -performance_schema_max_stage_classes 150 -performance_schema_max_table_handles 1000 -performance_schema_max_table_instances 500 -performance_schema_max_thread_classes 50 -performance_schema_max_thread_instances 200 -performance_schema_session_connect_attrs_size 2048 -performance_schema_setup_actors_size 100 -performance_schema_setup_objects_size 100 -performance_schema_users_size 100 -show status like "performance_schema%"; -Variable_name Value -Performance_schema_accounts_lost 0 -Performance_schema_cond_classes_lost 0 -Performance_schema_cond_instances_lost 0 -Performance_schema_digest_lost 0 -Performance_schema_file_classes_lost 0 -Performance_schema_file_handles_lost 0 -Performance_schema_file_instances_lost 0 -Performance_schema_hosts_lost 0 -Performance_schema_locker_lost 0 -Performance_schema_mutex_classes_lost 0 -Performance_schema_mutex_instances_lost 0 -Performance_schema_rwlock_classes_lost 0 -Performance_schema_rwlock_instances_lost 0 -Performance_schema_session_connect_attrs_lost 0 -Performance_schema_socket_classes_lost 0 -Performance_schema_socket_instances_lost 0 -Performance_schema_stage_classes_lost 0 -Performance_schema_statement_classes_lost 0 -Performance_schema_table_handles_lost 0 -Performance_schema_table_instances_lost 0 -Performance_schema_thread_classes_lost 0 -Performance_schema_thread_instances_lost 0 -Performance_schema_users_lost 0 "================== Step 1 ==================" call dump_thread(); username status diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_3t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_3t.result index aae2c54e25c..323570b7d40 100644 --- a/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_3t.result +++ b/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_3t.result @@ -40,66 +40,6 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name; truncate performance_schema.events_waits_summary_by_host_by_event_name; truncate performance_schema.events_waits_summary_global_by_event_name; truncate performance_schema.events_waits_history_long; -show variables where -`Variable_name` != "performance_schema_max_statement_classes" and -`Variable_name` like "performance_schema%"; -Variable_name Value -performance_schema ON -performance_schema_accounts_size 100 -performance_schema_digests_size 200 -performance_schema_events_stages_history_long_size 1000 -performance_schema_events_stages_history_size 10 -performance_schema_events_statements_history_long_size 1000 -performance_schema_events_statements_history_size 10 -performance_schema_events_waits_history_long_size 10000 -performance_schema_events_waits_history_size 10 -performance_schema_hosts_size 100 -performance_schema_max_cond_classes 80 -performance_schema_max_cond_instances 1000 -performance_schema_max_digest_length 1024 -performance_schema_max_file_classes 50 -performance_schema_max_file_handles 32768 -performance_schema_max_file_instances 10000 -performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 5000 -performance_schema_max_rwlock_classes 40 -performance_schema_max_rwlock_instances 5000 -performance_schema_max_socket_classes 10 -performance_schema_max_socket_instances 1000 -performance_schema_max_stage_classes 150 -performance_schema_max_table_handles 1000 -performance_schema_max_table_instances 500 -performance_schema_max_thread_classes 50 -performance_schema_max_thread_instances 200 -performance_schema_session_connect_attrs_size 2048 -performance_schema_setup_actors_size 100 -performance_schema_setup_objects_size 100 -performance_schema_users_size 100 -show status like "performance_schema%"; -Variable_name Value -Performance_schema_accounts_lost 0 -Performance_schema_cond_classes_lost 0 -Performance_schema_cond_instances_lost 0 -Performance_schema_digest_lost 0 -Performance_schema_file_classes_lost 0 -Performance_schema_file_handles_lost 0 -Performance_schema_file_instances_lost 0 -Performance_schema_hosts_lost 0 -Performance_schema_locker_lost 0 -Performance_schema_mutex_classes_lost 0 -Performance_schema_mutex_instances_lost 0 -Performance_schema_rwlock_classes_lost 0 -Performance_schema_rwlock_instances_lost 0 -Performance_schema_session_connect_attrs_lost 0 -Performance_schema_socket_classes_lost 0 -Performance_schema_socket_instances_lost 0 -Performance_schema_stage_classes_lost 0 -Performance_schema_statement_classes_lost 0 -Performance_schema_table_handles_lost 0 -Performance_schema_table_instances_lost 0 -Performance_schema_thread_classes_lost 0 -Performance_schema_thread_instances_lost 0 -Performance_schema_users_lost 0 "================== Step 1 ==================" call dump_thread(); username status diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_2t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_2t.result index 23f800e81d9..3a3d093d91e 100644 --- a/mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_2t.result +++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_2t.result @@ -41,66 +41,6 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name; truncate performance_schema.events_waits_summary_by_host_by_event_name; truncate performance_schema.events_waits_summary_global_by_event_name; truncate performance_schema.events_waits_history_long; -show variables where -`Variable_name` != "performance_schema_max_statement_classes" and -`Variable_name` like "performance_schema%"; -Variable_name Value -performance_schema ON -performance_schema_accounts_size 100 -performance_schema_digests_size 200 -performance_schema_events_stages_history_long_size 1000 -performance_schema_events_stages_history_size 10 -performance_schema_events_statements_history_long_size 1000 -performance_schema_events_statements_history_size 10 -performance_schema_events_waits_history_long_size 10000 -performance_schema_events_waits_history_size 10 -performance_schema_hosts_size 100 -performance_schema_max_cond_classes 80 -performance_schema_max_cond_instances 1000 -performance_schema_max_digest_length 1024 -performance_schema_max_file_classes 50 -performance_schema_max_file_handles 32768 -performance_schema_max_file_instances 10000 -performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 5000 -performance_schema_max_rwlock_classes 40 -performance_schema_max_rwlock_instances 5000 -performance_schema_max_socket_classes 10 -performance_schema_max_socket_instances 1000 -performance_schema_max_stage_classes 150 -performance_schema_max_table_handles 1000 -performance_schema_max_table_instances 500 -performance_schema_max_thread_classes 50 -performance_schema_max_thread_instances 200 -performance_schema_session_connect_attrs_size 2048 -performance_schema_setup_actors_size 100 -performance_schema_setup_objects_size 100 -performance_schema_users_size 100 -show status like "performance_schema%"; -Variable_name Value -Performance_schema_accounts_lost 0 -Performance_schema_cond_classes_lost 0 -Performance_schema_cond_instances_lost 0 -Performance_schema_digest_lost 0 -Performance_schema_file_classes_lost 0 -Performance_schema_file_handles_lost 0 -Performance_schema_file_instances_lost 0 -Performance_schema_hosts_lost 0 -Performance_schema_locker_lost 0 -Performance_schema_mutex_classes_lost 0 -Performance_schema_mutex_instances_lost 0 -Performance_schema_rwlock_classes_lost 0 -Performance_schema_rwlock_instances_lost 0 -Performance_schema_session_connect_attrs_lost 0 -Performance_schema_socket_classes_lost 0 -Performance_schema_socket_instances_lost 0 -Performance_schema_stage_classes_lost 0 -Performance_schema_statement_classes_lost 0 -Performance_schema_table_handles_lost 0 -Performance_schema_table_instances_lost 0 -Performance_schema_thread_classes_lost 0 -Performance_schema_thread_instances_lost 0 -Performance_schema_users_lost 0 "================== Step 1 ==================" call dump_thread(); username status diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_3t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_3t.result index 99734474536..04c4fe4d949 100644 --- a/mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_3t.result +++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_3t.result @@ -40,66 +40,6 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name; truncate performance_schema.events_waits_summary_by_host_by_event_name; truncate performance_schema.events_waits_summary_global_by_event_name; truncate performance_schema.events_waits_history_long; -show variables where -`Variable_name` != "performance_schema_max_statement_classes" and -`Variable_name` like "performance_schema%"; -Variable_name Value -performance_schema ON -performance_schema_accounts_size 100 -performance_schema_digests_size 200 -performance_schema_events_stages_history_long_size 1000 -performance_schema_events_stages_history_size 10 -performance_schema_events_statements_history_long_size 1000 -performance_schema_events_statements_history_size 10 -performance_schema_events_waits_history_long_size 10000 -performance_schema_events_waits_history_size 10 -performance_schema_hosts_size 100 -performance_schema_max_cond_classes 80 -performance_schema_max_cond_instances 1000 -performance_schema_max_digest_length 1024 -performance_schema_max_file_classes 50 -performance_schema_max_file_handles 32768 -performance_schema_max_file_instances 10000 -performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 5000 -performance_schema_max_rwlock_classes 40 -performance_schema_max_rwlock_instances 5000 -performance_schema_max_socket_classes 10 -performance_schema_max_socket_instances 1000 -performance_schema_max_stage_classes 150 -performance_schema_max_table_handles 1000 -performance_schema_max_table_instances 500 -performance_schema_max_thread_classes 50 -performance_schema_max_thread_instances 200 -performance_schema_session_connect_attrs_size 2048 -performance_schema_setup_actors_size 100 -performance_schema_setup_objects_size 100 -performance_schema_users_size 100 -show status like "performance_schema%"; -Variable_name Value -Performance_schema_accounts_lost 0 -Performance_schema_cond_classes_lost 0 -Performance_schema_cond_instances_lost 0 -Performance_schema_digest_lost 0 -Performance_schema_file_classes_lost 0 -Performance_schema_file_handles_lost 0 -Performance_schema_file_instances_lost 0 -Performance_schema_hosts_lost 0 -Performance_schema_locker_lost 0 -Performance_schema_mutex_classes_lost 0 -Performance_schema_mutex_instances_lost 0 -Performance_schema_rwlock_classes_lost 0 -Performance_schema_rwlock_instances_lost 0 -Performance_schema_session_connect_attrs_lost 0 -Performance_schema_socket_classes_lost 0 -Performance_schema_socket_instances_lost 0 -Performance_schema_stage_classes_lost 0 -Performance_schema_statement_classes_lost 0 -Performance_schema_table_handles_lost 0 -Performance_schema_table_instances_lost 0 -Performance_schema_thread_classes_lost 0 -Performance_schema_thread_instances_lost 0 -Performance_schema_users_lost 0 "================== Step 1 ==================" call dump_thread(); username status diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_2t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_2t.result index fe63232cf52..61783e41b1b 100644 --- a/mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_2t.result +++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_2t.result @@ -41,66 +41,6 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name; truncate performance_schema.events_waits_summary_by_host_by_event_name; truncate performance_schema.events_waits_summary_global_by_event_name; truncate performance_schema.events_waits_history_long; -show variables where -`Variable_name` != "performance_schema_max_statement_classes" and -`Variable_name` like "performance_schema%"; -Variable_name Value -performance_schema ON -performance_schema_accounts_size 100 -performance_schema_digests_size 200 -performance_schema_events_stages_history_long_size 1000 -performance_schema_events_stages_history_size 10 -performance_schema_events_statements_history_long_size 1000 -performance_schema_events_statements_history_size 10 -performance_schema_events_waits_history_long_size 10000 -performance_schema_events_waits_history_size 10 -performance_schema_hosts_size 100 -performance_schema_max_cond_classes 80 -performance_schema_max_cond_instances 1000 -performance_schema_max_digest_length 1024 -performance_schema_max_file_classes 50 -performance_schema_max_file_handles 32768 -performance_schema_max_file_instances 10000 -performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 5000 -performance_schema_max_rwlock_classes 40 -performance_schema_max_rwlock_instances 5000 -performance_schema_max_socket_classes 10 -performance_schema_max_socket_instances 1000 -performance_schema_max_stage_classes 150 -performance_schema_max_table_handles 1000 -performance_schema_max_table_instances 500 -performance_schema_max_thread_classes 50 -performance_schema_max_thread_instances 200 -performance_schema_session_connect_attrs_size 2048 -performance_schema_setup_actors_size 100 -performance_schema_setup_objects_size 100 -performance_schema_users_size 100 -show status like "performance_schema%"; -Variable_name Value -Performance_schema_accounts_lost 0 -Performance_schema_cond_classes_lost 0 -Performance_schema_cond_instances_lost 0 -Performance_schema_digest_lost 0 -Performance_schema_file_classes_lost 0 -Performance_schema_file_handles_lost 0 -Performance_schema_file_instances_lost 0 -Performance_schema_hosts_lost 0 -Performance_schema_locker_lost 0 -Performance_schema_mutex_classes_lost 0 -Performance_schema_mutex_instances_lost 0 -Performance_schema_rwlock_classes_lost 0 -Performance_schema_rwlock_instances_lost 0 -Performance_schema_session_connect_attrs_lost 0 -Performance_schema_socket_classes_lost 0 -Performance_schema_socket_instances_lost 0 -Performance_schema_stage_classes_lost 0 -Performance_schema_statement_classes_lost 0 -Performance_schema_table_handles_lost 0 -Performance_schema_table_instances_lost 0 -Performance_schema_thread_classes_lost 0 -Performance_schema_thread_instances_lost 0 -Performance_schema_users_lost 0 "================== Step 1 ==================" call dump_thread(); username status diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_3t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_3t.result index 376333fc794..2be8dbdf5b3 100644 --- a/mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_3t.result +++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_3t.result @@ -40,66 +40,6 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name; truncate performance_schema.events_waits_summary_by_host_by_event_name; truncate performance_schema.events_waits_summary_global_by_event_name; truncate performance_schema.events_waits_history_long; -show variables where -`Variable_name` != "performance_schema_max_statement_classes" and -`Variable_name` like "performance_schema%"; -Variable_name Value -performance_schema ON -performance_schema_accounts_size 100 -performance_schema_digests_size 200 -performance_schema_events_stages_history_long_size 1000 -performance_schema_events_stages_history_size 10 -performance_schema_events_statements_history_long_size 1000 -performance_schema_events_statements_history_size 10 -performance_schema_events_waits_history_long_size 10000 -performance_schema_events_waits_history_size 10 -performance_schema_hosts_size 100 -performance_schema_max_cond_classes 80 -performance_schema_max_cond_instances 1000 -performance_schema_max_digest_length 1024 -performance_schema_max_file_classes 50 -performance_schema_max_file_handles 32768 -performance_schema_max_file_instances 10000 -performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 5000 -performance_schema_max_rwlock_classes 40 -performance_schema_max_rwlock_instances 5000 -performance_schema_max_socket_classes 10 -performance_schema_max_socket_instances 1000 -performance_schema_max_stage_classes 150 -performance_schema_max_table_handles 1000 -performance_schema_max_table_instances 500 -performance_schema_max_thread_classes 50 -performance_schema_max_thread_instances 200 -performance_schema_session_connect_attrs_size 2048 -performance_schema_setup_actors_size 100 -performance_schema_setup_objects_size 100 -performance_schema_users_size 100 -show status like "performance_schema%"; -Variable_name Value -Performance_schema_accounts_lost 0 -Performance_schema_cond_classes_lost 0 -Performance_schema_cond_instances_lost 0 -Performance_schema_digest_lost 0 -Performance_schema_file_classes_lost 0 -Performance_schema_file_handles_lost 0 -Performance_schema_file_instances_lost 0 -Performance_schema_hosts_lost 0 -Performance_schema_locker_lost 0 -Performance_schema_mutex_classes_lost 0 -Performance_schema_mutex_instances_lost 0 -Performance_schema_rwlock_classes_lost 0 -Performance_schema_rwlock_instances_lost 0 -Performance_schema_session_connect_attrs_lost 0 -Performance_schema_socket_classes_lost 0 -Performance_schema_socket_instances_lost 0 -Performance_schema_stage_classes_lost 0 -Performance_schema_statement_classes_lost 0 -Performance_schema_table_handles_lost 0 -Performance_schema_table_instances_lost 0 -Performance_schema_thread_classes_lost 0 -Performance_schema_thread_instances_lost 0 -Performance_schema_users_lost 0 "================== Step 1 ==================" call dump_thread(); username status diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_2t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_2t.result index 191bd161d92..0ded9d54590 100644 --- a/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_2t.result +++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_2t.result @@ -39,66 +39,6 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name; truncate performance_schema.events_waits_summary_by_host_by_event_name; truncate performance_schema.events_waits_summary_global_by_event_name; truncate performance_schema.events_waits_history_long; -show variables where -`Variable_name` != "performance_schema_max_statement_classes" and -`Variable_name` like "performance_schema%"; -Variable_name Value -performance_schema ON -performance_schema_accounts_size 100 -performance_schema_digests_size 200 -performance_schema_events_stages_history_long_size 1000 -performance_schema_events_stages_history_size 10 -performance_schema_events_statements_history_long_size 1000 -performance_schema_events_statements_history_size 10 -performance_schema_events_waits_history_long_size 10000 -performance_schema_events_waits_history_size 10 -performance_schema_hosts_size 100 -performance_schema_max_cond_classes 80 -performance_schema_max_cond_instances 1000 -performance_schema_max_digest_length 1024 -performance_schema_max_file_classes 50 -performance_schema_max_file_handles 32768 -performance_schema_max_file_instances 10000 -performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 5000 -performance_schema_max_rwlock_classes 40 -performance_schema_max_rwlock_instances 5000 -performance_schema_max_socket_classes 10 -performance_schema_max_socket_instances 1000 -performance_schema_max_stage_classes 150 -performance_schema_max_table_handles 1000 -performance_schema_max_table_instances 500 -performance_schema_max_thread_classes 50 -performance_schema_max_thread_instances 200 -performance_schema_session_connect_attrs_size 2048 -performance_schema_setup_actors_size 100 -performance_schema_setup_objects_size 100 -performance_schema_users_size 100 -show status like "performance_schema%"; -Variable_name Value -Performance_schema_accounts_lost 0 -Performance_schema_cond_classes_lost 0 -Performance_schema_cond_instances_lost 0 -Performance_schema_digest_lost 0 -Performance_schema_file_classes_lost 0 -Performance_schema_file_handles_lost 0 -Performance_schema_file_instances_lost 0 -Performance_schema_hosts_lost 0 -Performance_schema_locker_lost 0 -Performance_schema_mutex_classes_lost 0 -Performance_schema_mutex_instances_lost 0 -Performance_schema_rwlock_classes_lost 0 -Performance_schema_rwlock_instances_lost 0 -Performance_schema_session_connect_attrs_lost 0 -Performance_schema_socket_classes_lost 0 -Performance_schema_socket_instances_lost 0 -Performance_schema_stage_classes_lost 0 -Performance_schema_statement_classes_lost 0 -Performance_schema_table_handles_lost 0 -Performance_schema_table_instances_lost 0 -Performance_schema_thread_classes_lost 0 -Performance_schema_thread_instances_lost 0 -Performance_schema_users_lost 0 "================== Step 1 ==================" call dump_thread(); username status diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_3t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_3t.result index 80590d5e468..13642f45b5a 100644 --- a/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_3t.result +++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_3t.result @@ -38,66 +38,6 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name; truncate performance_schema.events_waits_summary_by_host_by_event_name; truncate performance_schema.events_waits_summary_global_by_event_name; truncate performance_schema.events_waits_history_long; -show variables where -`Variable_name` != "performance_schema_max_statement_classes" and -`Variable_name` like "performance_schema%"; -Variable_name Value -performance_schema ON -performance_schema_accounts_size 100 -performance_schema_digests_size 200 -performance_schema_events_stages_history_long_size 1000 -performance_schema_events_stages_history_size 10 -performance_schema_events_statements_history_long_size 1000 -performance_schema_events_statements_history_size 10 -performance_schema_events_waits_history_long_size 10000 -performance_schema_events_waits_history_size 10 -performance_schema_hosts_size 100 -performance_schema_max_cond_classes 80 -performance_schema_max_cond_instances 1000 -performance_schema_max_digest_length 1024 -performance_schema_max_file_classes 50 -performance_schema_max_file_handles 32768 -performance_schema_max_file_instances 10000 -performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 5000 -performance_schema_max_rwlock_classes 40 -performance_schema_max_rwlock_instances 5000 -performance_schema_max_socket_classes 10 -performance_schema_max_socket_instances 1000 -performance_schema_max_stage_classes 150 -performance_schema_max_table_handles 1000 -performance_schema_max_table_instances 500 -performance_schema_max_thread_classes 50 -performance_schema_max_thread_instances 200 -performance_schema_session_connect_attrs_size 2048 -performance_schema_setup_actors_size 100 -performance_schema_setup_objects_size 100 -performance_schema_users_size 100 -show status like "performance_schema%"; -Variable_name Value -Performance_schema_accounts_lost 0 -Performance_schema_cond_classes_lost 0 -Performance_schema_cond_instances_lost 0 -Performance_schema_digest_lost 0 -Performance_schema_file_classes_lost 0 -Performance_schema_file_handles_lost 0 -Performance_schema_file_instances_lost 0 -Performance_schema_hosts_lost 0 -Performance_schema_locker_lost 0 -Performance_schema_mutex_classes_lost 0 -Performance_schema_mutex_instances_lost 0 -Performance_schema_rwlock_classes_lost 0 -Performance_schema_rwlock_instances_lost 0 -Performance_schema_session_connect_attrs_lost 0 -Performance_schema_socket_classes_lost 0 -Performance_schema_socket_instances_lost 0 -Performance_schema_stage_classes_lost 0 -Performance_schema_statement_classes_lost 0 -Performance_schema_table_handles_lost 0 -Performance_schema_table_instances_lost 0 -Performance_schema_thread_classes_lost 0 -Performance_schema_thread_instances_lost 0 -Performance_schema_users_lost 0 "================== Step 1 ==================" call dump_thread(); username status diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_2t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_2t.result index e9b39c5db14..61c649bd2cf 100644 --- a/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_2t.result +++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_2t.result @@ -39,66 +39,6 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name; truncate performance_schema.events_waits_summary_by_host_by_event_name; truncate performance_schema.events_waits_summary_global_by_event_name; truncate performance_schema.events_waits_history_long; -show variables where -`Variable_name` != "performance_schema_max_statement_classes" and -`Variable_name` like "performance_schema%"; -Variable_name Value -performance_schema ON -performance_schema_accounts_size 100 -performance_schema_digests_size 200 -performance_schema_events_stages_history_long_size 1000 -performance_schema_events_stages_history_size 10 -performance_schema_events_statements_history_long_size 1000 -performance_schema_events_statements_history_size 10 -performance_schema_events_waits_history_long_size 10000 -performance_schema_events_waits_history_size 10 -performance_schema_hosts_size 100 -performance_schema_max_cond_classes 80 -performance_schema_max_cond_instances 1000 -performance_schema_max_digest_length 1024 -performance_schema_max_file_classes 50 -performance_schema_max_file_handles 32768 -performance_schema_max_file_instances 10000 -performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 5000 -performance_schema_max_rwlock_classes 40 -performance_schema_max_rwlock_instances 5000 -performance_schema_max_socket_classes 10 -performance_schema_max_socket_instances 1000 -performance_schema_max_stage_classes 150 -performance_schema_max_table_handles 1000 -performance_schema_max_table_instances 500 -performance_schema_max_thread_classes 50 -performance_schema_max_thread_instances 200 -performance_schema_session_connect_attrs_size 2048 -performance_schema_setup_actors_size 100 -performance_schema_setup_objects_size 100 -performance_schema_users_size 100 -show status like "performance_schema%"; -Variable_name Value -Performance_schema_accounts_lost 0 -Performance_schema_cond_classes_lost 0 -Performance_schema_cond_instances_lost 0 -Performance_schema_digest_lost 0 -Performance_schema_file_classes_lost 0 -Performance_schema_file_handles_lost 0 -Performance_schema_file_instances_lost 0 -Performance_schema_hosts_lost 0 -Performance_schema_locker_lost 0 -Performance_schema_mutex_classes_lost 0 -Performance_schema_mutex_instances_lost 0 -Performance_schema_rwlock_classes_lost 0 -Performance_schema_rwlock_instances_lost 0 -Performance_schema_session_connect_attrs_lost 0 -Performance_schema_socket_classes_lost 0 -Performance_schema_socket_instances_lost 0 -Performance_schema_stage_classes_lost 0 -Performance_schema_statement_classes_lost 0 -Performance_schema_table_handles_lost 0 -Performance_schema_table_instances_lost 0 -Performance_schema_thread_classes_lost 0 -Performance_schema_thread_instances_lost 0 -Performance_schema_users_lost 0 "================== Step 1 ==================" call dump_thread(); username status diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_3t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_3t.result index 92a020f1984..5d5282ba899 100644 --- a/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_3t.result +++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_3t.result @@ -38,66 +38,6 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name; truncate performance_schema.events_waits_summary_by_host_by_event_name; truncate performance_schema.events_waits_summary_global_by_event_name; truncate performance_schema.events_waits_history_long; -show variables where -`Variable_name` != "performance_schema_max_statement_classes" and -`Variable_name` like "performance_schema%"; -Variable_name Value -performance_schema ON -performance_schema_accounts_size 100 -performance_schema_digests_size 200 -performance_schema_events_stages_history_long_size 1000 -performance_schema_events_stages_history_size 10 -performance_schema_events_statements_history_long_size 1000 -performance_schema_events_statements_history_size 10 -performance_schema_events_waits_history_long_size 10000 -performance_schema_events_waits_history_size 10 -performance_schema_hosts_size 100 -performance_schema_max_cond_classes 80 -performance_schema_max_cond_instances 1000 -performance_schema_max_digest_length 1024 -performance_schema_max_file_classes 50 -performance_schema_max_file_handles 32768 -performance_schema_max_file_instances 10000 -performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 5000 -performance_schema_max_rwlock_classes 40 -performance_schema_max_rwlock_instances 5000 -performance_schema_max_socket_classes 10 -performance_schema_max_socket_instances 1000 -performance_schema_max_stage_classes 150 -performance_schema_max_table_handles 1000 -performance_schema_max_table_instances 500 -performance_schema_max_thread_classes 50 -performance_schema_max_thread_instances 200 -performance_schema_session_connect_attrs_size 2048 -performance_schema_setup_actors_size 100 -performance_schema_setup_objects_size 100 -performance_schema_users_size 100 -show status like "performance_schema%"; -Variable_name Value -Performance_schema_accounts_lost 0 -Performance_schema_cond_classes_lost 0 -Performance_schema_cond_instances_lost 0 -Performance_schema_digest_lost 0 -Performance_schema_file_classes_lost 0 -Performance_schema_file_handles_lost 0 -Performance_schema_file_instances_lost 0 -Performance_schema_hosts_lost 0 -Performance_schema_locker_lost 0 -Performance_schema_mutex_classes_lost 0 -Performance_schema_mutex_instances_lost 0 -Performance_schema_rwlock_classes_lost 0 -Performance_schema_rwlock_instances_lost 0 -Performance_schema_session_connect_attrs_lost 0 -Performance_schema_socket_classes_lost 0 -Performance_schema_socket_instances_lost 0 -Performance_schema_stage_classes_lost 0 -Performance_schema_statement_classes_lost 0 -Performance_schema_table_handles_lost 0 -Performance_schema_table_instances_lost 0 -Performance_schema_thread_classes_lost 0 -Performance_schema_thread_instances_lost 0 -Performance_schema_users_lost 0 "================== Step 1 ==================" call dump_thread(); username status diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_2t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_2t.result index 4cdcbc45d7d..8da7fca1d3e 100644 --- a/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_2t.result +++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_2t.result @@ -41,66 +41,6 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name; truncate performance_schema.events_waits_summary_by_host_by_event_name; truncate performance_schema.events_waits_summary_global_by_event_name; truncate performance_schema.events_waits_history_long; -show variables where -`Variable_name` != "performance_schema_max_statement_classes" and -`Variable_name` like "performance_schema%"; -Variable_name Value -performance_schema ON -performance_schema_accounts_size 100 -performance_schema_digests_size 200 -performance_schema_events_stages_history_long_size 1000 -performance_schema_events_stages_history_size 10 -performance_schema_events_statements_history_long_size 1000 -performance_schema_events_statements_history_size 10 -performance_schema_events_waits_history_long_size 10000 -performance_schema_events_waits_history_size 10 -performance_schema_hosts_size 100 -performance_schema_max_cond_classes 80 -performance_schema_max_cond_instances 1000 -performance_schema_max_digest_length 1024 -performance_schema_max_file_classes 50 -performance_schema_max_file_handles 32768 -performance_schema_max_file_instances 10000 -performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 5000 -performance_schema_max_rwlock_classes 40 -performance_schema_max_rwlock_instances 5000 -performance_schema_max_socket_classes 10 -performance_schema_max_socket_instances 1000 -performance_schema_max_stage_classes 150 -performance_schema_max_table_handles 1000 -performance_schema_max_table_instances 500 -performance_schema_max_thread_classes 50 -performance_schema_max_thread_instances 200 -performance_schema_session_connect_attrs_size 2048 -performance_schema_setup_actors_size 100 -performance_schema_setup_objects_size 100 -performance_schema_users_size 100 -show status like "performance_schema%"; -Variable_name Value -Performance_schema_accounts_lost 0 -Performance_schema_cond_classes_lost 0 -Performance_schema_cond_instances_lost 0 -Performance_schema_digest_lost 0 -Performance_schema_file_classes_lost 0 -Performance_schema_file_handles_lost 0 -Performance_schema_file_instances_lost 0 -Performance_schema_hosts_lost 0 -Performance_schema_locker_lost 0 -Performance_schema_mutex_classes_lost 0 -Performance_schema_mutex_instances_lost 0 -Performance_schema_rwlock_classes_lost 0 -Performance_schema_rwlock_instances_lost 0 -Performance_schema_session_connect_attrs_lost 0 -Performance_schema_socket_classes_lost 0 -Performance_schema_socket_instances_lost 0 -Performance_schema_stage_classes_lost 0 -Performance_schema_statement_classes_lost 0 -Performance_schema_table_handles_lost 0 -Performance_schema_table_instances_lost 0 -Performance_schema_thread_classes_lost 0 -Performance_schema_thread_instances_lost 0 -Performance_schema_users_lost 0 "================== Step 1 ==================" call dump_thread(); username status diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_3t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_3t.result index 038335c22cb..88f658778c4 100644 --- a/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_3t.result +++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_3t.result @@ -40,66 +40,6 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name; truncate performance_schema.events_waits_summary_by_host_by_event_name; truncate performance_schema.events_waits_summary_global_by_event_name; truncate performance_schema.events_waits_history_long; -show variables where -`Variable_name` != "performance_schema_max_statement_classes" and -`Variable_name` like "performance_schema%"; -Variable_name Value -performance_schema ON -performance_schema_accounts_size 100 -performance_schema_digests_size 200 -performance_schema_events_stages_history_long_size 1000 -performance_schema_events_stages_history_size 10 -performance_schema_events_statements_history_long_size 1000 -performance_schema_events_statements_history_size 10 -performance_schema_events_waits_history_long_size 10000 -performance_schema_events_waits_history_size 10 -performance_schema_hosts_size 100 -performance_schema_max_cond_classes 80 -performance_schema_max_cond_instances 1000 -performance_schema_max_digest_length 1024 -performance_schema_max_file_classes 50 -performance_schema_max_file_handles 32768 -performance_schema_max_file_instances 10000 -performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 5000 -performance_schema_max_rwlock_classes 40 -performance_schema_max_rwlock_instances 5000 -performance_schema_max_socket_classes 10 -performance_schema_max_socket_instances 1000 -performance_schema_max_stage_classes 150 -performance_schema_max_table_handles 1000 -performance_schema_max_table_instances 500 -performance_schema_max_thread_classes 50 -performance_schema_max_thread_instances 200 -performance_schema_session_connect_attrs_size 2048 -performance_schema_setup_actors_size 100 -performance_schema_setup_objects_size 100 -performance_schema_users_size 100 -show status like "performance_schema%"; -Variable_name Value -Performance_schema_accounts_lost 0 -Performance_schema_cond_classes_lost 0 -Performance_schema_cond_instances_lost 0 -Performance_schema_digest_lost 0 -Performance_schema_file_classes_lost 0 -Performance_schema_file_handles_lost 0 -Performance_schema_file_instances_lost 0 -Performance_schema_hosts_lost 0 -Performance_schema_locker_lost 0 -Performance_schema_mutex_classes_lost 0 -Performance_schema_mutex_instances_lost 0 -Performance_schema_rwlock_classes_lost 0 -Performance_schema_rwlock_instances_lost 0 -Performance_schema_session_connect_attrs_lost 0 -Performance_schema_socket_classes_lost 0 -Performance_schema_socket_instances_lost 0 -Performance_schema_stage_classes_lost 0 -Performance_schema_statement_classes_lost 0 -Performance_schema_table_handles_lost 0 -Performance_schema_table_instances_lost 0 -Performance_schema_thread_classes_lost 0 -Performance_schema_thread_instances_lost 0 -Performance_schema_users_lost 0 "================== Step 1 ==================" call dump_thread(); username status diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_2t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_2t.result index ac5cde25522..72bc52cefa3 100644 --- a/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_2t.result +++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_2t.result @@ -41,66 +41,6 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name; truncate performance_schema.events_waits_summary_by_host_by_event_name; truncate performance_schema.events_waits_summary_global_by_event_name; truncate performance_schema.events_waits_history_long; -show variables where -`Variable_name` != "performance_schema_max_statement_classes" and -`Variable_name` like "performance_schema%"; -Variable_name Value -performance_schema ON -performance_schema_accounts_size 100 -performance_schema_digests_size 200 -performance_schema_events_stages_history_long_size 1000 -performance_schema_events_stages_history_size 10 -performance_schema_events_statements_history_long_size 1000 -performance_schema_events_statements_history_size 10 -performance_schema_events_waits_history_long_size 10000 -performance_schema_events_waits_history_size 10 -performance_schema_hosts_size 100 -performance_schema_max_cond_classes 80 -performance_schema_max_cond_instances 1000 -performance_schema_max_digest_length 1024 -performance_schema_max_file_classes 50 -performance_schema_max_file_handles 32768 -performance_schema_max_file_instances 10000 -performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 5000 -performance_schema_max_rwlock_classes 40 -performance_schema_max_rwlock_instances 5000 -performance_schema_max_socket_classes 10 -performance_schema_max_socket_instances 1000 -performance_schema_max_stage_classes 150 -performance_schema_max_table_handles 1000 -performance_schema_max_table_instances 500 -performance_schema_max_thread_classes 50 -performance_schema_max_thread_instances 200 -performance_schema_session_connect_attrs_size 2048 -performance_schema_setup_actors_size 100 -performance_schema_setup_objects_size 100 -performance_schema_users_size 100 -show status like "performance_schema%"; -Variable_name Value -Performance_schema_accounts_lost 0 -Performance_schema_cond_classes_lost 0 -Performance_schema_cond_instances_lost 0 -Performance_schema_digest_lost 0 -Performance_schema_file_classes_lost 0 -Performance_schema_file_handles_lost 0 -Performance_schema_file_instances_lost 0 -Performance_schema_hosts_lost 0 -Performance_schema_locker_lost 0 -Performance_schema_mutex_classes_lost 0 -Performance_schema_mutex_instances_lost 0 -Performance_schema_rwlock_classes_lost 0 -Performance_schema_rwlock_instances_lost 0 -Performance_schema_session_connect_attrs_lost 0 -Performance_schema_socket_classes_lost 0 -Performance_schema_socket_instances_lost 0 -Performance_schema_stage_classes_lost 0 -Performance_schema_statement_classes_lost 0 -Performance_schema_table_handles_lost 0 -Performance_schema_table_instances_lost 0 -Performance_schema_thread_classes_lost 0 -Performance_schema_thread_instances_lost 0 -Performance_schema_users_lost 0 "================== Step 1 ==================" call dump_thread(); username status diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_3t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_3t.result index faaf925dacd..d2ee0bd6c5e 100644 --- a/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_3t.result +++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_3t.result @@ -40,66 +40,6 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name; truncate performance_schema.events_waits_summary_by_host_by_event_name; truncate performance_schema.events_waits_summary_global_by_event_name; truncate performance_schema.events_waits_history_long; -show variables where -`Variable_name` != "performance_schema_max_statement_classes" and -`Variable_name` like "performance_schema%"; -Variable_name Value -performance_schema ON -performance_schema_accounts_size 100 -performance_schema_digests_size 200 -performance_schema_events_stages_history_long_size 1000 -performance_schema_events_stages_history_size 10 -performance_schema_events_statements_history_long_size 1000 -performance_schema_events_statements_history_size 10 -performance_schema_events_waits_history_long_size 10000 -performance_schema_events_waits_history_size 10 -performance_schema_hosts_size 100 -performance_schema_max_cond_classes 80 -performance_schema_max_cond_instances 1000 -performance_schema_max_digest_length 1024 -performance_schema_max_file_classes 50 -performance_schema_max_file_handles 32768 -performance_schema_max_file_instances 10000 -performance_schema_max_mutex_classes 200 -performance_schema_max_mutex_instances 5000 -performance_schema_max_rwlock_classes 40 -performance_schema_max_rwlock_instances 5000 -performance_schema_max_socket_classes 10 -performance_schema_max_socket_instances 1000 -performance_schema_max_stage_classes 150 -performance_schema_max_table_handles 1000 -performance_schema_max_table_instances 500 -performance_schema_max_thread_classes 50 -performance_schema_max_thread_instances 200 -performance_schema_session_connect_attrs_size 2048 -performance_schema_setup_actors_size 100 -performance_schema_setup_objects_size 100 -performance_schema_users_size 100 -show status like "performance_schema%"; -Variable_name Value -Performance_schema_accounts_lost 0 -Performance_schema_cond_classes_lost 0 -Performance_schema_cond_instances_lost 0 -Performance_schema_digest_lost 0 -Performance_schema_file_classes_lost 0 -Performance_schema_file_handles_lost 0 -Performance_schema_file_instances_lost 0 -Performance_schema_hosts_lost 0 -Performance_schema_locker_lost 0 -Performance_schema_mutex_classes_lost 0 -Performance_schema_mutex_instances_lost 0 -Performance_schema_rwlock_classes_lost 0 -Performance_schema_rwlock_instances_lost 0 -Performance_schema_session_connect_attrs_lost 0 -Performance_schema_socket_classes_lost 0 -Performance_schema_socket_instances_lost 0 -Performance_schema_stage_classes_lost 0 -Performance_schema_statement_classes_lost 0 -Performance_schema_table_handles_lost 0 -Performance_schema_table_instances_lost 0 -Performance_schema_thread_classes_lost 0 -Performance_schema_thread_instances_lost 0 -Performance_schema_users_lost 0 "================== Step 1 ==================" call dump_thread(); username status diff --git a/mysql-test/suite/perfschema/t/start_server_off.test b/mysql-test/suite/perfschema/t/start_server_off.test index 8b58f8c0814..400303e05d2 100644 --- a/mysql-test/suite/perfschema/t/start_server_off.test +++ b/mysql-test/suite/perfschema/t/start_server_off.test @@ -7,6 +7,7 @@ # Expecting all off / zero show status like "performance_schema%"; +show variables like "performance_schema"; # Expect all consumers disabled @@ -44,5 +45,3 @@ truncate performance_schema.events_statements_history_long; truncate performance_schema.events_waits_history_long; truncate performance_schema.setup_objects; truncate performance_schema.setup_actors; - - diff --git a/mysql-test/suite/perfschema/t/start_server_variables.test b/mysql-test/suite/perfschema/t/start_server_variables.test new file mode 100644 index 00000000000..57656f9e077 --- /dev/null +++ b/mysql-test/suite/perfschema/t/start_server_variables.test @@ -0,0 +1,11 @@ +# Tests for PERFORMANCE_SCHEMA + +--source include/not_embedded.inc +--source include/have_perfschema.inc + +--source ../include/start_server_common.inc + +# This has a stable output, printing the result: +show variables where + `Variable_name` != "performance_schema_max_statement_classes" and + `Variable_name` like "performance_schema%"; diff --git a/mysql-test/suite/perfschema_stress/t/read.test b/mysql-test/suite/perfschema_stress/t/read.test index c330444f600..829c03985ed 100644 --- a/mysql-test/suite/perfschema_stress/t/read.test +++ b/mysql-test/suite/perfschema_stress/t/read.test @@ -1,4 +1,5 @@ --source include/not_embedded.inc +--source include/have_perfschema.inc SELECT * FROM performance_schema.setup_instruments WHERE ENABLED='NO' AND TIMED='NO'; diff --git a/mysql-test/suite/plugins/r/server_audit.result b/mysql-test/suite/plugins/r/server_audit.result index 45206c8bcb4..0d02ae47586 100644 --- a/mysql-test/suite/plugins/r/server_audit.result +++ b/mysql-test/suite/plugins/r/server_audit.result @@ -52,6 +52,7 @@ alter table t1 rename renamed_t1; set global server_audit_events='connect,query'; select 1, 2, +# comment 3; 1 2 3 1 2 3 @@ -170,7 +171,9 @@ id 2 CREATE USER u1 IDENTIFIED BY 'pwd-123'; GRANT ALL ON sa_db TO u2 IDENTIFIED BY "pwd-321"; -SET PASSWORD FOR u1 = PASSWORD('pwd 098'); +SET PASSWORD +# comment +FOR u1 = PASSWORD('pwd 098'); SET PASSWORD FOR u1=<secret>; 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 '<secret>' at line 1 CREATE USER u3 IDENTIFIED BY ''; @@ -262,7 +265,7 @@ TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,index_stats, TIME,HOSTNAME,root,localhost,ID,ID,RENAME,test,t1|test.renamed_t1, TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'alter table t1 rename renamed_t1',0 TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'set global server_audit_events=\'connect,query\'',0 -TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'select 1, 2, 3',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'select 1,\n2,\n# comment\n3',0 TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'insert into t2 values (1), (2)',0 TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'select * from t2',0 TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'select * from t_doesnt_exist',ID @@ -345,7 +348,7 @@ TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'/*! select 2*/',0 TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'/*comment*/ select 2',0 TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'CREATE USER u1 IDENTIFIED BY *****',0 TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'GRANT ALL ON sa_db TO u2 IDENTIFIED BY *****',0 -TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'SET PASSWORD FOR u1 = PASSWORD(*****)',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'SET PASSWORD \n# comment\nFOR u1 = PASSWORD(*****)',0 TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'SET PASSWORD FOR u1=<secret>',ID TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'CREATE USER u3 IDENTIFIED BY *****',0 TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'drop user u1, u2, u3',0 diff --git a/mysql-test/suite/plugins/r/thread_pool_server_audit.result b/mysql-test/suite/plugins/r/thread_pool_server_audit.result index 45206c8bcb4..cf09ccb3a51 100644 --- a/mysql-test/suite/plugins/r/thread_pool_server_audit.result +++ b/mysql-test/suite/plugins/r/thread_pool_server_audit.result @@ -52,6 +52,7 @@ alter table t1 rename renamed_t1; set global server_audit_events='connect,query'; select 1, 2, +# comment 3; 1 2 3 1 2 3 @@ -170,7 +171,9 @@ id 2 CREATE USER u1 IDENTIFIED BY 'pwd-123'; GRANT ALL ON sa_db TO u2 IDENTIFIED BY "pwd-321"; -SET PASSWORD FOR u1 = PASSWORD('pwd 098'); +SET PASSWORD +# comment +FOR u1 = PASSWORD('pwd 098'); SET PASSWORD FOR u1=<secret>; 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 '<secret>' at line 1 CREATE USER u3 IDENTIFIED BY ''; @@ -262,7 +265,7 @@ TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,index_stats, TIME,HOSTNAME,root,localhost,ID,ID,RENAME,test,t1|test.renamed_t1, TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'alter table t1 rename renamed_t1',0 TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'set global server_audit_events=\'connect,query\'',0 -TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'select 1, 2, 3',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'select 1,\n2,\n# comment\n3',0 TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'insert into t2 values (1), (2)',0 TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'select * from t2',0 TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'select * from t_doesnt_exist',ID @@ -345,7 +348,7 @@ TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'/*! select 2*/',0 TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'/*comment*/ select 2',0 TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'CREATE USER u1 IDENTIFIED BY *****',0 TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'GRANT ALL ON sa_db TO u2 IDENTIFIED BY *****',0 -TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'SET PASSWORD FOR u1 = PASSWORD(*****)',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'SET PASSWORD\n# comment\nFOR u1 = PASSWORD(*****)',0 TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'SET PASSWORD FOR u1=<secret>',ID TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'CREATE USER u3 IDENTIFIED BY *****',0 TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'drop user u1, u2, u3',0 diff --git a/mysql-test/suite/plugins/t/server_audit.test b/mysql-test/suite/plugins/t/server_audit.test index 52428909c3b..9be0d5556f0 100644 --- a/mysql-test/suite/plugins/t/server_audit.test +++ b/mysql-test/suite/plugins/t/server_audit.test @@ -38,6 +38,7 @@ alter table t1 rename renamed_t1; set global server_audit_events='connect,query'; select 1, 2, +# comment 3; insert into t2 values (1), (2); select * from t2; @@ -106,7 +107,9 @@ insert into t1 values (1), (2); select * from t1; CREATE USER u1 IDENTIFIED BY 'pwd-123'; GRANT ALL ON sa_db TO u2 IDENTIFIED BY "pwd-321"; -SET PASSWORD FOR u1 = PASSWORD('pwd 098'); +SET PASSWORD +# comment +FOR u1 = PASSWORD('pwd 098'); --error 1064 SET PASSWORD FOR u1=<secret>; CREATE USER u3 IDENTIFIED BY ''; diff --git a/mysql-test/suite/plugins/t/thread_pool_server_audit.test b/mysql-test/suite/plugins/t/thread_pool_server_audit.test index 626d4136c47..724000c9789 100644 --- a/mysql-test/suite/plugins/t/thread_pool_server_audit.test +++ b/mysql-test/suite/plugins/t/thread_pool_server_audit.test @@ -38,6 +38,7 @@ alter table t1 rename renamed_t1; set global server_audit_events='connect,query'; select 1, 2, +# comment 3; insert into t2 values (1), (2); select * from t2; @@ -106,7 +107,9 @@ insert into t1 values (1), (2); select * from t1; CREATE USER u1 IDENTIFIED BY 'pwd-123'; GRANT ALL ON sa_db TO u2 IDENTIFIED BY "pwd-321"; -SET PASSWORD FOR u1 = PASSWORD('pwd 098'); +SET PASSWORD +# comment +FOR u1 = PASSWORD('pwd 098'); --error 1064 SET PASSWORD FOR u1=<secret>; CREATE USER u3 IDENTIFIED BY ''; diff --git a/mysql-test/suite/rpl/r/rpl_binlog_errors.result b/mysql-test/suite/rpl/r/rpl_binlog_errors.result index 06be72d523b..eb58dd06997 100644 --- a/mysql-test/suite/rpl/r/rpl_binlog_errors.result +++ b/mysql-test/suite/rpl/r/rpl_binlog_errors.result @@ -173,7 +173,7 @@ SET SQL_LOG_BIN=1; SET GLOBAL debug_dbug=@old_debug; ###################### TEST #10 call mtr.add_suppression("MYSQL_BIN_LOG::open failed to sync the index file."); -call mtr.add_suppression("Could not open .*"); +call mtr.add_suppression("Could not use .*"); RESET MASTER; SHOW WARNINGS; Level Code Message @@ -233,7 +233,7 @@ include/rpl_reset.inc connection slave; call mtr.add_suppression("Slave I/O: Relay log write failure: could not queue event from master.*"); call mtr.add_suppression("Error writing file .*"); -call mtr.add_suppression("Could not open .*"); +call mtr.add_suppression("Could not use .*"); call mtr.add_suppression("MYSQL_BIN_LOG::open failed to sync the index file."); call mtr.add_suppression("Can't generate a unique log-filename .*"); ###################### TEST #13 diff --git a/mysql-test/suite/sys_vars/r/innodb_buffer_pool_dump_now_basic.result b/mysql-test/suite/sys_vars/r/innodb_buffer_pool_dump_now_basic.result index 9c3a37f892b..522d5731a6d 100644 --- a/mysql-test/suite/sys_vars/r/innodb_buffer_pool_dump_now_basic.result +++ b/mysql-test/suite/sys_vars/r/innodb_buffer_pool_dump_now_basic.result @@ -1,7 +1,8 @@ -SET @orig = @@global.innodb_buffer_pool_dump_now; -SELECT @orig; -@orig +SELECT @@global.innodb_buffer_pool_dump_now; +@@global.innodb_buffer_pool_dump_now 0 +SELECT variable_value INTO @old_dump_status FROM information_schema.global_status +WHERE LOWER(variable_name) = 'innodb_buffer_pool_dump_status'; SET GLOBAL innodb_buffer_pool_dump_now = ON; SELECT @@global.innodb_buffer_pool_dump_now; @@global.innodb_buffer_pool_dump_now diff --git a/mysql-test/suite/sys_vars/r/innodb_buffer_pool_dump_pct_basic.result b/mysql-test/suite/sys_vars/r/innodb_buffer_pool_dump_pct_basic.result index 485136ccc4c..93a85ffbf43 100644 --- a/mysql-test/suite/sys_vars/r/innodb_buffer_pool_dump_pct_basic.result +++ b/mysql-test/suite/sys_vars/r/innodb_buffer_pool_dump_pct_basic.result @@ -1,7 +1,9 @@ SET @orig = @@global.innodb_buffer_pool_dump_pct; -SELECT @@global.innodb_buffer_pool_dump_pct; -@@global.innodb_buffer_pool_dump_pct +SELECT @orig; +@orig 25 +SET GLOBAL innodb_buffer_pool_dump_pct=3; +# Do the dump SET GLOBAL innodb_buffer_pool_dump_pct=20; SELECT @@global.innodb_buffer_pool_dump_pct; @@global.innodb_buffer_pool_dump_pct diff --git a/mysql-test/suite/sys_vars/r/innodb_buffer_pool_load_now_basic.result b/mysql-test/suite/sys_vars/r/innodb_buffer_pool_load_now_basic.result index 3185d1ca170..eebed4d0f4a 100644 --- a/mysql-test/suite/sys_vars/r/innodb_buffer_pool_load_now_basic.result +++ b/mysql-test/suite/sys_vars/r/innodb_buffer_pool_load_now_basic.result @@ -1,8 +1,6 @@ -SET @orig = @@global.innodb_buffer_pool_load_now; -SELECT @orig; -@orig +SELECT @@global.innodb_buffer_pool_load_now; +@@global.innodb_buffer_pool_load_now 0 -SET GLOBAL innodb_buffer_pool_dump_now = ON; SET GLOBAL innodb_buffer_pool_load_now = ON; SELECT variable_value FROM information_schema.global_status 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 418a7b19ed8..13ac908c288 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result +++ b/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result @@ -3008,9 +3008,9 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_STAGE_CLASSES SESSION_VALUE NULL -GLOBAL_VALUE 150 +GLOBAL_VALUE 160 GLOBAL_VALUE_ORIGIN COMPILE-TIME -DEFAULT_VALUE 150 +DEFAULT_VALUE 160 VARIABLE_SCOPE GLOBAL VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Maximum number of stage instruments. 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 06855b27f15..3d66d99429a 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result +++ b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result @@ -3218,9 +3218,9 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_STAGE_CLASSES SESSION_VALUE NULL -GLOBAL_VALUE 150 +GLOBAL_VALUE 160 GLOBAL_VALUE_ORIGIN COMPILE-TIME -DEFAULT_VALUE 150 +DEFAULT_VALUE 160 VARIABLE_SCOPE GLOBAL VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Maximum number of stage instruments. diff --git a/mysql-test/suite/sys_vars/t/innodb_buffer_pool_dump_now_basic.test b/mysql-test/suite/sys_vars/t/innodb_buffer_pool_dump_now_basic.test index 0bae347428e..8c5f8fa7bf0 100644 --- a/mysql-test/suite/sys_vars/t/innodb_buffer_pool_dump_now_basic.test +++ b/mysql-test/suite/sys_vars/t/innodb_buffer_pool_dump_now_basic.test @@ -5,8 +5,31 @@ -- source include/have_innodb.inc # Check the default value -SET @orig = @@global.innodb_buffer_pool_dump_now; -SELECT @orig; +SELECT @@global.innodb_buffer_pool_dump_now; + +-- let $file = `SELECT CONCAT(@@datadir, @@global.innodb_buffer_pool_filename)` +-- error 0,1 +-- remove_file $file + +SELECT variable_value INTO @old_dump_status FROM information_schema.global_status + WHERE LOWER(variable_name) = 'innodb_buffer_pool_dump_status'; + +# A previous test could have run buffer pool dump already; +# in this case we want to make sure that the current time is different +# from the timestamp in the status variable. +# We should have had a smart wait condition here, like the commented one below, +# let $wait_condition = +# SELECT TRIM(SUBSTR('$old_status', -8)) != DATE_FORMAT(CURTIME(), '%k:%i:%s'); +# -- source include/wait_condition.inc + +# ... but we can't because of MDEV-9867, so there will be just sleep instead. +# And it might be not enough to sleep one second, so we'll have to sleep two. + +if (`SELECT variable_value LIKE '%completed at%' FROM information_schema.global_status + WHERE LOWER(variable_name) = 'innodb_buffer_pool_dump_status'`) +{ + -- sleep 2 +} # Do the dump SET GLOBAL innodb_buffer_pool_dump_now = ON; @@ -15,11 +38,11 @@ SELECT @@global.innodb_buffer_pool_dump_now; # Wait for the dump to complete let $wait_condition = - SELECT SUBSTR(variable_value, 1, 33) = 'Buffer pool(s) dump completed at ' + SELECT variable_value != @old_dump_status + AND SUBSTR(variable_value, 1, 33) = 'Buffer pool(s) dump completed at ' FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_buffer_pool_dump_status'; -- source include/wait_condition.inc # Confirm that the dump file has been created --- let $file = `SELECT CONCAT(@@datadir, @@global.innodb_buffer_pool_filename)` -- file_exists $file diff --git a/mysql-test/suite/sys_vars/t/innodb_buffer_pool_dump_pct_basic.test b/mysql-test/suite/sys_vars/t/innodb_buffer_pool_dump_pct_basic.test index 99d3f79fb27..9b4edafb17e 100644 --- a/mysql-test/suite/sys_vars/t/innodb_buffer_pool_dump_pct_basic.test +++ b/mysql-test/suite/sys_vars/t/innodb_buffer_pool_dump_pct_basic.test @@ -11,9 +11,17 @@ # Save the default value SET @orig = @@global.innodb_buffer_pool_dump_pct; +SELECT @orig; -# Check the default value -SELECT @@global.innodb_buffer_pool_dump_pct; +SET GLOBAL innodb_buffer_pool_dump_pct=3; + +--echo # Do the dump + +--disable_query_log +--disable_result_log +--source innodb_buffer_pool_dump_now_basic.test +--enable_result_log +--enable_query_log # Set the valid value SET GLOBAL innodb_buffer_pool_dump_pct=20; diff --git a/mysql-test/suite/sys_vars/t/innodb_buffer_pool_load_now_basic.opt b/mysql-test/suite/sys_vars/t/innodb_buffer_pool_load_now_basic.opt new file mode 100644 index 00000000000..e462be3c368 --- /dev/null +++ b/mysql-test/suite/sys_vars/t/innodb_buffer_pool_load_now_basic.opt @@ -0,0 +1 @@ +--innodb-buffer-pool-load-at-startup=off diff --git a/mysql-test/suite/sys_vars/t/innodb_buffer_pool_load_now_basic.test b/mysql-test/suite/sys_vars/t/innodb_buffer_pool_load_now_basic.test index a260dc2516b..15536d338e1 100644 --- a/mysql-test/suite/sys_vars/t/innodb_buffer_pool_load_now_basic.test +++ b/mysql-test/suite/sys_vars/t/innodb_buffer_pool_load_now_basic.test @@ -5,44 +5,22 @@ -- source include/have_innodb.inc # Check the default value -SET @orig = @@global.innodb_buffer_pool_load_now; -SELECT @orig; +SELECT @@global.innodb_buffer_pool_load_now; -let $old_status= `SELECT variable_value FROM information_schema.global_status - WHERE LOWER(variable_name) = 'innodb_buffer_pool_dump_status'`; +# Make sure there is a dump file to load -# A previous test could have run buffer pool dump already; -# in this case we want to make sure that the current time is different -# from the timestamp in the status variable. -# We should have had a smart wait condition here, like the commented one below, -# but we can't because of MDEV-9867, so there will be just sleep instead. -# And it might be not enough to sleep one second, so we'll have to sleep two. -# let $wait_condition = -# SELECT TRIM(SUBSTR('$old_status', -8)) != DATE_FORMAT(CURTIME(), '%k:%i:%s'); -# -- source include/wait_condition.inc -if (`SELECT count(*) > 0 FROM information_schema.global_status - WHERE (LOWER(variable_name) = 'innodb_buffer_pool_dump_status' or - LOWER(variable_name) = 'innodb_buffer_pool_load_status') - and variable_value LIKE '%completed at%'`) -{ - -- sleep 2 -} -# Do the dump -SET GLOBAL innodb_buffer_pool_dump_now = ON; - -# Wait for the dump to complete -let $wait_condition = - SELECT variable_value != '$old_status' - AND SUBSTR(variable_value, 1, 33) = 'Buffer pool(s) dump completed at ' - FROM information_schema.global_status - WHERE LOWER(variable_name) = 'innodb_buffer_pool_dump_status'; ---disable_warnings --- source include/wait_condition.inc ---enable_warnings - -# Confirm the file is really created -- let $file = `SELECT CONCAT(@@datadir, @@global.innodb_buffer_pool_filename)` +-- error 0,1 -- file_exists $file +if ($errno) +{ + # Dump file does not exist, get it created + --disable_query_log + --disable_result_log + --source innodb_buffer_pool_dump_now_basic.test + --enable_result_log + --enable_query_log +} let $old_load_status= `SELECT variable_value FROM information_schema.global_status diff --git a/mysql-test/suite/wsrep/disabled.def b/mysql-test/suite/wsrep/disabled.def index 8b137891791..c7c8f2c6216 100644 --- a/mysql-test/suite/wsrep/disabled.def +++ b/mysql-test/suite/wsrep/disabled.def @@ -1 +1,2 @@ +wsrep.foreign_key : Sporadic failure "WSREP has not yet prepared node for application use" diff --git a/mysql-test/t/cte_nonrecursive.test b/mysql-test/t/cte_nonrecursive.test index 57b7ae1658f..742e8f6e4d7 100644 --- a/mysql-test/t/cte_nonrecursive.test +++ b/mysql-test/t/cte_nonrecursive.test @@ -743,3 +743,50 @@ eval $q; eval explain $q; DROP TABLE t1,t2; + +--echo # +--echo # MDEV-13780: tower of embedding CTEs with multiple usage of them +--echo # + +create table t1 (a int); +insert into t1 values (3), (2), (4), (7), (1), (2), (5); + +let $q= +with cte_e as +( + with cte_o as + ( + with cte_i as (select * from t1 where a < 7) + select * from cte_i where a > 1 + ) + select * from cte_o as cto_o1 where a < 3 + union + select * from cte_o as cto_o2 where a > 4 +) +select * from cte_e as cte_e1 where a > 1 +union +select * from cte_e as cte_e2; + +eval $q; +eval explain extended $q; + +drop table t1; + +--echo # +--echo # MDEV-13753: embedded CTE in a VIEW created in prepared statement +--echo # + +SET @sql_query = " + CREATE OR REPLACE VIEW cte_test AS + WITH cte1 AS ( SELECT 1 as a from dual ) + , cte2 AS ( SELECT * FROM cte1 ) + SELECT * FROM cte2; +"; +PREPARE stmt FROM @sql_query; +EXECUTE stmt; +DEALLOCATE PREPARE stmt; + +SHOW CREATE VIEW cte_test; +SELECT * FROM cte_test; + +DROP VIEW cte_test; diff --git a/mysql-test/t/cte_recursive.test b/mysql-test/t/cte_recursive.test index 5701ee896cb..7d7600f0e88 100644 --- a/mysql-test/t/cte_recursive.test +++ b/mysql-test/t/cte_recursive.test @@ -1928,3 +1928,51 @@ set standard_compliant_cte=default; DROP TABLE t; +--echo # +--echo # mdev-14184: recursive CTE embedded into CTE with multiple references +--echo # + +WITH +cte1 AS ( + SELECT n FROM ( + WITH RECURSIVE rec_cte(n) AS ( + SELECT 1 as n1 + UNION ALL + SELECT n+1 as n2 FROM rec_cte WHERE n < 3 + ) SELECT n FROM rec_cte + ) AS X +), +cte2 as ( + SELECT 2 FROM cte1 +) +SELECT * +FROM cte1; + +--echo # +--echo # MDEV-14217 [db crash] Recursive CTE when SELECT includes new field +--echo # + +CREATE TEMPORARY TABLE a_tbl ( + a VARCHAR(33) PRIMARY KEY, + b VARCHAR(33) +); + +INSERT INTO a_tbl VALUES ('block0', 'block0'), ('block1', NULL); + +--error ER_WRONG_NUMBER_OF_COLUMNS_IN_SELECT +WITH RECURSIVE Q0 AS ( + SELECT T0.a, T0.b, 5 + FROM a_tbl T0 + WHERE b IS NULL + UNION ALL + SELECT T1.a, T1.b + FROM Q0 + JOIN a_tbl T1 + ON T1.a=Q0.a +) SELECT distinct(Q0.a), Q0.b + FROM Q0; +DROP TABLE a_tbl; + +--error ER_WRONG_NUMBER_OF_COLUMNS_IN_SELECT +WITH RECURSIVE x AS (SELECT 1,2 UNION ALL SELECT 1 FROM x) SELECT * FROM x; + diff --git a/mysql-test/t/delimiter_case_mdev_10728.sql b/mysql-test/t/delimiter_case_mdev_10728.sql new file mode 100644 index 00000000000..72a1dcd9a9e --- /dev/null +++ b/mysql-test/t/delimiter_case_mdev_10728.sql @@ -0,0 +1,3 @@ +DeLiMiTeR A; +SELECT 1 A; +delimiter ; diff --git a/mysql-test/t/delimiter_command_case_sensitivity.test b/mysql-test/t/delimiter_command_case_sensitivity.test new file mode 100644 index 00000000000..11d1cf75aa0 --- /dev/null +++ b/mysql-test/t/delimiter_command_case_sensitivity.test @@ -0,0 +1,4 @@ +source include/not_embedded.inc; + +# MDEV-10728 +--exec $MYSQL --default-character-set=binary < "t/delimiter_case_mdev_10728.sql" diff --git a/mysql-test/t/derived_cond_pushdown.test b/mysql-test/t/derived_cond_pushdown.test index c4f1ee7d734..a9bb998bc33 100644 --- a/mysql-test/t/derived_cond_pushdown.test +++ b/mysql-test/t/derived_cond_pushdown.test @@ -1550,6 +1550,23 @@ DROP VIEW v2; DROP TABLE t1,t2; --echo # +--echo # MDEV-14237: derived with regexp_substr() in select list +--echo # + +create table t1 (a char(8)); +insert into t1 values ('b'), ('a'), ('xx'); + +let $q= +select * +from ( select distinct regexp_substr(t1.a,'^[A-Za-z]+') as f from t1) as t +where t.f = 'a' or t.f = 'b'; + +eval $q; +eval explain format=json $q; + +drop table t1; + +--echo # --echo # MDEV-10855: Pushdown into derived with window functions --echo # @@ -1834,3 +1851,4 @@ SELECT * FROM v3 JOIN t1 ON (bmax = b); DROP VIEW v1,v2,v3; DROP TABLE t1,t2; + diff --git a/mysql-test/t/errors.test b/mysql-test/t/errors.test index 6836fc5803c..73d94d10382 100644 --- a/mysql-test/t/errors.test +++ b/mysql-test/t/errors.test @@ -213,3 +213,14 @@ select * from seq_1_to_1000; --enable_result_log # We may not be able to execute any more queries with this connection # because of too little memory# + + +--echo # +--echo # MDEV-14269 errors.test fails with valgrind (Conditional jump or move depends on uninitialised value) +--echo # + +SET NAMES utf8; +--error ER_DATA_OUT_OF_RANGE +SELECT UPDATEXML(-73 * -2465717823867977728,@@global.auto_increment_increment,null); +--error ER_DATA_OUT_OF_RANGE +SELECT UPDATEXML(-73 * -2465717823867977728,@@global.long_query_time,null); diff --git a/mysql-test/t/func_misc.test b/mysql-test/t/func_misc.test index ebfdced802b..91ee449a7ff 100644 --- a/mysql-test/t/func_misc.test +++ b/mysql-test/t/func_misc.test @@ -1104,6 +1104,23 @@ SELECT CONCAT(NAME_CONST('name',15),'오'); SET NAMES latin1; --echo # +--echo # MDEV-14116 INET6_NTOA output is set as null to varchar(39) variable +--echo # + +DELIMITER $$; +CREATE PROCEDURE p1() +BEGIN + DECLARE ip_full_addr varchar(39) DEFAULT ""; + SELECT INET6_NTOA(UNHEX('20000000000000000000000000000000')) into ip_full_addr; + SELECT ip_full_addr; +END; +$$ +DELIMITER ;$$ +CALL p1(); +DROP PROCEDURE p1; + + +--echo # --echo # Start of 10.2 tests --echo # diff --git a/mysql-test/t/having.test b/mysql-test/t/having.test index 160b347f870..3d8f7dc42b7 100644 --- a/mysql-test/t/having.test +++ b/mysql-test/t/having.test @@ -758,3 +758,83 @@ DROP VIEW v1; DROP TABLE t1; --echo End of 10.1 tests + +--echo # +--echo # MDEV-14093: GROUP BY with HAVING over function + ORDER BY +--echo # + +CREATE TABLE _authors ( + id MEDIUMINT(8) UNSIGNED AUTO_INCREMENT, + name VARCHAR(100), + some_field MEDIUMINT(8) UNSIGNED, + PRIMARY KEY (id), + index(some_field) +); + +CREATE TABLE _books ( + id MEDIUMINT(8) UNSIGNED AUTO_INCREMENT, + title VARCHAR(100), + PRIMARY KEY (id) +); +CREATE TABLE _books2authors ( + author_id MEDIUMINT(8) DEFAULT 0, + book_id MEDIUMINT(8) DEFAULT 0, + index(author_id), + index(book_id) +); + +INSERT INTO _authors (name, some_field) VALUES +('author1', 1),('author2', 2),('author3', 3); + +INSERT INTO _books (title) VALUES +('book1'),('book2'),('book3'); + +INSERT INTO _books2authors (author_id, book_id) VALUES +(2,1),(3,2),(3,3); + +SELECT A.id, + GROUP_CONCAT(B.title ORDER BY B.title DESC SEPARATOR ',') AS books, + some_field-1 AS having_field +FROM _authors A + LEFT JOIN _books2authors B2A FORCE INDEX(author_id) + ON B2A.author_id = A.id + LEFT JOIN + _books B ON B.id = B2A.book_id +GROUP BY A.id +HAVING having_field < 1 +ORDER BY having_field ASC; + +DROP TABLE _authors, _books, _books2authors; + +--echo # +--echo # Bug#17055185: WRONG RESULTS WHEN RUNNING A SELECT THAT INCLUDE +--echo # A HAVING BASED ON A FUNCTION. +--echo # + +# Generate series 1, 0, 1, 0.... +CREATE TABLE series ( + val INT(10) UNSIGNED NOT NULL +); +INSERT INTO series VALUES(1); + +DELIMITER |; +CREATE FUNCTION next_seq_value() RETURNS INT +BEGIN + DECLARE next_val INT; + SELECT val INTO next_val FROM series; + UPDATE series SET val=mod(val + 1, 2); + RETURN next_val; +END; +| +DELIMITER ;| + +CREATE TABLE t1 (t INT, u INT, KEY(t)); +INSERT INTO t1 VALUES(10, 10), (11, 11), (12, 12), (12, 13),(14, 15), (15, 16), + (16, 17), (17, 17); +ANALYZE TABLE t1; +SELECT t, next_seq_value() r FROM t1 FORCE INDEX(t) + GROUP BY t HAVING r = 1 ORDER BY t1.u; + +DROP TABLE t1; +DROP FUNCTION next_seq_value; +DROP TABLE series; diff --git a/mysql-test/t/show_check.test b/mysql-test/t/show_check.test index 262013e0d2c..d84226460f2 100644 --- a/mysql-test/t/show_check.test +++ b/mysql-test/t/show_check.test @@ -423,7 +423,7 @@ create table t1 ( SHOW CREATE TABLE t1; DROP TABLE t1; -# Test for Bug#93 4.1 protocl crash on corupted frm and SHOW TABLE STATUS +# Test for Bug#93 4.1 protocol crash on corrupted frm and SHOW TABLE STATUS flush tables; @@ -437,7 +437,7 @@ show create table t1; --disable_warnings drop table if exists t1; --enable_warnings ---error 1,0 +--error 0,1 --remove_file $MYSQLD_DATADIR/test/t1.frm # diff --git a/mysql-test/t/subselect_exists2in.test b/mysql-test/t/subselect_exists2in.test index a4fdbe5c50b..5a8ddb3612f 100644 --- a/mysql-test/t/subselect_exists2in.test +++ b/mysql-test/t/subselect_exists2in.test @@ -786,6 +786,46 @@ set optimizer_switch= @optimizer_switch_save; DROP TABLE t1; +--echo # +--echo # MDEV-14164: Unknown column error when adding aggregate to function +--echo # in oracle style procedure FOR loop +--echo # + +CREATE TABLE t1(id INT, val INT); +DELIMITER //; +CREATE PROCEDURE p1() +BEGIN + DECLARE cur1 CURSOR FOR SELECT * FROM ( + SELECT DISTINCT id FROM t1) a + WHERE NOT EXISTS (SELECT * FROM ( SELECT id FROM t1) b + WHERE a.id=b.id); + OPEN cur1; + CLOSE cur1; + OPEN cur1; + CLOSE cur1; +END; +// +DELIMITER ;// +CALL p1(); +DROP PROCEDURE p1; +DROP TABLE t1; + +CREATE TABLE t1(id INT, val INT); +DELIMITER //; +CREATE PROCEDURE p1() +BEGIN + SELECT * FROM (SELECT DISTINCT id FROM t1) a + WHERE NOT a.id IN (SELECT b.id FROM t1 b); + SELECT * FROM (SELECT DISTINCT id FROM t1) a + WHERE NOT EXISTS (SELECT * FROM t1 b WHERE a.id=b.id); +END; +// +DELIMITER ;// +CALL p1(); +CALL p1(); +DROP PROCEDURE p1; +DROP TABLE t1; + --echo # End of 10.0 tests #restore defaults diff --git a/mysql-test/t/type_bit.test b/mysql-test/t/type_bit.test index 761f200fe0c..bb282fc15e5 100644 --- a/mysql-test/t/type_bit.test +++ b/mysql-test/t/type_bit.test @@ -439,3 +439,22 @@ SELECT SUM(a) FROM t1 GROUP BY c, b, a; DROP TABLE t1; --echo End of 5.1 tests + +--echo # +--echo # Start of 10.1 tests +--echo # + +--echo # +--echo # MDEV-8867 Wrong field type or metadata for COALESCE(bit_column, 1) +--echo # + +CREATE TABLE t1 (val bit(1)); +INSERT INTO t1 VALUES (0); +CREATE TABLE t2 AS SELECT COALESCE(val, 1) AS c FROM t1; +SELECT * FROM t2; +SHOW CREATE TABLE t2; +DROP TABLE t2; +--enable_metadata +SELECT COALESCE(val, 1) FROM t1; +--disable_metadata +DROP TABLE t1; diff --git a/mysql-test/t/type_date.test b/mysql-test/t/type_date.test index 7c4af618c23..8d29a54a26c 100644 --- a/mysql-test/t/type_date.test +++ b/mysql-test/t/type_date.test @@ -582,6 +582,15 @@ SELECT DATE(a), DATE(b), DATE(c) FROM t1; SELECT DATE(COALESCE(a)), DATE(COALESCE(b)), DATE(COALESCE(c)) FROM t1; DROP TABLE t1; +--echo # +--echo # MDEV-14221 Assertion `0' failed in Item::field_type_for_temporal_comparison +--echo # + +CREATE TABLE t1 (d DATE); +INSERT INTO t1 VALUES ('1985-05-13'),('1989-12-24'); +SELECT d, COUNT(*) FROM t1 GROUP BY d WITH ROLLUP HAVING CASE d WHEN '2017-05-25' THEN 0 ELSE 1 END; +DROP TABLE t1; + --echo # --echo # End of 10.1 tests diff --git a/mysql-test/t/type_time.test b/mysql-test/t/type_time.test index 6662a3d9bb0..5f3f58df166 100644 --- a/mysql-test/t/type_time.test +++ b/mysql-test/t/type_time.test @@ -747,6 +747,17 @@ DROP TABLE t1,t2; --echo # +--echo # MDEV-10817 CAST(MAX(DATE'2001-01-01') AS TIME) returns a wrong result +--echo # + +SELECT CAST(DATE'2001-01-01' AS TIME); +SELECT CAST(MAX(DATE'2001-01-01') AS TIME); +CREATE FUNCTION f1() RETURNS DATE RETURN DATE'2001-01-01'; +SELECT CAST(f1() AS TIME); +DROP FUNCTION f1; + + +--echo # --echo # End of 10.2 tests --echo # diff --git a/mysql-test/t/view.test b/mysql-test/t/view.test index 4850b6c06cb..847fb843ec8 100644 --- a/mysql-test/t/view.test +++ b/mysql-test/t/view.test @@ -1,3 +1,4 @@ +--source include/have_partition.inc # Save the initial number of concurrent sessions. --source include/count_sessions.inc diff --git a/mysql-test/valgrind.supp b/mysql-test/valgrind.supp index 215afda36ee..3def1bd083b 100644 --- a/mysql-test/valgrind.supp +++ b/mysql-test/valgrind.supp @@ -1247,6 +1247,13 @@ } { + Galera uses gcc __thread variables + Memcheck:Leak + fun:memalign + fun:__tls_get_addr +} + +{ Mroonga: dlopen leaves some "still reachable" Memcheck:Leak fun:malloc @@ -1747,8 +1754,10 @@ match-leak-kinds: reachable fun:malloc fun:CRYPTO_malloc - fun:ENGINE_ADD + ... + fun:ENGINE_add } + { OPENSSL 1.0.1k crypto leak Memcheck:Leak @@ -1757,14 +1766,3 @@ fun:CRYPTO_malloc fun:ENGINE_new } - -{ - OPENSSL 1.0.1k crypto leak2 - Memcheck:Leak - match-leak-kinds: reachable - fun:malloc - fun:CRYPTO_malloc - fun:sk_new - obj:/lib64/libcrypto.so* - fun:ENGINE_ADD -} diff --git a/mysys/my_alloc.c b/mysys/my_alloc.c index 7275f602525..3df73127998 100644 --- a/mysys/my_alloc.c +++ b/mysys/my_alloc.c @@ -68,6 +68,7 @@ void init_alloc_root(MEM_ROOT *mem_root, size_t block_size, mem_root->error_handler= 0; mem_root->block_num= 4; /* We shift this with >>2 */ mem_root->first_block_usage= 0; + mem_root->total_alloc= 0; #if !(defined(HAVE_valgrind) && defined(EXTRA_DEBUG)) if (pre_alloc_size) @@ -77,6 +78,7 @@ void init_alloc_root(MEM_ROOT *mem_root, size_t block_size, MYF(my_flags)))) { mem_root->free->size= pre_alloc_size+ALIGN_SIZE(sizeof(USED_MEM)); + mem_root->total_alloc= pre_alloc_size+ALIGN_SIZE(sizeof(USED_MEM)); mem_root->free->left= pre_alloc_size; mem_root->free->next= 0; } @@ -134,6 +136,7 @@ void reset_root_defaults(MEM_ROOT *mem_root, size_t block_size, { /* remove block from the list and free it */ *prev= mem->next; + mem_root->total_alloc-= mem->size; my_free(mem); } else @@ -145,9 +148,10 @@ void reset_root_defaults(MEM_ROOT *mem_root, size_t block_size, block_size))))) { mem->size= size; + mem_root->total_alloc+= size; mem->left= pre_alloc_size; mem->next= *prev; - *prev= mem_root->pre_alloc= mem; + *prev= mem_root->pre_alloc= mem; } else { @@ -190,8 +194,10 @@ void *alloc_root(MEM_ROOT *mem_root, size_t length) DBUG_RETURN((uchar*) 0); /* purecov: inspected */ } next->next= mem_root->used; + next->left= 0; next->size= length; mem_root->used= next; + mem_root->total_alloc+= length; DBUG_PRINT("exit",("ptr: %p", (((char*) next)+ ALIGN_SIZE(sizeof(USED_MEM))))); DBUG_RETURN((uchar*) (((char*) next)+ALIGN_SIZE(sizeof(USED_MEM)))); @@ -244,6 +250,7 @@ void *alloc_root(MEM_ROOT *mem_root, size_t length) DBUG_RETURN((void*) 0); /* purecov: inspected */ } mem_root->block_num++; + mem_root->total_alloc+= get_size; next->next= *prev; next->size= get_size; next->left= get_size-ALIGN_SIZE(sizeof(USED_MEM)); @@ -346,6 +353,7 @@ static inline void mark_blocks_free(MEM_ROOT* root) /* Now everything is set; Indicate that nothing is used anymore */ root->used= 0; root->first_block_usage= 0; + root->block_num= 4; } @@ -374,11 +382,17 @@ void free_root(MEM_ROOT *root, myf MyFlags) DBUG_ENTER("free_root"); DBUG_PRINT("enter",("root: %p flags: %u", root, (uint) MyFlags)); +#if !(defined(HAVE_valgrind) && defined(EXTRA_DEBUG)) + /* + There is no point in using mark_blocks_free when using valgrind as + it will not reclaim any memory + */ if (MyFlags & MY_MARK_BLOCKS_FREE) { mark_blocks_free(root); DBUG_VOID_RETURN; } +#endif if (!(MyFlags & MY_KEEP_PREALLOC)) root->pre_alloc=0; @@ -386,13 +400,19 @@ void free_root(MEM_ROOT *root, myf MyFlags) { old=next; next= next->next ; if (old != root->pre_alloc) + { + root->total_alloc-= old->size; my_free(old); + } } for (next=root->free ; next ;) { old=next; next= next->next; if (old != root->pre_alloc) + { + root->total_alloc-= old->size; my_free(old); + } } root->used=root->free=0; if (root->pre_alloc) diff --git a/plugin/server_audit/server_audit.c b/plugin/server_audit/server_audit.c index 1035065eec0..be05671fb2e 100644 --- a/plugin/server_audit/server_audit.c +++ b/plugin/server_audit/server_audit.c @@ -15,7 +15,7 @@ #define PLUGIN_VERSION 0x104 -#define PLUGIN_STR_VERSION "1.4.2" +#define PLUGIN_STR_VERSION "1.4.3" #define _my_thread_var loc_thread_var @@ -1116,6 +1116,21 @@ do { \ } while(0) +#define ESC_MAP_SIZE 0x60 +static const char esc_map[ESC_MAP_SIZE]= +{ + 0, 0, 0, 0, 0, 0, 0, 0, 'b', 't', 'n', 0, 'f', 'r', 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, '\'', 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '\\', 0, 0, 0 +}; + +static char escaped_char(char c) +{ + return ((unsigned char ) c) >= ESC_MAP_SIZE ? 0 : esc_map[(unsigned char) c]; +} static void setup_connection_initdb(struct connection_info *cn, @@ -1322,21 +1337,16 @@ static size_t escape_string(const char *str, unsigned int len, const char *res_end= result + result_len - 2; while (len) { + char esc_c; + if (result >= res_end) break; - if (*str == '\'') - { - if (result+1 >= res_end) - break; - *(result++)= '\\'; - *(result++)= '\''; - } - else if (*str == '\\') + if ((esc_c= escaped_char(*str))) { if (result+1 >= res_end) break; *(result++)= '\\'; - *(result++)= '\\'; + *(result++)= esc_c; } else if (is_space(*str)) *(result++)= ' '; @@ -1425,19 +1435,12 @@ static size_t escape_string_hide_passwords(const char *str, unsigned int len, no_password: if (result >= res_end) break; - if (*str == '\'') + if ((b_char= escaped_char(*str))) { if (result+1 >= res_end) break; *(result++)= '\\'; - *(result++)= '\''; - } - else if (*str == '\\') - { - if (result+1 >= res_end) - break; - *(result++)= '\\'; - *(result++)= '\\'; + *(result++)= b_char; } else if (is_space(*str)) *(result++)= ' '; diff --git a/sql/datadict.cc b/sql/datadict.cc index 7ea83236cd6..4425f278e12 100644 --- a/sql/datadict.cc +++ b/sql/datadict.cc @@ -46,11 +46,13 @@ static int read_string(File file, uchar**to, size_t length) engine_name is a LEX_CSTRING, where engine_name->str must point to a buffer of at least NAME_CHAR_LEN+1 bytes. + If engine_name is 0, then the function will only test if the file is a + view or not @param[out] is_sequence 1 if table is a SEQUENCE, 0 otherwise @retval TABLE_TYPE_UNKNOWN error - @retval TABLE_TYPE_TABLE table + @retval TABLE_TYPE_NORMAL table @retval TABLE_TYPE_SEQUENCE sequence table @retval TABLE_TYPE_VIEW view */ @@ -80,12 +82,26 @@ Table_type dd_frm_type(THD *thd, char *path, LEX_CSTRING *engine_name, goto err; } + /* + We return TABLE_TYPE_NORMAL if we can read the .frm file. This allows us + to drop a bad .frm file with DROP TABLE + */ type= TABLE_TYPE_NORMAL; - if (!is_binary_frm_header(header) || !engine_name) + /* engine_name is 0 if we only want to know if table is view or not */ + if (!engine_name) goto err; + /* + Initialize engine name in case we are not able to find it out + The cast is safe, as engine_name->str points to a usable buffer. + */ engine_name->length= 0; + ((char*) (engine_name->str))[0]= 0; + + if (!is_binary_frm_header(header)) + goto err; + dbt= header[3]; if (((header[39] >> 4) & 3) == HA_CHOICE_YES) diff --git a/sql/handler.cc b/sql/handler.cc index 5e392fa02e6..c260b5da54d 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -2247,7 +2247,7 @@ int ha_start_consistent_snapshot(THD *thd) */ if (warn) push_warning(thd, Sql_condition::WARN_LEVEL_WARN, ER_UNKNOWN_ERROR, - "This MySQL server does not support any " + "This MariaDB server does not support any " "consistent-read capable storage engine"); return 0; } @@ -5101,8 +5101,13 @@ bool ha_table_exists(THD *thd, const char *db, const char *table_name, { char engine_buf[NAME_CHAR_LEN + 1]; LEX_CSTRING engine= { engine_buf, 0 }; + Table_type type; - if (dd_frm_type(thd, path, &engine, is_sequence) != TABLE_TYPE_VIEW) + if ((type= dd_frm_type(thd, path, &engine, is_sequence)) == + TABLE_TYPE_UNKNOWN) + DBUG_RETURN(0); + + if (type != TABLE_TYPE_VIEW) { plugin_ref p= plugin_lock_by_name(thd, &engine, MYSQL_STORAGE_ENGINE_PLUGIN); diff --git a/sql/item.cc b/sql/item.cc index d36e6516fb9..2285ae28041 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -3237,7 +3237,8 @@ table_map Item_field::all_used_tables() const return (get_depended_from() ? OUTER_REF_TABLE_BIT : field->table->map); } -void Item_field::fix_after_pullout(st_select_lex *new_parent, Item **ref) +void Item_field::fix_after_pullout(st_select_lex *new_parent, Item **ref, + bool merge) { if (new_parent == get_depended_from()) depended_from= NULL; @@ -3281,6 +3282,19 @@ void Item_field::fix_after_pullout(st_select_lex *new_parent, Item **ref) if (!need_change) return; + if (!merge) + { + /* + It is transformation without merge. + This field was "outer" for the inner SELECT where it was taken and + moved up. + "Outer" fields uses normal SELECT_LEX context of upper SELECTs for + name resolution, so we can switch everything to it safely. + */ + this->context= &new_parent->context; + return; + } + Name_resolution_context *ctx= new Name_resolution_context(); if (context->select_lex == new_parent) { @@ -8704,18 +8718,19 @@ bool Item_outer_ref::fix_fields(THD *thd, Item **reference) void Item_outer_ref::fix_after_pullout(st_select_lex *new_parent, - Item **ref_arg) + Item **ref_arg, bool merge) { if (get_depended_from() == new_parent) { *ref_arg= outer_ref; - (*ref_arg)->fix_after_pullout(new_parent, ref_arg); + (*ref_arg)->fix_after_pullout(new_parent, ref_arg, merge); } } -void Item_ref::fix_after_pullout(st_select_lex *new_parent, Item **refptr) +void Item_ref::fix_after_pullout(st_select_lex *new_parent, Item **refptr, + bool merge) { - (*ref)->fix_after_pullout(new_parent, ref); + (*ref)->fix_after_pullout(new_parent, ref, merge); if (get_depended_from() == new_parent) depended_from= NULL; } diff --git a/sql/item.h b/sql/item.h index c7ef5202389..dbbc93c5e9d 100644 --- a/sql/item.h +++ b/sql/item.h @@ -733,7 +733,9 @@ public: Fix after some tables has been pulled out. Basically re-calculate all attributes that are dependent on the tables. */ - virtual void fix_after_pullout(st_select_lex *new_parent, Item **ref) {}; + virtual void fix_after_pullout(st_select_lex *new_parent, Item **ref, + bool merge) + {}; /* This method should be used in case where we are sure that we do not need @@ -2762,7 +2764,7 @@ public: bool send(Protocol *protocol, st_value *buffer); void reset_field(Field *f); bool fix_fields(THD *, Item **); - void fix_after_pullout(st_select_lex *new_parent, Item **ref); + void fix_after_pullout(st_select_lex *new_parent, Item **ref, bool merge); void make_field(THD *thd, Send_field *tmp_field); int save_in_field(Field *field,bool no_conversions); void save_org_in_field(Field *field, fast_field_copier optimizer_data); @@ -3028,6 +3030,17 @@ public: Field *result_field; Item_null_result(THD *thd): Item_null(thd), result_field(0) {} bool is_result_field() { return result_field != 0; } +#if MARIADB_VERSION_ID < 100300 + enum_field_types field_type() const + { + return result_field->type(); + } +#else + const Type_handler *type_handler() const + { + return result_field->type_handler(); + } +#endif void save_in_result_field(bool no_conversions) { save_in_field(result_field, no_conversions); @@ -4392,7 +4405,7 @@ public: bool send(Protocol *prot, st_value *buffer); void make_field(THD *thd, Send_field *field); bool fix_fields(THD *, Item **); - void fix_after_pullout(st_select_lex *new_parent, Item **ref); + void fix_after_pullout(st_select_lex *new_parent, Item **ref, bool merge); int save_in_field(Field *field, bool no_conversions); void save_org_in_field(Field *field, fast_field_copier optimizer_data); fast_field_copier setup_fast_field_copier(Field *field) @@ -4700,9 +4713,9 @@ public: Item *it= ((Item *) item)->real_item(); return orig_item->eq(it, binary_cmp); } - void fix_after_pullout(st_select_lex *new_parent, Item **refptr) + void fix_after_pullout(st_select_lex *new_parent, Item **refptr, bool merge) { - orig_item->fix_after_pullout(new_parent, &orig_item); + orig_item->fix_after_pullout(new_parent, &orig_item, merge); } int save_in_field(Field *to, bool no_conversions); const Type_handler *type_handler() const { return orig_item->type_handler(); } @@ -4971,7 +4984,7 @@ public: outer_ref->save_org_in_field(result_field, NULL); } bool fix_fields(THD *, Item **); - void fix_after_pullout(st_select_lex *new_parent, Item **ref); + void fix_after_pullout(st_select_lex *new_parent, Item **ref, bool merge); table_map used_tables() const { return (*ref)->const_item() ? 0 : OUTER_REF_TABLE_BIT; diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index 775fb425000..fe73bfc3622 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -1220,10 +1220,11 @@ bool Item_in_optimizer::is_top_level_item() } -void Item_in_optimizer::fix_after_pullout(st_select_lex *new_parent, Item **ref) +void Item_in_optimizer::fix_after_pullout(st_select_lex *new_parent, + Item **ref, bool merge) { /* This will re-calculate attributes of our Item_in_subselect: */ - Item_bool_func::fix_after_pullout(new_parent, ref); + Item_bool_func::fix_after_pullout(new_parent, ref, merge); /* Then, re-calculate not_null_tables_cache: */ eval_not_null_tables(NULL); @@ -2050,10 +2051,11 @@ bool Item_func_between::count_sargable_conds(void *arg) } -void Item_func_between::fix_after_pullout(st_select_lex *new_parent, Item **ref) +void Item_func_between::fix_after_pullout(st_select_lex *new_parent, + Item **ref, bool merge) { /* This will re-calculate attributes of the arguments */ - Item_func_opt_neg::fix_after_pullout(new_parent, ref); + Item_func_opt_neg::fix_after_pullout(new_parent, ref, merge); /* Then, re-calculate not_null_tables_cache according to our special rules */ eval_not_null_tables(NULL); } @@ -2378,10 +2380,11 @@ Item_func_if::eval_not_null_tables(void *opt_arg) } -void Item_func_if::fix_after_pullout(st_select_lex *new_parent, Item **ref) +void Item_func_if::fix_after_pullout(st_select_lex *new_parent, + Item **ref, bool merge) { /* This will re-calculate attributes of the arguments */ - Item_func::fix_after_pullout(new_parent, ref); + Item_func::fix_after_pullout(new_parent, ref, merge); /* Then, re-calculate not_null_tables_cache according to our special rules */ eval_not_null_tables(NULL); } @@ -4144,10 +4147,11 @@ Item_func_in::eval_not_null_tables(void *opt_arg) } -void Item_func_in::fix_after_pullout(st_select_lex *new_parent, Item **ref) +void Item_func_in::fix_after_pullout(st_select_lex *new_parent, Item **ref, + bool merge) { /* This will re-calculate attributes of the arguments */ - Item_func_opt_neg::fix_after_pullout(new_parent, ref); + Item_func_opt_neg::fix_after_pullout(new_parent, ref, merge); /* Then, re-calculate not_null_tables_cache according to our special rules */ eval_not_null_tables(NULL); } @@ -4671,7 +4675,8 @@ Item_cond::eval_not_null_tables(void *opt_arg) } -void Item_cond::fix_after_pullout(st_select_lex *new_parent, Item **ref) +void Item_cond::fix_after_pullout(st_select_lex *new_parent, Item **ref, + bool merge) { List_iterator<Item> li(list); Item *item; @@ -4684,7 +4689,7 @@ void Item_cond::fix_after_pullout(st_select_lex *new_parent, Item **ref) while ((item=li++)) { table_map tmp_table_map; - item->fix_after_pullout(new_parent, li.ref()); + item->fix_after_pullout(new_parent, li.ref(), merge); item= *li.ref(); used_tables_and_const_cache_join(item); diff --git a/sql/item_cmpfunc.h b/sql/item_cmpfunc.h index 2cb46deaafc..7bab02db263 100644 --- a/sql/item_cmpfunc.h +++ b/sql/item_cmpfunc.h @@ -375,7 +375,7 @@ public: virtual void get_cache_parameters(List<Item> ¶meters); bool is_top_level_item(); bool eval_not_null_tables(void *opt_arg); - void fix_after_pullout(st_select_lex *new_parent, Item **ref); + void fix_after_pullout(st_select_lex *new_parent, Item **ref, bool merge); bool invisible_mode(); void reset_cache() { cache= NULL; } Item *get_copy(THD *thd, MEM_ROOT *mem_root) @@ -908,7 +908,7 @@ public: bool fix_length_and_dec_numeric(THD *); virtual void print(String *str, enum_query_type query_type); bool eval_not_null_tables(void *opt_arg); - void fix_after_pullout(st_select_lex *new_parent, Item **ref); + void fix_after_pullout(st_select_lex *new_parent, Item **ref, bool merge); bool count_sargable_conds(void *arg); void add_key_fields(JOIN *join, KEY_FIELD **key_fields, uint *and_level, table_map usable_tables, @@ -1144,7 +1144,7 @@ public: } const char *func_name() const { return "if"; } bool eval_not_null_tables(void *opt_arg); - void fix_after_pullout(st_select_lex *new_parent, Item **ref); + void fix_after_pullout(st_select_lex *new_parent, Item **ref, bool merge); Item *get_copy(THD *thd, MEM_ROOT *mem_root) { return get_item_copy<Item_func_if>(thd, mem_root, this); } private: @@ -2382,7 +2382,7 @@ public: const char *func_name() const { return "in"; } enum precedence precedence() const { return CMP_PRECEDENCE; } bool eval_not_null_tables(void *opt_arg); - void fix_after_pullout(st_select_lex *new_parent, Item **ref); + void fix_after_pullout(st_select_lex *new_parent, Item **ref, bool merge); bool count_sargable_conds(void *arg); Item *get_copy(THD *thd, MEM_ROOT *mem_root) { return get_item_copy<Item_func_in>(thd, mem_root, this); } @@ -2910,7 +2910,7 @@ public: list.append(nlist); } bool fix_fields(THD *, Item **ref); - void fix_after_pullout(st_select_lex *new_parent, Item **ref); + void fix_after_pullout(st_select_lex *new_parent, Item **ref, bool merge); enum Type type() const { return COND_ITEM; } List<Item>* argument_list() { return &list; } diff --git a/sql/item_func.cc b/sql/item_func.cc index 28690ff2bee..0d32fdf1824 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -406,7 +406,8 @@ Item_func::eval_not_null_tables(void *opt_arg) } -void Item_func::fix_after_pullout(st_select_lex *new_parent, Item **ref) +void Item_func::fix_after_pullout(st_select_lex *new_parent, Item **ref, + bool merge) { Item **arg,**arg_end; @@ -417,7 +418,7 @@ void Item_func::fix_after_pullout(st_select_lex *new_parent, Item **ref) { for (arg=args, arg_end=args+arg_count; arg != arg_end ; arg++) { - (*arg)->fix_after_pullout(new_parent, arg); + (*arg)->fix_after_pullout(new_parent, arg, merge); Item *item= *arg; used_tables_and_const_cache_join(item); diff --git a/sql/item_func.h b/sql/item_func.h index de213df0fc5..3ba2ebf9d86 100644 --- a/sql/item_func.h +++ b/sql/item_func.h @@ -129,7 +129,7 @@ public: Item_func_or_sum::cleanup(); used_tables_and_const_cache_init(); } - void fix_after_pullout(st_select_lex *new_parent, Item **ref); + void fix_after_pullout(st_select_lex *new_parent, Item **ref, bool merge); void quick_fix_field(); table_map not_null_tables() const; void update_used_tables() @@ -2809,6 +2809,13 @@ public: return sp_result_field->val_decimal(dec_buf); } + bool get_date(MYSQL_TIME *ltime, ulonglong fuzzydate) + { + if (execute()) + return true; + return sp_result_field->get_date(ltime, fuzzydate); + } + String *val_str(String *str) { String buf; diff --git a/sql/item_geofunc.cc b/sql/item_geofunc.cc index fe089e6283d..a060ed221bf 100644 --- a/sql/item_geofunc.cc +++ b/sql/item_geofunc.cc @@ -135,7 +135,7 @@ String *Item_func_geometry_from_json::val_str(String *str) { String *sv= args[1]->val_str(&tmp_js); my_error(ER_WRONG_VALUE_FOR_TYPE, MYF(0), - "option", sv->c_ptr(), "ST_GeometryFromJSON"); + "option", sv->c_ptr_safe(), "ST_GeometryFromJSON"); null_value= 1; return 0; } diff --git a/sql/item_inetfunc.cc b/sql/item_inetfunc.cc index c434953ad43..d4788a39d5e 100644 --- a/sql/item_inetfunc.cc +++ b/sql/item_inetfunc.cc @@ -181,7 +181,8 @@ String *Item_func_inet_str_base::val_str_ascii(String *buffer) return NULL; } - String *arg_str= args[0]->val_str(buffer); + StringBuffer<STRING_BUFFER_USUAL_SIZE> tmp; + String *arg_str= args[0]->val_str(&tmp); if (!arg_str) // Out-of memory happened. The error has been reported. { // Or: the underlying field is NULL null_value= true; @@ -679,7 +680,7 @@ static void ipv6_to_str(const in6_addr *ipv6, char *str) @retval true The string has been converted sucessfully. */ -bool Item_func_inet6_aton::calc_value(String *arg, String *buffer) +bool Item_func_inet6_aton::calc_value(const String *arg, String *buffer) { // ipv4-string -> varbinary(4) // ipv6-string -> varbinary(16) @@ -719,7 +720,7 @@ bool Item_func_inet6_aton::calc_value(String *arg, String *buffer) @retval true The string has been converted sucessfully. */ -bool Item_func_inet6_ntoa::calc_value(String *arg, String *buffer) +bool Item_func_inet6_ntoa::calc_value(const String *arg, String *buffer) { if (arg->charset() != &my_charset_bin) return false; diff --git a/sql/item_inetfunc.h b/sql/item_inetfunc.h index 13ce003a374..bd0a95b5270 100644 --- a/sql/item_inetfunc.h +++ b/sql/item_inetfunc.h @@ -105,7 +105,7 @@ public: virtual String *val_str_ascii(String *buffer); protected: - virtual bool calc_value(String *arg, String *buffer) = 0; + virtual bool calc_value(const String *arg, String *buffer) = 0; }; @@ -134,7 +134,7 @@ public: { return get_item_copy<Item_func_inet6_aton>(thd, mem_root, this); } protected: - virtual bool calc_value(String *arg, String *buffer); + virtual bool calc_value(const String *arg, String *buffer); }; @@ -168,7 +168,7 @@ public: { return get_item_copy<Item_func_inet6_ntoa>(thd, mem_root, this); } protected: - virtual bool calc_value(String *arg, String *buffer); + virtual bool calc_value(const String *arg, String *buffer); }; diff --git a/sql/item_row.cc b/sql/item_row.cc index 3b8bd8d3e59..9c029b16292 100644 --- a/sql/item_row.cc +++ b/sql/item_row.cc @@ -110,13 +110,14 @@ void Item_row::split_sum_func(THD *thd, Ref_ptr_array ref_pointer_array, } -void Item_row::fix_after_pullout(st_select_lex *new_parent, Item **ref) +void Item_row::fix_after_pullout(st_select_lex *new_parent, Item **ref, + bool merge) { used_tables_and_const_cache_init(); not_null_tables_cache= 0; for (uint i= 0; i < arg_count; i++) { - args[i]->fix_after_pullout(new_parent, &args[i]); + args[i]->fix_after_pullout(new_parent, &args[i], merge); used_tables_and_const_cache_join(args[i]); not_null_tables_cache|= args[i]->not_null_tables(); } diff --git a/sql/item_row.h b/sql/item_row.h index 83e9743fede..a6fdd2b212c 100644 --- a/sql/item_row.h +++ b/sql/item_row.h @@ -81,7 +81,7 @@ public: return 0; }; bool fix_fields(THD *thd, Item **ref); - void fix_after_pullout(st_select_lex *new_parent, Item **ref); + void fix_after_pullout(st_select_lex *new_parent, Item **ref, bool merge); void cleanup(); void split_sum_func(THD *thd, Ref_ptr_array ref_pointer_array, List<Item> &fields, uint flags); diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h index c322136bef2..fbcf69d00ce 100644 --- a/sql/item_strfunc.h +++ b/sql/item_strfunc.h @@ -400,8 +400,7 @@ public: bool fix_fields(THD *thd, Item **ref); void fix_length_and_dec(); const char *func_name() const { return "regexp_replace"; } - Item *get_copy(THD *thd, MEM_ROOT *mem_root) - { return get_item_copy<Item_func_regexp_replace>(thd, mem_root, this); } + Item *get_copy(THD *thd, MEM_ROOT *mem_root) { return 0;} }; @@ -423,8 +422,7 @@ public: bool fix_fields(THD *thd, Item **ref); void fix_length_and_dec(); const char *func_name() const { return "regexp_substr"; } - Item *get_copy(THD *thd, MEM_ROOT *mem_root) - { return get_item_copy<Item_func_regexp_substr>(thd, mem_root, this); } + Item *get_copy(THD *thd, MEM_ROOT *mem_root) { return 0; } }; diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc index aa92ae1e6b1..3a7d8582913 100644 --- a/sql/item_subselect.cc +++ b/sql/item_subselect.cc @@ -460,7 +460,8 @@ bool Item_subselect::mark_as_dependent(THD *thd, st_select_lex *select, OUTER_REF_TABLE_BIT. */ -void Item_subselect::fix_after_pullout(st_select_lex *new_parent, Item **ref) +void Item_subselect::fix_after_pullout(st_select_lex *new_parent, + Item **ref, bool merge) { recalc_used_tables(new_parent, TRUE); parent_select= new_parent; @@ -1168,7 +1169,8 @@ Item_singlerow_subselect::select_transformer(JOIN *join) /* as far as we moved content to upper level we have to fix dependences & Co */ - substitution->fix_after_pullout(select_lex->outer_select(), &substitution); + substitution->fix_after_pullout(select_lex->outer_select(), + &substitution, TRUE); } DBUG_RETURN(false); } @@ -2945,7 +2947,7 @@ bool Item_exists_subselect::exists2in_processor(void *opt_arg) goto out; } } - outer_exp->fix_after_pullout(unit->outer_select(), &outer_exp); + outer_exp->fix_after_pullout(unit->outer_select(), &outer_exp, FALSE); outer_exp->update_used_tables(); outer.push_back(outer_exp, thd->mem_root); } @@ -3326,10 +3328,11 @@ err: } -void Item_in_subselect::fix_after_pullout(st_select_lex *new_parent, Item **ref) +void Item_in_subselect::fix_after_pullout(st_select_lex *new_parent, + Item **ref, bool merge) { - left_expr->fix_after_pullout(new_parent, &left_expr); - Item_subselect::fix_after_pullout(new_parent, ref); + left_expr->fix_after_pullout(new_parent, &left_expr, merge); + Item_subselect::fix_after_pullout(new_parent, ref, merge); used_tables_cache |= left_expr->used_tables(); } diff --git a/sql/item_subselect.h b/sql/item_subselect.h index 14394bf6342..9e548e94ac1 100644 --- a/sql/item_subselect.h +++ b/sql/item_subselect.h @@ -183,7 +183,7 @@ public: } bool fix_fields(THD *thd, Item **ref); bool mark_as_dependent(THD *thd, st_select_lex *select, Item *item); - void fix_after_pullout(st_select_lex *new_parent, Item **ref); + void fix_after_pullout(st_select_lex *new_parent, Item **ref, bool merge); void recalc_used_tables(st_select_lex *new_parent, bool after_pullout); virtual bool exec(); /* @@ -625,7 +625,7 @@ public: enum precedence precedence() const { return CMP_PRECEDENCE; } bool fix_fields(THD *thd, Item **ref); void fix_length_and_dec(); - void fix_after_pullout(st_select_lex *new_parent, Item **ref); + void fix_after_pullout(st_select_lex *new_parent, Item **ref, bool merge); bool const_item() const { return Item_subselect::const_item() && left_expr->const_item(); diff --git a/sql/item_sum.cc b/sql/item_sum.cc index b047dc4ea4d..269190ef3df 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -2019,6 +2019,18 @@ void Item_sum_hybrid::clear() null_value= 1; } +bool +Item_sum_hybrid::get_date(MYSQL_TIME *ltime, ulonglong fuzzydate) +{ + DBUG_ASSERT(fixed == 1); + if (null_value) + return true; + bool retval= value->get_date(ltime, fuzzydate); + if ((null_value= value->null_value)) + DBUG_ASSERT(retval == true); + return retval; +} + double Item_sum_hybrid::val_real() { DBUG_ASSERT(fixed == 1); diff --git a/sql/item_sum.h b/sql/item_sum.h index 467a77c8983..e91728a1aa1 100644 --- a/sql/item_sum.h +++ b/sql/item_sum.h @@ -1035,6 +1035,7 @@ protected: double val_real(); longlong val_int(); my_decimal *val_decimal(my_decimal *); + bool get_date(MYSQL_TIME *ltime, ulonglong fuzzydate); void reset_field(); String *val_str(String *); const Type_handler *real_type_handler() const diff --git a/sql/item_xmlfunc.cc b/sql/item_xmlfunc.cc index ee307ba2194..b08d43f041c 100644 --- a/sql/item_xmlfunc.cc +++ b/sql/item_xmlfunc.cc @@ -2464,6 +2464,21 @@ static int my_xpath_parse_UnaryExpr(MY_XPATH *xpath) } +/** + A helper class to make a null-terminated string from XPath fragments. + The string is allocated on the THD memory root. +*/ +class XPath_cstring_null_terminated: public LEX_CSTRING +{ +public: + XPath_cstring_null_terminated(THD *thd, const char *str, size_t length) + { + if (thd->make_lex_string(this, str, length)) + static_cast<LEX_CSTRING>(*this)= empty_clex_str; + } +}; + + /* Scan Number @@ -2498,14 +2513,15 @@ static int my_xpath_parse_Number(MY_XPATH *xpath) thd= xpath->thd; if (!my_xpath_parse_term(xpath, MY_XPATH_LEX_DOT)) { - xpath->item= new (thd->mem_root) Item_int(thd, xpath->prevtok.beg, - (uint)(xpath->prevtok.end - xpath->prevtok.beg)); - return 1; + XPath_cstring_null_terminated nr(thd, beg, xpath->prevtok.end - beg); + xpath->item= new (thd->mem_root) Item_int(thd, nr.str, (uint) nr.length); + } + else + { + my_xpath_parse_term(xpath, MY_XPATH_LEX_DIGITS); + XPath_cstring_null_terminated nr(thd, beg, xpath->prevtok.end - beg); + xpath->item= new (thd->mem_root) Item_float(thd, nr.str, (uint) nr.length); } - my_xpath_parse_term(xpath, MY_XPATH_LEX_DIGITS); - - xpath->item= new (thd->mem_root) Item_float(thd, beg, - (uint)(xpath->prevtok.end - beg)); return 1; } diff --git a/sql/lock.cc b/sql/lock.cc index 6fa68786b93..8e43001e742 100644 --- a/sql/lock.cc +++ b/sql/lock.cc @@ -421,8 +421,11 @@ void mysql_unlock_tables(THD *thd, MYSQL_LOCK *sql_lock) void mysql_unlock_tables(THD *thd, MYSQL_LOCK *sql_lock, bool free_lock) { - DBUG_ENTER("mysql_unlock_tables"); bool errors= thd->is_error(); + PSI_stage_info org_stage; + DBUG_ENTER("mysql_unlock_tables"); + + thd->backup_stage(&org_stage); THD_STAGE_INFO(thd, stage_unlocking_tables); if (sql_lock->table_count) @@ -433,6 +436,7 @@ void mysql_unlock_tables(THD *thd, MYSQL_LOCK *sql_lock, bool free_lock) my_free(sql_lock); if (!errors) thd->clear_error(); + THD_STAGE_INFO(thd, org_stage); DBUG_VOID_RETURN; } diff --git a/sql/log.cc b/sql/log.cc index 008cc0b59aa..09bd23be2bf 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -109,6 +109,13 @@ static ulonglong binlog_status_group_commit_trigger_timeout; static char binlog_snapshot_file[FN_REFLEN]; static ulonglong binlog_snapshot_position; +static const char *fatal_log_error= + "Could not use %s for logging (error %d). " + "Turning logging off for the whole duration of the MariaDB server process. " + "To turn it on again: fix the cause, shutdown the MariaDB server and " + "restart it."; + + static SHOW_VAR binlog_status_vars_detail[]= { {"commits", @@ -2002,7 +2009,9 @@ static bool trans_cannot_safely_rollback(THD *thd, bool all) static int binlog_commit(handlerton *hton, THD *thd, bool all) { int error= 0; + PSI_stage_info org_stage; DBUG_ENTER("binlog_commit"); + binlog_cache_mngr *const cache_mngr= (binlog_cache_mngr*) thd_get_ha_data(thd, binlog_hton); @@ -2019,6 +2028,9 @@ static int binlog_commit(handlerton *hton, THD *thd, bool all) YESNO(thd->transaction.all.modified_non_trans_table), YESNO(thd->transaction.stmt.modified_non_trans_table))); + + thd->backup_stage(&org_stage); + THD_STAGE_INFO(thd, stage_binlog_write); if (!cache_mngr->stmt_cache.empty()) { error= binlog_commit_flush_stmt_cache(thd, all, cache_mngr); @@ -2030,6 +2042,7 @@ static int binlog_commit(handlerton *hton, THD *thd, bool all) we're here because cache_log was flushed in MYSQL_BIN_LOG::log_xid() */ cache_mngr->reset(false, true); + THD_STAGE_INFO(thd, org_stage); DBUG_RETURN(error); } @@ -2048,6 +2061,7 @@ static int binlog_commit(handlerton *hton, THD *thd, bool all) if (!all) cache_mngr->trx_cache.set_prev_position(MY_OFF_T_UNDEF); + THD_STAGE_INFO(thd, org_stage); DBUG_RETURN(error); } @@ -2683,10 +2697,7 @@ bool MYSQL_LOG::open( DBUG_RETURN(0); err: - sql_print_error("Could not use %s for logging (error %d). \ -Turning logging off for the whole duration of the MySQL server process. \ -To turn it on again: fix the cause, \ -shutdown the MySQL server and restart it.", name, errno); + sql_print_error(fatal_log_error, name, errno); if (file >= 0) mysql_file_close(file, MYF(0)); end_io_cache(&log_file); @@ -3794,15 +3805,13 @@ bool MYSQL_BIN_LOG::open(const char *log_name, DBUG_RETURN(0); err: + int tmp_errno= errno; #ifdef HAVE_REPLICATION if (is_inited_purge_index_file()) purge_index_entry(NULL, NULL, need_mutex); close_purge_index_file(); #endif - sql_print_error("Could not use %s for logging (error %d). \ -Turning logging off for the whole duration of the MySQL server process. \ -To turn it on again: fix the cause, \ -shutdown the MySQL server and restart it.", name, errno); + sql_print_error(fatal_log_error, name, tmp_errno); if (new_xid_list_entry) my_free(new_xid_list_entry); if (file >= 0) @@ -5229,12 +5238,7 @@ end: - ... */ close(LOG_CLOSE_INDEX); - sql_print_error("Could not open %s for logging (error %d). " - "Turning logging off for the whole duration " - "of the MySQL server process. To turn it on " - "again: fix the cause, shutdown the MySQL " - "server and restart it.", - new_name_ptr, errno); + sql_print_error(fatal_log_error, new_name_ptr, errno); } mysql_mutex_unlock(&LOCK_index); diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 1e435f0beec..6433ecfb25f 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -384,6 +384,7 @@ mysql_cond_t COND_thread_cache; static mysql_cond_t COND_flush_thread_cache; mysql_cond_t COND_slave_background; static DYNAMIC_ARRAY all_options; +static longlong start_memory_used; /* Global variables */ @@ -4061,6 +4062,8 @@ static void my_malloc_size_cb_func(long long size, my_bool is_thread_specific) (longlong) thd->status_var.local_memory_used, size)); thd->status_var.local_memory_used+= size; + set_if_bigger(thd->status_var.max_local_memory_used, + thd->status_var.local_memory_used); if (size > 0 && thd->status_var.local_memory_used > (int64)thd->variables.max_mem_used && !thd->killed && !thd->get_stmt_da()->is_set()) @@ -6121,6 +6124,9 @@ int mysqld_main(int argc, char **argv) MYSQL_SET_STAGE(0 ,__FILE__, __LINE__); + /* Memory used when everything is setup */ + start_memory_used= global_status_var.global_memory_used; + #if defined(_WIN32) || defined(HAVE_SMEM) handle_connections_methods(); #else @@ -8526,6 +8532,7 @@ SHOW_VAR status_vars[]= { {"Master_gtid_wait_time", (char*) offsetof(STATUS_VAR, master_gtid_wait_time), SHOW_LONGLONG_STATUS}, {"Max_used_connections", (char*) &max_used_connections, SHOW_LONG}, {"Memory_used", (char*) &show_memory_used, SHOW_SIMPLE_FUNC}, + {"Memory_used_initial", (char*) &start_memory_used, SHOW_LONGLONG}, {"Not_flushed_delayed_rows", (char*) &delayed_rows_in_use, SHOW_LONG_NOFLUSH}, {"Open_files", (char*) &my_file_opened, SHOW_LONG_NOFLUSH}, {"Open_streams", (char*) &my_stream_opened, SHOW_LONG_NOFLUSH}, @@ -10167,104 +10174,110 @@ static PSI_file_info all_server_files[]= }; #endif /* HAVE_PSI_INTERFACE */ -PSI_stage_info stage_after_apply_event= { 0, "after apply log event", 0}; +PSI_stage_info stage_after_apply_event= { 0, "After apply log event", 0}; PSI_stage_info stage_after_create= { 0, "After create", 0}; PSI_stage_info stage_after_opening_tables= { 0, "After opening tables", 0}; PSI_stage_info stage_after_table_lock= { 0, "After table lock", 0}; -PSI_stage_info stage_allocating_local_table= { 0, "allocating local table", 0}; -PSI_stage_info stage_alter_inplace_prepare= { 0, "preparing for alter table", 0}; -PSI_stage_info stage_alter_inplace= { 0, "altering table", 0}; -PSI_stage_info stage_alter_inplace_commit= { 0, "committing alter table to storage engine", 0}; -PSI_stage_info stage_apply_event= { 0, "apply log event", 0}; +PSI_stage_info stage_allocating_local_table= { 0, "Allocating local table", 0}; +PSI_stage_info stage_alter_inplace_prepare= { 0, "Preparing for alter table", 0}; +PSI_stage_info stage_alter_inplace= { 0, "Altering table", 0}; +PSI_stage_info stage_alter_inplace_commit= { 0, "Committing alter table to storage engine", 0}; +PSI_stage_info stage_apply_event= { 0, "Apply log event", 0}; PSI_stage_info stage_changing_master= { 0, "Changing master", 0}; PSI_stage_info stage_checking_master_version= { 0, "Checking master version", 0}; -PSI_stage_info stage_checking_permissions= { 0, "checking permissions", 0}; -PSI_stage_info stage_checking_privileges_on_cached_query= { 0, "checking privileges on cached query", 0}; -PSI_stage_info stage_checking_query_cache_for_query= { 0, "checking query cache for query", 0}; -PSI_stage_info stage_cleaning_up= { 0, "cleaning up", 0}; -PSI_stage_info stage_closing_tables= { 0, "closing tables", 0}; +PSI_stage_info stage_checking_permissions= { 0, "Checking permissions", 0}; +PSI_stage_info stage_checking_privileges_on_cached_query= { 0, "Checking privileges on cached query", 0}; +PSI_stage_info stage_checking_query_cache_for_query= { 0, "Checking query cache for query", 0}; +PSI_stage_info stage_cleaning_up= { 0, "Reset for next command", 0}; +PSI_stage_info stage_closing_tables= { 0, "Closing tables", 0}; PSI_stage_info stage_connecting_to_master= { 0, "Connecting to master", 0}; -PSI_stage_info stage_converting_heap_to_myisam= { 0, "converting HEAP to " TMP_ENGINE_NAME, 0}; +PSI_stage_info stage_converting_heap_to_myisam= { 0, "Converting HEAP to " TMP_ENGINE_NAME, 0}; PSI_stage_info stage_copying_to_group_table= { 0, "Copying to group table", 0}; PSI_stage_info stage_copying_to_tmp_table= { 0, "Copying to tmp table", 0}; -PSI_stage_info stage_copy_to_tmp_table= { 0, "copy to tmp table", 0}; +PSI_stage_info stage_copy_to_tmp_table= { 0, "Copy to tmp table", 0}; PSI_stage_info stage_creating_delayed_handler= { 0, "Creating delayed handler", 0}; PSI_stage_info stage_creating_sort_index= { 0, "Creating sort index", 0}; -PSI_stage_info stage_creating_table= { 0, "creating table", 0}; +PSI_stage_info stage_creating_table= { 0, "Creating table", 0}; PSI_stage_info stage_creating_tmp_table= { 0, "Creating tmp table", 0}; -PSI_stage_info stage_deleting_from_main_table= { 0, "deleting from main table", 0}; -PSI_stage_info stage_deleting_from_reference_tables= { 0, "deleting from reference tables", 0}; -PSI_stage_info stage_discard_or_import_tablespace= { 0, "discard_or_import_tablespace", 0}; -PSI_stage_info stage_enabling_keys= { 0, "enabling keys", 0}; -PSI_stage_info stage_end= { 0, "end", 0}; -PSI_stage_info stage_executing= { 0, "executing", 0}; +PSI_stage_info stage_deleting_from_main_table= { 0, "Deleting from main table", 0}; +PSI_stage_info stage_deleting_from_reference_tables= { 0, "Deleting from reference tables", 0}; +PSI_stage_info stage_discard_or_import_tablespace= { 0, "Discard_or_import_tablespace", 0}; +PSI_stage_info stage_enabling_keys= { 0, "Enabling keys", 0}; +PSI_stage_info stage_end= { 0, "End of update loop", 0}; +PSI_stage_info stage_executing= { 0, "Executing", 0}; PSI_stage_info stage_execution_of_init_command= { 0, "Execution of init_command", 0}; -PSI_stage_info stage_explaining= { 0, "explaining", 0}; +PSI_stage_info stage_explaining= { 0, "Explaining", 0}; PSI_stage_info stage_finding_key_cache= { 0, "Finding key cache", 0}; PSI_stage_info stage_finished_reading_one_binlog_switching_to_next_binlog= { 0, "Finished reading one binlog; switching to next binlog", 0}; PSI_stage_info stage_flushing_relay_log_and_master_info_repository= { 0, "Flushing relay log and master info repository.", 0}; PSI_stage_info stage_flushing_relay_log_info_file= { 0, "Flushing relay-log info file.", 0}; -PSI_stage_info stage_freeing_items= { 0, "freeing items", 0}; -PSI_stage_info stage_fulltext_initialization= { 0, "FULLTEXT initialization", 0}; -PSI_stage_info stage_got_handler_lock= { 0, "got handler lock", 0}; -PSI_stage_info stage_got_old_table= { 0, "got old table", 0}; -PSI_stage_info stage_init= { 0, "init", 0}; -PSI_stage_info stage_insert= { 0, "insert", 0}; -PSI_stage_info stage_invalidating_query_cache_entries_table= { 0, "invalidating query cache entries (table)", 0}; -PSI_stage_info stage_invalidating_query_cache_entries_table_list= { 0, "invalidating query cache entries (table list)", 0}; +PSI_stage_info stage_freeing_items= { 0, "Freeing items", 0}; +PSI_stage_info stage_fulltext_initialization= { 0, "Fulltext initialization", 0}; +PSI_stage_info stage_got_handler_lock= { 0, "Got handler lock", 0}; +PSI_stage_info stage_got_old_table= { 0, "Got old table", 0}; +PSI_stage_info stage_init= { 0, "Init", 0}; +PSI_stage_info stage_init_update= { 0, "Init for update", 0}; +PSI_stage_info stage_insert= { 0, "Insert", 0}; +PSI_stage_info stage_invalidating_query_cache_entries_table= { 0, "Invalidating query cache entries (table)", 0}; +PSI_stage_info stage_invalidating_query_cache_entries_table_list= { 0, "Invalidating query cache entries (table list)", 0}; PSI_stage_info stage_killing_slave= { 0, "Killing slave", 0}; -PSI_stage_info stage_logging_slow_query= { 0, "logging slow query", 0}; +PSI_stage_info stage_logging_slow_query= { 0, "Logging slow query", 0}; PSI_stage_info stage_making_temp_file_append_before_load_data= { 0, "Making temporary file (append) before replaying LOAD DATA INFILE.", 0}; PSI_stage_info stage_making_temp_file_create_before_load_data= { 0, "Making temporary file (create) before replaying LOAD DATA INFILE.", 0}; -PSI_stage_info stage_manage_keys= { 0, "manage keys", 0}; +PSI_stage_info stage_manage_keys= { 0, "Manage keys", 0}; PSI_stage_info stage_master_has_sent_all_binlog_to_slave= { 0, "Master has sent all binlog to slave; waiting for binlog to be updated", 0}; PSI_stage_info stage_opening_tables= { 0, "Opening tables", 0}; -PSI_stage_info stage_optimizing= { 0, "optimizing", 0}; -PSI_stage_info stage_preparing= { 0, "preparing", 0}; +PSI_stage_info stage_optimizing= { 0, "Optimizing", 0}; +PSI_stage_info stage_preparing= { 0, "Preparing", 0}; PSI_stage_info stage_purging_old_relay_logs= { 0, "Purging old relay logs", 0}; -PSI_stage_info stage_query_end= { 0, "query end", 0}; +PSI_stage_info stage_query_end= { 0, "Query end", 0}; +PSI_stage_info stage_starting_cleanup= { 0, "Starting cleanup", 0}; +PSI_stage_info stage_rollback= { 0, "Rollback", 0}; +PSI_stage_info stage_rollback_implicit= { 0, "Rollback_implicit", 0}; +PSI_stage_info stage_commit= { 0, "Commit", 0}; +PSI_stage_info stage_commit_implicit= { 0, "Commit_implicit", 0}; PSI_stage_info stage_queueing_master_event_to_the_relay_log= { 0, "Queueing master event to the relay log", 0}; PSI_stage_info stage_reading_event_from_the_relay_log= { 0, "Reading event from the relay log", 0}; -PSI_stage_info stage_recreating_table= { 0, "recreating table", 0}; +PSI_stage_info stage_recreating_table= { 0, "Recreating table", 0}; PSI_stage_info stage_registering_slave_on_master= { 0, "Registering slave on master", 0}; PSI_stage_info stage_removing_duplicates= { 0, "Removing duplicates", 0}; -PSI_stage_info stage_removing_tmp_table= { 0, "removing tmp table", 0}; -PSI_stage_info stage_rename= { 0, "rename", 0}; -PSI_stage_info stage_rename_result_table= { 0, "rename result table", 0}; +PSI_stage_info stage_removing_tmp_table= { 0, "Removing tmp table", 0}; +PSI_stage_info stage_rename= { 0, "Rename", 0}; +PSI_stage_info stage_rename_result_table= { 0, "Rename result table", 0}; PSI_stage_info stage_requesting_binlog_dump= { 0, "Requesting binlog dump", 0}; -PSI_stage_info stage_reschedule= { 0, "reschedule", 0}; +PSI_stage_info stage_reschedule= { 0, "Reschedule", 0}; PSI_stage_info stage_searching_rows_for_update= { 0, "Searching rows for update", 0}; PSI_stage_info stage_sending_binlog_event_to_slave= { 0, "Sending binlog event to slave", 0}; -PSI_stage_info stage_sending_cached_result_to_client= { 0, "sending cached result to client", 0}; +PSI_stage_info stage_sending_cached_result_to_client= { 0, "Sending cached result to client", 0}; PSI_stage_info stage_sending_data= { 0, "Sending data", 0}; -PSI_stage_info stage_setup= { 0, "setup", 0}; -PSI_stage_info stage_show_explain= { 0, "show explain", 0}; +PSI_stage_info stage_setup= { 0, "Setup", 0}; +PSI_stage_info stage_show_explain= { 0, "Show explain", 0}; PSI_stage_info stage_slave_has_read_all_relay_log= { 0, "Slave has read all relay log; waiting for the slave I/O thread to update it", 0}; PSI_stage_info stage_sorting= { 0, "Sorting", 0}; PSI_stage_info stage_sorting_for_group= { 0, "Sorting for group", 0}; PSI_stage_info stage_sorting_for_order= { 0, "Sorting for order", 0}; PSI_stage_info stage_sorting_result= { 0, "Sorting result", 0}; -PSI_stage_info stage_statistics= { 0, "statistics", 0}; +PSI_stage_info stage_statistics= { 0, "Statistics", 0}; PSI_stage_info stage_sql_thd_waiting_until_delay= { 0, "Waiting until MASTER_DELAY seconds after master executed event", 0 }; -PSI_stage_info stage_storing_result_in_query_cache= { 0, "storing result in query cache", 0}; -PSI_stage_info stage_storing_row_into_queue= { 0, "storing row into queue", 0}; +PSI_stage_info stage_storing_result_in_query_cache= { 0, "Storing result in query cache", 0}; +PSI_stage_info stage_storing_row_into_queue= { 0, "Storing row into queue", 0}; PSI_stage_info stage_system_lock= { 0, "System lock", 0}; PSI_stage_info stage_unlocking_tables= { 0, "Unlocking tables", 0}; PSI_stage_info stage_table_lock= { 0, "Table lock", 0}; PSI_stage_info stage_filling_schema_table= { 0, "Filling schema table", 0}; -PSI_stage_info stage_update= { 0, "update", 0}; -PSI_stage_info stage_updating= { 0, "updating", 0}; -PSI_stage_info stage_updating_main_table= { 0, "updating main table", 0}; -PSI_stage_info stage_updating_reference_tables= { 0, "updating reference tables", 0}; -PSI_stage_info stage_upgrading_lock= { 0, "upgrading lock", 0}; +PSI_stage_info stage_update= { 0, "Update", 0}; +PSI_stage_info stage_updating= { 0, "Updating", 0}; +PSI_stage_info stage_updating_main_table= { 0, "Updating main table", 0}; +PSI_stage_info stage_updating_reference_tables= { 0, "Updating reference tables", 0}; +PSI_stage_info stage_upgrading_lock= { 0, "Upgrading lock", 0}; PSI_stage_info stage_user_lock= { 0, "User lock", 0}; PSI_stage_info stage_user_sleep= { 0, "User sleep", 0}; -PSI_stage_info stage_verifying_table= { 0, "verifying table", 0}; -PSI_stage_info stage_waiting_for_delay_list= { 0, "waiting for delay_list", 0}; -PSI_stage_info stage_waiting_for_gtid_to_be_written_to_binary_log= { 0, "waiting for GTID to be written to binary log", 0}; -PSI_stage_info stage_waiting_for_handler_insert= { 0, "waiting for handler insert", 0}; -PSI_stage_info stage_waiting_for_handler_lock= { 0, "waiting for handler lock", 0}; -PSI_stage_info stage_waiting_for_handler_open= { 0, "waiting for handler open", 0}; +PSI_stage_info stage_verifying_table= { 0, "Verifying table", 0}; +PSI_stage_info stage_waiting_for_delay_list= { 0, "Waiting for delay_list", 0}; +PSI_stage_info stage_waiting_for_gtid_to_be_written_to_binary_log= { 0, "Waiting for GTID to be written to binary log", 0}; +PSI_stage_info stage_waiting_for_handler_insert= { 0, "Waiting for handler insert", 0}; +PSI_stage_info stage_waiting_for_handler_lock= { 0, "Waiting for handler lock", 0}; +PSI_stage_info stage_waiting_for_handler_open= { 0, "Waiting for handler open", 0}; PSI_stage_info stage_waiting_for_insert= { 0, "Waiting for INSERT", 0}; PSI_stage_info stage_waiting_for_master_to_send_event= { 0, "Waiting for master to send event", 0}; PSI_stage_info stage_waiting_for_master_update= { 0, "Waiting for master update", 0}; @@ -10278,6 +10291,7 @@ PSI_stage_info stage_waiting_for_the_slave_thread_to_advance_position= { 0, "Wai PSI_stage_info stage_waiting_to_finalize_termination= { 0, "Waiting to finalize termination", 0}; PSI_stage_info stage_waiting_to_get_readlock= { 0, "Waiting to get readlock", 0}; PSI_stage_info stage_binlog_waiting_background_tasks= { 0, "Waiting for background binlog tasks", 0}; +PSI_stage_info stage_binlog_write= { 0, "Writing to binlog", 0}; PSI_stage_info stage_binlog_processing_checkpoint_notify= { 0, "Processing binlog checkpoint notification", 0}; PSI_stage_info stage_binlog_stopping_background_thread= { 0, "Stopping binlog background thread", 0}; PSI_stage_info stage_waiting_for_work_from_sql_thread= { 0, "Waiting for work from SQL thread", 0}; @@ -10308,6 +10322,7 @@ PSI_stage_info *all_server_stages[]= & stage_alter_inplace_commit, & stage_alter_inplace_prepare, & stage_apply_event, + & stage_binlog_write, & stage_binlog_processing_checkpoint_notify, & stage_binlog_stopping_background_thread, & stage_binlog_waiting_background_tasks, @@ -10318,6 +10333,8 @@ PSI_stage_info *all_server_stages[]= & stage_checking_query_cache_for_query, & stage_cleaning_up, & stage_closing_tables, + & stage_commit, + & stage_commit_implicit, & stage_connecting_to_master, & stage_converting_heap_to_myisam, & stage_copy_to_tmp_table, @@ -10344,6 +10361,7 @@ PSI_stage_info *all_server_stages[]= & stage_got_handler_lock, & stage_got_old_table, & stage_init, + & stage_init_update, & stage_insert, & stage_invalidating_query_cache_entries_table, & stage_invalidating_query_cache_entries_table_list, @@ -10357,6 +10375,7 @@ PSI_stage_info *all_server_stages[]= & stage_optimizing, & stage_preparing, & stage_purging_old_relay_logs, + & stage_starting_cleanup, & stage_query_end, & stage_queueing_master_event_to_the_relay_log, & stage_reading_event_from_the_relay_log, @@ -10368,6 +10387,8 @@ PSI_stage_info *all_server_stages[]= & stage_rename_result_table, & stage_requesting_binlog_dump, & stage_reschedule, + & stage_rollback, + & stage_rollback_implicit, & stage_searching_rows_for_update, & stage_sending_binlog_event_to_slave, & stage_sending_cached_result_to_client, diff --git a/sql/mysqld.h b/sql/mysqld.h index 8364eecdb7c..7dc81787de1 100644 --- a/sql/mysqld.h +++ b/sql/mysqld.h @@ -415,6 +415,7 @@ extern PSI_stage_info stage_fulltext_initialization; extern PSI_stage_info stage_got_handler_lock; extern PSI_stage_info stage_got_old_table; extern PSI_stage_info stage_init; +extern PSI_stage_info stage_init_update; extern PSI_stage_info stage_insert; extern PSI_stage_info stage_invalidating_query_cache_entries_table; extern PSI_stage_info stage_invalidating_query_cache_entries_table_list; @@ -429,6 +430,11 @@ extern PSI_stage_info stage_optimizing; extern PSI_stage_info stage_preparing; extern PSI_stage_info stage_purging_old_relay_logs; extern PSI_stage_info stage_query_end; +extern PSI_stage_info stage_starting_cleanup; +extern PSI_stage_info stage_rollback; +extern PSI_stage_info stage_rollback_implicit; +extern PSI_stage_info stage_commit; +extern PSI_stage_info stage_commit_implicit; extern PSI_stage_info stage_queueing_master_event_to_the_relay_log; extern PSI_stage_info stage_reading_event_from_the_relay_log; extern PSI_stage_info stage_recreating_table; @@ -484,6 +490,7 @@ extern PSI_stage_info stage_waiting_for_the_slave_thread_to_advance_position; extern PSI_stage_info stage_waiting_to_finalize_termination; extern PSI_stage_info stage_waiting_to_get_readlock; extern PSI_stage_info stage_binlog_waiting_background_tasks; +extern PSI_stage_info stage_binlog_write; extern PSI_stage_info stage_binlog_processing_checkpoint_notify; extern PSI_stage_info stage_binlog_stopping_background_thread; extern PSI_stage_info stage_waiting_for_work_from_sql_thread; diff --git a/sql/opt_subselect.cc b/sql/opt_subselect.cc index 25b98434ef3..b6378685268 100644 --- a/sql/opt_subselect.cc +++ b/sql/opt_subselect.cc @@ -1644,7 +1644,7 @@ static bool convert_subq_to_sj(JOIN *parent_join, Item_in_subselect *subq_pred) { tl->jtbm_table_no= table_no; Item *dummy= tl->jtbm_subselect; - tl->jtbm_subselect->fix_after_pullout(parent_lex, &dummy); + tl->jtbm_subselect->fix_after_pullout(parent_lex, &dummy, true); DBUG_ASSERT(dummy == tl->jtbm_subselect); } SELECT_LEX *old_sl= tl->select_lex; @@ -1785,7 +1785,8 @@ static bool convert_subq_to_sj(JOIN *parent_join, Item_in_subselect *subq_pred) Walk through sj nest's WHERE and ON expressions and call item->fix_table_changes() for all items. */ - sj_nest->sj_on_expr->fix_after_pullout(parent_lex, &sj_nest->sj_on_expr); + sj_nest->sj_on_expr->fix_after_pullout(parent_lex, &sj_nest->sj_on_expr, + TRUE); fix_list_after_tbl_changes(parent_lex, &sj_nest->nested_join->join_list); @@ -1944,7 +1945,7 @@ static bool convert_subq_to_jtbm(JOIN *parent_join, DBUG_ASSERT(parent_join->table_count < MAX_TABLES); Item *conds= hash_sj_engine->semi_join_conds; - conds->fix_after_pullout(parent_lex, &conds); + conds->fix_after_pullout(parent_lex, &conds, TRUE); DBUG_EXECUTE("where", print_where(conds,"SJ-EXPR", QT_ORDINARY);); @@ -1996,7 +1997,7 @@ void fix_list_after_tbl_changes(SELECT_LEX *new_parent, List<TABLE_LIST> *tlist) while ((table= it++)) { if (table->on_expr) - table->on_expr->fix_after_pullout(new_parent, &table->on_expr); + table->on_expr->fix_after_pullout(new_parent, &table->on_expr, TRUE); if (table->nested_join) fix_list_after_tbl_changes(new_parent, &table->nested_join->join_list); } diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt index 76486ae8734..e7afe7a679a 100644 --- a/sql/share/errmsg-utf8.txt +++ b/sql/share/errmsg-utf8.txt @@ -2649,7 +2649,7 @@ ER_INVALID_GROUP_FUNC_USE swe "Felaktig användning av SQL grupp function" ukr "Хибне використання функції групування" ER_UNSUPPORTED_EXTENSION 42000 - cze "Tabulka '%-.192s' používá rozšíření, které v této verzi MySQL není" + cze "Tabulka '%-.192s' používá rozšíření, které v této verzi MariaDB není" dan "Tabellen '%-.192s' bruger et filtypenavn som ikke findes i denne MariaDB version" nla "Tabel '%-.192s' gebruikt een extensie, die niet in deze MariaDB-versie voorkomt" eng "Table '%-.192s' uses an extension that doesn't exist in this MariaDB version" @@ -2660,7 +2660,7 @@ ER_UNSUPPORTED_EXTENSION 42000 hindi "टेबल '%-.192s' जिस इक्स्टेन्शन का उपयोग कर रहा है, वह इस MariaDB संस्करण में उपलब्ध नहीं है" hun "A(z) '%-.192s' tabla olyan bovitest hasznal, amely nem letezik ebben a MariaDB versioban" ita "La tabella '%-.192s' usa un'estensione che non esiste in questa versione di MariaDB" - jpn "表 '%-.192s' は、このMySQLバージョンには無い機能を使用しています。" + jpn "表 '%-.192s' は、このMariaDBバージョンには無い機能を使用しています。" kor "테이블 '%-.192s'는 확장명령을 이용하지만 현재의 MariaDB 버젼에서는 존재하지 않습니다." nor "Table '%-.192s' uses a extension that doesn't exist in this MariaDB version" norwegian-ny "Table '%-.192s' uses a extension that doesn't exist in this MariaDB version" @@ -2740,7 +2740,7 @@ ER_UNKNOWN_CHARACTER_SET 42000 swe "Okänd teckenuppsättning: '%-.64s'" ukr "Невідома кодова таблиця: '%-.64s'" ER_TOO_MANY_TABLES - cze "Příliš mnoho tabulek, MySQL jich může mít v joinu jen %d" + cze "Příliš mnoho tabulek, MariaDB jich může mít v joinu jen %d" dan "For mange tabeller. MariaDB kan kun bruge %d tabeller i et join" nla "Teveel tabellen. MariaDB kan slechts %d tabellen in een join bevatten" eng "Too many tables; MariaDB can only use %d tables in a join" @@ -2751,7 +2751,7 @@ ER_TOO_MANY_TABLES hindi "बहुत अधिक टेबल्स, MariaDB एक JOIN में केवल %d टेबल्स का उपयोग कर सकता है" hun "Tul sok tabla. A MariaDB csak %d tablat tud kezelni osszefuzeskor" ita "Troppe tabelle. MariaDB puo` usare solo %d tabelle in una join" - jpn "表が多すぎます。MySQLがJOINできる表は %d 個までです。" + jpn "表が多すぎます。MariaDBがJOINできる表は %d 個までです。" kor "너무 많은 테이블이 Join되었습니다. MariaDB에서는 JOIN시 %d개의 테이블만 사용할 수 있습니다." por "Tabelas demais. O MariaDB pode usar somente %d tabelas em uma junção (JOIN)" rum "Prea multe tabele. MariaDB nu poate folosi mai mult de %d tabele intr-un join" @@ -3023,7 +3023,7 @@ ER_HOST_IS_BLOCKED swe "Denna dator, '%-.64s', är blockerad pga många felaktig paket. Gör 'mysqladmin flush-hosts' för att ta bort alla blockeringarna" ukr "Хост '%-.64s' заблоковано з причини великої кількості помилок з'єднання. Для розблокування використовуйте 'mysqladmin flush-hosts'" ER_HOST_NOT_PRIVILEGED - cze "Stroj '%-.64s' nemá povoleno se k tomuto MySQL serveru připojit" + cze "Stroj '%-.64s' nemá povoleno se k tomuto MariaDB serveru připojit" dan "Værten '%-.64s' kan ikke tilkoble denne MariaDB-server" nla "Het is host '%-.64s' is niet toegestaan verbinding te maken met deze MariaDB server" eng "Host '%-.64s' is not allowed to connect to this MariaDB server" @@ -3034,7 +3034,7 @@ ER_HOST_NOT_PRIVILEGED hindi "होस्ट '%-.64s' को इस MariaDB सर्वर से कनेक्ट करने के लिए अनुमति नहीं है" hun "A '%-.64s' host szamara nem engedelyezett a kapcsolodas ehhez a MariaDB szerverhez" ita "Al sistema '%-.64s' non e` consentita la connessione a questo server MariaDB" - jpn "ホスト '%-.64s' からのこの MySQL server への接続は許可されていません。" + jpn "ホスト '%-.64s' からのこの MariaDB server への接続は許可されていません。" kor "'%-.64s' 호스트는 이 MariaDB서버에 접속할 허가를 받지 못했습니다." por "'Host' '%-.64s' não tem permissão para se conectar com este servidor MariaDB" rum "Host-ul '%-.64s' nu este permis a se conecta la aceste server MariaDB" @@ -3044,7 +3044,7 @@ ER_HOST_NOT_PRIVILEGED swe "Denna dator, '%-.64s', har inte privileger att använda denna MariaDB server" ukr "Хосту '%-.64s' не доволено зв'язуватись з цим сервером MariaDB" ER_PASSWORD_ANONYMOUS_USER 42000 - cze "Používáte MySQL jako anonymní uživatel a anonymní uživatelé nemají povoleno měnit hesla" + cze "Používáte MariaDB jako anonymní uživatel a anonymní uživatelé nemají povoleno měnit hesla" dan "Du bruger MariaDB som anonym bruger. Anonyme brugere må ikke ændre adgangskoder" nla "U gebruikt MariaDB als anonieme gebruiker en deze mogen geen wachtwoorden wijzigen" eng "You are using MariaDB as an anonymous user and anonymous users are not allowed to modify user settings" @@ -3055,7 +3055,7 @@ ER_PASSWORD_ANONYMOUS_USER 42000 hindi "आप MariaDB का उपयोग एक बेनाम यूज़र की तरह कर रहे हैं; बेनाम यूज़र्स को 'यूज़र सेटिंग्स' बदलने की अनुमति नहीं है" hun "Nevtelen (anonymous) felhasznalokent nem negedelyezett a jelszovaltoztatas" ita "Impossibile cambiare la password usando MariaDB come utente anonimo" - jpn "MySQL を匿名ユーザーで使用しているので、パスワードの変更はできません。" + jpn "MariaDB を匿名ユーザーで使用しているので、パスワードの変更はできません。" kor "당신은 MariaDB서버에 익명의 사용자로 접속을 하셨습니다.익명의 사용자는 암호를 변경할 수 없습니다." por "Você está usando o MariaDB como usuário anônimo e usuários anônimos não têm permissão para mudar senhas" rum "Dumneavoastra folositi MariaDB ca un utilizator anonim si utilizatorii anonimi nu au voie sa schimbe setarile utilizatorilor" @@ -3394,7 +3394,7 @@ ER_NONEXISTING_TABLE_GRANT 42000 swe "Det finns inget privilegium definierat för användare '%-.48s' på '%-.64s' för tabell '%-.192s'" ukr "Повноважень не визначено для користувача '%-.48s' з хосту '%-.64s' для таблиці '%-.192s'" ER_NOT_ALLOWED_COMMAND 42000 - cze "Použitý příkaz není v této verzi MySQL povolen" + cze "Použitý příkaz není v této verzi MariaDB povolen" dan "Den brugte kommando er ikke tilladt med denne udgave af MariaDB" nla "Het used commando is niet toegestaan in deze MariaDB versie" eng "The used command is not allowed with this MariaDB version" @@ -3404,7 +3404,7 @@ ER_NOT_ALLOWED_COMMAND 42000 hindi "यह कमांड इस MariaDB संस्करण के साथ इस्तेमाल नहीं किया जा सकता है" hun "A hasznalt parancs nem engedelyezett ebben a MariaDB verzioban" ita "Il comando utilizzato non e` supportato in questa versione di MariaDB" - jpn "このMySQLバージョンでは利用できないコマンドです。" + jpn "このMariaDBバージョンでは利用できないコマンドです。" kor "사용된 명령은 현재의 MariaDB 버젼에서는 이용되지 않습니다." por "Comando usado não é permitido para esta versão do MariaDB" rum "Comanda folosita nu este permisa pentru aceasta versiune de MariaDB" @@ -3907,7 +3907,7 @@ ER_REQUIRES_PRIMARY_KEY 42000 swe "Denna tabelltyp kräver en PRIMARY KEY" ukr "Цей тип таблиці потребує первинного ключа" ER_NO_RAID_COMPILED - cze "Tato verze MySQL není zkompilována s podporou RAID" + cze "Tato verze MariaDB není zkompilována s podporou RAID" dan "Denne udgave af MariaDB er ikke oversat med understøttelse af RAID" nla "Deze versie van MariaDB is niet gecompileerd met RAID ondersteuning" eng "This version of MariaDB is not compiled with RAID support" @@ -3917,7 +3917,7 @@ ER_NO_RAID_COMPILED hindi "MariaDB का यह संस्करण RAID सपोर्ट के साथ कॉम्पाईल्ड नहीं है" hun "Ezen leforditott MariaDB verzio nem tartalmaz RAID support-ot" ita "Questa versione di MYSQL non e` compilata con il supporto RAID" - jpn "このバージョンのMySQLはRAIDサポートを含めてコンパイルされていません。" + jpn "このバージョンのMariaDBはRAIDサポートを含めてコンパイルされていません。" por "Esta versão do MariaDB não foi compilada com suporte a RAID" rum "Aceasta versiune de MariaDB, nu a fost compilata cu suport pentru RAID" rus "Эта версия MariaDB скомпилирована без поддержки RAID" @@ -5042,7 +5042,7 @@ ER_UNKNOWN_COLLATION ER_SLAVE_IGNORED_SSL_PARAMS eng "SSL parameters in CHANGE MASTER are ignored because this MariaDB slave was compiled without SSL support; they can be used later if MariaDB slave with SSL is started" ger "SSL-Parameter in CHANGE MASTER werden ignoriert, weil dieser MariaDB-Slave ohne SSL-Unterstützung kompiliert wurde. Sie können aber später verwendet werden, wenn ein MariaDB-Slave mit SSL gestartet wird" - jpn "このMySQLスレーブはSSLサポートを含めてコンパイルされていないので、CHANGE MASTER のSSLパラメータは無視されました。今後SSLサポートを持つMySQLスレーブを起動する際に利用されます。" + jpn "このMariaDBスレーブはSSLサポートを含めてコンパイルされていないので、CHANGE MASTER のSSLパラメータは無視されました。今後SSLサポートを持つMariaDBスレーブを起動する際に利用されます。" por "SSL parâmetros em CHANGE MASTER são ignorados porque este escravo MariaDB foi compilado sem o SSL suporte. Os mesmos podem ser usados mais tarde quando o escravo MariaDB com SSL seja iniciado." spa "Parametros SSL en CHANGE MASTER son ignorados porque este slave MariaDB fue compilado sin soporte SSL; pueden ser usados despues cuando el slave MariaDB con SSL sea inicializado" ER_SERVER_IS_IN_SECURE_AUTH_MODE @@ -6753,7 +6753,7 @@ ER_INSECURE_PLAIN_TEXT eng "Sending passwords in plain text without SSL/TLS is extremely insecure" ER_INSECURE_CHANGE_MASTER - eng "Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives" + eng "Storing MariaDB user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MariaDB Manual for more about this issue and possible alternatives" ER_FOREIGN_DUPLICATE_KEY_WITH_CHILD_INFO 23000 S1009 eng "Foreign key constraint for table '%.192s', record '%-.192s' would lead to a duplicate entry in table '%.192s', key '%.192s'" @@ -6860,7 +6860,7 @@ ER_TOO_LONG_TABLE_PARTITION_COMMENT eng "Comment for table partition '%-.64s' is too long (max = %lu)" ER_SLAVE_CONFIGURATION - eng "Slave is not configured or failed to initialize properly. You must at least set --server-id to enable either a master or a slave. Additional error messages can be found in the MySQL error log" + eng "Slave is not configured or failed to initialize properly. You must at least set --server-id to enable either a master or a slave. Additional error messages can be found in the MariaDB error log" ER_INNODB_FT_LIMIT eng "InnoDB presently supports one FULLTEXT index creation at a time" @@ -6887,10 +6887,10 @@ ER_MTS_CHANGE_MASTER_CANT_RUN_WITH_GAPS eng "CHANGE MASTER cannot be executed when the slave was stopped with an error or killed in MTS mode. Consider using RESET SLAVE or START SLAVE UNTIL" ER_MTS_RECOVERY_FAILURE - eng "Cannot recover after SLAVE errored out in parallel execution mode. Additional error messages can be found in the MySQL error log" + eng "Cannot recover after SLAVE errored out in parallel execution mode. Additional error messages can be found in the MariaDB error log" ER_MTS_RESET_WORKERS - eng "Cannot clean up worker info tables. Additional error messages can be found in the MySQL error log" + eng "Cannot clean up worker info tables. Additional error messages can be found in the MariaDB error log" ER_COL_COUNT_DOESNT_MATCH_CORRUPTED_V2 eng "Column count of %s.%s is wrong. Expected %d, found %d. The table is probably corrupted" @@ -7398,8 +7398,8 @@ ER_FK_DEPTH_EXCEEDED eng "Foreign key cascade delete/update exceeds max depth of %d." ER_COL_COUNT_DOESNT_MATCH_PLEASE_UPDATE_V2 - eng "Column count of %s.%s is wrong. Expected %d, found %d. Created with MySQL %d, now running %d. Please use mysql_upgrade to fix this error." - ger "Spaltenanzahl von %s.%s falsch. %d erwartet, aber %d erhalten. Erzeugt mit MySQL %d, jetzt unter %d. Bitte benutzen Sie mysql_upgrade, um den Fehler zu beheben" + eng "Column count of %s.%s is wrong. Expected %d, found %d. Created with MariaDB %d, now running %d. Please use mysql_upgrade to fix this error." + ger "Spaltenanzahl von %s.%s falsch. %d erwartet, aber %d erhalten. Erzeugt mit MariaDB %d, jetzt unter %d. Bitte benutzen Sie mysql_upgrade, um den Fehler zu beheben" ER_WARN_TRIGGER_DOESNT_HAVE_CREATED eng "Trigger %s.%s.%s does not have CREATED attribute." diff --git a/sql/sp_head.cc b/sql/sp_head.cc index df9471880d9..f402b4919b9 100644 --- a/sql/sp_head.cc +++ b/sql/sp_head.cc @@ -2002,7 +2002,6 @@ sp_head::execute_procedure(THD *thd, List<Item> *args) thd->get_stmt_da()->set_overwrite_status(false); } - thd_proc_info(thd, "closing tables"); close_thread_tables(thd); thd_proc_info(thd, 0); @@ -3125,7 +3124,6 @@ sp_lex_keeper::reset_lex_and_exec_core(THD *thd, uint *nextp, thd->is_error() ? trans_rollback_stmt(thd) : trans_commit_stmt(thd); thd->get_stmt_da()->set_overwrite_status(false); } - thd_proc_info(thd, "closing tables"); close_thread_tables(thd); thd_proc_info(thd, 0); diff --git a/sql/sql_class.h b/sql/sql_class.h index 6a1cfe07e66..1358fe09f4c 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -693,7 +693,6 @@ typedef struct system_variables ulong session_track_transaction_info; my_bool session_track_schema; my_bool session_track_state_change; - my_bool sequence_read_skip_cache; ulong threadpool_priority; @@ -831,6 +830,7 @@ typedef struct system_status_var double cpu_time, busy_time; /* Don't initialize */ /* Memory used for thread local storage */ + int64 max_local_memory_used; volatile int64 local_memory_used; /* Memory allocated for global usage */ volatile int64 global_memory_used; @@ -2225,12 +2225,13 @@ public: const char *calling_file, const unsigned int calling_line) { - DBUG_PRINT("THD::enter_stage", ("%s:%d", calling_file, calling_line)); + DBUG_PRINT("THD::enter_stage", ("%s at %s:%d", stage->m_name, + calling_file, calling_line)); DBUG_ASSERT(stage); m_current_stage_key= stage->m_key; proc_info= stage->m_name; #if defined(ENABLED_PROFILING) - profiling.status_change(stage->m_name, calling_func, calling_file, + profiling.status_change(proc_info, calling_func, calling_file, calling_line); #endif #ifdef HAVE_PSI_THREAD_INTERFACE diff --git a/sql/sql_const.h b/sql/sql_const.h index a5756aa1f39..007b7faeebb 100644 --- a/sql/sql_const.h +++ b/sql/sql_const.h @@ -175,6 +175,11 @@ #define TABLE_ALLOC_BLOCK_SIZE 1024 #define WARN_ALLOC_BLOCK_SIZE 2048 #define WARN_ALLOC_PREALLOC_SIZE 1024 +/* + Note that if we are using 32K or less, then TCmalloc will use a local + heap without locks! +*/ +#define SHOW_ALLOC_BLOCK_SIZE (32768-MALLOC_OVERHEAD) /* The following parameters is to decide when to use an extra cache to diff --git a/sql/sql_cte.cc b/sql/sql_cte.cc index ad37ef36e2c..487c2b3a0bb 100644 --- a/sql/sql_cte.cc +++ b/sql/sql_cte.cc @@ -366,7 +366,10 @@ void With_element::check_dependencies_in_select(st_select_lex *sl, /* Now look for the dependencies in the subqueries of sl */ st_select_lex_unit *inner_unit= sl->first_inner_unit(); for (; inner_unit; inner_unit= inner_unit->next_unit()) - check_dependencies_in_unit(inner_unit, ctxt, in_subq, dep_map); + { + if (!inner_unit->with_element) + check_dependencies_in_unit(inner_unit, ctxt, in_subq, dep_map); + } } @@ -854,7 +857,6 @@ st_select_lex_unit *With_element::clone_parsed_spec(THD *thd, with_table->next_global= spec_tables; } res= &lex->unit; - res->set_with_clause(owner); lex->unit.include_down(with_table->select_lex); lex->unit.set_slave(with_select); @@ -863,6 +865,8 @@ st_select_lex_unit *With_element::clone_parsed_spec(THD *thd, insert_chain_before( (st_select_lex_node **) &(old_lex->all_selects_list), with_select)); + if (check_dependencies_in_with_clauses(lex->with_clauses_list)) + res= NULL; lex_end(lex); err: if (arena) @@ -1006,14 +1010,18 @@ With_element *st_select_lex::find_table_def_in_with_clauses(TABLE_LIST *table) and it was unsuccesful. Yet for units cloned from the spec it has not been done yet. */ - if (with_elem && sl->master_unit() == with_elem->spec) + With_clause *attached_with_clause=sl->get_with_clause(); + if (attached_with_clause && + (found= attached_with_clause->find_table_def(table, NULL))) break; - With_clause *with_clause=sl->get_with_clause(); - if (with_clause) + if (with_elem) { - With_element *barrier= with_clause->with_recursive ? NULL : with_elem; - if ((found= with_clause->find_table_def(table, barrier))) + With_clause *containing_with_clause= with_elem->get_owner(); + With_element *barrier= containing_with_clause->with_recursive ? + NULL : with_elem; + if ((found= containing_with_clause->find_table_def(table, barrier))) break; + sl= sl->master_unit()->outer_select(); } master_unit= sl->master_unit(); /* Do not look for the table's definition beyond the scope of the view */ diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc index c880374f9ab..d0fc422c2f9 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -273,6 +273,7 @@ bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, if (open_and_lock_tables(thd, table_list, TRUE, 0)) DBUG_RETURN(TRUE); + THD_STAGE_INFO(thd, stage_init_update); if (mysql_handle_list_of_derived(thd->lex, table_list, DT_MERGE_FOR_INSERT)) DBUG_RETURN(TRUE); if (mysql_handle_list_of_derived(thd->lex, table_list, DT_PREPARE)) @@ -289,7 +290,6 @@ bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, table_list->view_db.str, table_list->view_name.str); DBUG_RETURN(TRUE); } - THD_STAGE_INFO(thd, stage_init); table->map=1; query_plan.select_lex= &thd->lex->select_lex; query_plan.table= table; @@ -556,7 +556,6 @@ bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, goto got_error; init_ftfuncs(thd, select_lex, 1); - THD_STAGE_INFO(thd, stage_updating); if (table->prepare_triggers_for_delete_stmt_or_event()) { @@ -588,6 +587,8 @@ bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, deltempfile= new (thd->mem_root) Unique (refpos_order_cmp, table->file, table->file->ref_length, MEM_STRIP_BUF_SIZE); + + THD_STAGE_INFO(thd, stage_searching_rows_for_update); while (!(error=info.read_record()) && !thd->killed && ! thd->is_error()) { @@ -613,6 +614,7 @@ bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, delete_record= true; } + THD_STAGE_INFO(thd, stage_updating); while (!(error=info.read_record()) && !thd->killed && ! thd->is_error()) { diff --git a/sql/sql_derived.cc b/sql/sql_derived.cc index 2df3af03af5..6eb6466427d 100644 --- a/sql/sql_derived.cc +++ b/sql/sql_derived.cc @@ -468,7 +468,8 @@ bool mysql_derived_merge(THD *thd, LEX *lex, TABLE_LIST *derived) // Update used tables cache according to new table map if (derived->on_expr) { - derived->on_expr->fix_after_pullout(parent_lex, &derived->on_expr); + derived->on_expr->fix_after_pullout(parent_lex, &derived->on_expr, + TRUE); fix_list_after_tbl_changes(parent_lex, &derived->nested_join->join_list); } } @@ -641,7 +642,8 @@ bool mysql_derived_prepare(THD *thd, LEX *lex, TABLE_LIST *derived) SELECT_LEX_UNIT *unit= derived->get_unit(); DBUG_ENTER("mysql_derived_prepare"); bool res= FALSE; - DBUG_PRINT("enter", ("unit %p", unit)); + DBUG_PRINT("enter", ("unit: %p table_list: %p Alias '%s'", + unit, derived, derived->alias)); if (!unit) DBUG_RETURN(FALSE); diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index b12b470209c..32695a450c4 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -761,9 +761,8 @@ bool mysql_insert(THD *thd,TABLE_LIST *table_list, DBUG_RETURN(TRUE); } + THD_STAGE_INFO(thd, stage_init_update); lock_type= table_list->lock_type; - - THD_STAGE_INFO(thd, stage_init); thd->lex->used_tables=0; values= its++; if (bulk_parameters_set(thd)) @@ -860,7 +859,6 @@ bool mysql_insert(THD *thd,TABLE_LIST *table_list, #endif error=0; - THD_STAGE_INFO(thd, stage_update); if (duplic == DUP_REPLACE && (!table->triggers || !table->triggers->has_delete_triggers())) table->file->extra(HA_EXTRA_WRITE_CAN_REPLACE); @@ -940,6 +938,8 @@ bool mysql_insert(THD *thd,TABLE_LIST *table_list, goto values_loop_end; } } + + THD_STAGE_INFO(thd, stage_update); do { DBUG_PRINT("info", ("iteration %llu", iteration)); @@ -3357,7 +3357,7 @@ bool Delayed_insert::handle_inserts(void) } if (WSREP((&thd))) - thd_proc_info(&thd, "insert done"); + thd_proc_info(&thd, "Insert done"); else thd_proc_info(&thd, 0); mysql_mutex_unlock(&mutex); diff --git a/sql/sql_load.cc b/sql/sql_load.cc index cf676d5f706..d972947c718 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -348,7 +348,7 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list, { DBUG_RETURN(TRUE); } - thd_proc_info(thd, "executing"); + thd_proc_info(thd, "Executing"); /* Let us emit an error if we are loading data to table which is used in subselect in SET clause like we do it for INSERT. @@ -574,7 +574,7 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list, } } - thd_proc_info(thd, "reading file"); + thd_proc_info(thd, "Reading file"); if (!(error= MY_TEST(read_info.error))) { table->reset_default_fields(); diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 2f886d91780..b3a9ad144d5 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -2375,7 +2375,7 @@ com_multi_end: (thd->open_tables == NULL || (thd->locked_tables_mode == LTM_LOCK_TABLES))); - thd_proc_info(thd, "updating status"); + thd_proc_info(thd, "Updating status"); /* Finalize server status flags after executing a command. */ thd->update_server_status(); if (command != COM_MULTI) @@ -6275,10 +6275,14 @@ finish: thd->reset_kill_query(); } if (thd->is_error() || (thd->variables.option_bits & OPTION_MASTER_SQL_ERROR)) + { + THD_STAGE_INFO(thd, stage_rollback); trans_rollback_stmt(thd); + } else { /* If commit fails, we should be able to reset the OK status. */ + THD_STAGE_INFO(thd, stage_commit); thd->get_stmt_da()->set_overwrite_status(true); trans_commit_stmt(thd); thd->get_stmt_da()->set_overwrite_status(false); @@ -6288,12 +6292,13 @@ finish: #endif } - /* Free tables */ + /* Free tables. Set stage 'closing tables' */ close_thread_tables(thd); #ifdef WITH_WSREP thd->wsrep_consistency_check= NO_CONSISTENCY_CHECK; #endif /* WITH_WSREP */ + #ifndef DBUG_OFF if (lex->sql_command != SQLCOM_SET_OPTION && ! thd->in_sub_stmt) DEBUG_SYNC(thd, "execute_command_after_close_tables"); @@ -6311,6 +6316,7 @@ finish: one of storage engines (e.g. due to deadlock). Rollback transaction in all storage engines including binary log. */ + THD_STAGE_INFO(thd, stage_rollback_implicit); trans_rollback_implicit(thd); thd->mdl_context.release_transactional_locks(); } @@ -6320,6 +6326,7 @@ finish: DBUG_ASSERT(! thd->in_sub_stmt); if (!(thd->variables.option_bits & OPTION_GTID_BEGIN)) { + THD_STAGE_INFO(thd, stage_commit_implicit); /* If commit fails, we should be able to reset the OK status. */ thd->get_stmt_da()->set_overwrite_status(true); /* Commit the normal transaction if one is active. */ @@ -6347,6 +6354,8 @@ finish: thd->mdl_context.release_statement_locks(); } + THD_STAGE_INFO(thd, stage_starting_cleanup); + TRANSACT_TRACKER(add_trx_state_from_thd(thd)); WSREP_TO_ISOLATION_END; @@ -6615,7 +6624,9 @@ check_access(THD *thd, ulong want_access, const char *db, ulong *save_priv, dummy= 0; } - THD_STAGE_INFO(thd, stage_checking_permissions); + /* check access may be called twice in a row. Don't change to same stage */ + if (thd->proc_info != stage_checking_permissions.m_name) + THD_STAGE_INFO(thd, stage_checking_permissions); if ((!db || !db[0]) && !thd->db && !dont_check_global_grants) { DBUG_PRINT("error",("No database")); diff --git a/sql/sql_partition_admin.cc b/sql/sql_partition_admin.cc index 0c1c9fb02de..efddcbf3857 100644 --- a/sql/sql_partition_admin.cc +++ b/sql/sql_partition_admin.cc @@ -596,7 +596,7 @@ bool Sql_cmd_alter_table_exchange_partition:: /* Table and partition has same structure/options, OK to exchange */ - thd_proc_info(thd, "verifying data with partition"); + thd_proc_info(thd, "Verifying data with partition"); if (verify_data_with_partition(swap_table, part_table, swap_part_id)) DBUG_RETURN(TRUE); diff --git a/sql/sql_profile.h b/sql/sql_profile.h index 38682f3ddec..c96828fc678 100644 --- a/sql/sql_profile.h +++ b/sql/sql_profile.h @@ -287,7 +287,7 @@ public: @param initial_state (optional) name of period before first state change */ - void start_new_query(const char *initial_state= "starting") + void start_new_query(const char *initial_state= "Starting") { DBUG_ASSERT(!current); if (unlikely(enabled)) diff --git a/sql/sql_select.cc b/sql/sql_select.cc index fe87dd9afbb..abbf2616537 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -2267,6 +2267,76 @@ derived_exit: DBUG_RETURN(0); } +/** + Add having condition as a where clause condition of the given temp table. + + @param tab Table to which having condition is added. + + @returns false if success, true if error. +*/ + +bool JOIN::add_having_as_table_cond(JOIN_TAB *tab) +{ + tmp_having->update_used_tables(); + table_map used_tables= tab->table->map | OUTER_REF_TABLE_BIT; + + /* If tmp table is not used then consider conditions of const table also */ + if (!need_tmp) + used_tables|= const_table_map; + + DBUG_ENTER("JOIN::add_having_as_table_cond"); + + Item* sort_table_cond= make_cond_for_table(thd, tmp_having, used_tables, + (table_map) 0, false, + false, false); + if (sort_table_cond) + { + if (!tab->select) + { + if (!(tab->select= new SQL_SELECT)) + DBUG_RETURN(true); + tab->select->head= tab->table; + } + if (!tab->select->cond) + tab->select->cond= sort_table_cond; + else + { + if (!(tab->select->cond= + new (thd->mem_root) Item_cond_and(thd, + tab->select->cond, + sort_table_cond))) + DBUG_RETURN(true); + } + if (tab->pre_idx_push_select_cond) + { + if (sort_table_cond->type() == Item::COND_ITEM) + sort_table_cond= sort_table_cond->copy_andor_structure(thd); + if (!(tab->pre_idx_push_select_cond= + new (thd->mem_root) Item_cond_and(thd, + tab->pre_idx_push_select_cond, + sort_table_cond))) + DBUG_RETURN(true); + } + if (tab->select->cond && !tab->select->cond->fixed) + tab->select->cond->fix_fields(thd, 0); + if (tab->pre_idx_push_select_cond && !tab->pre_idx_push_select_cond->fixed) + tab->pre_idx_push_select_cond->fix_fields(thd, 0); + tab->select->pre_idx_push_select_cond= tab->pre_idx_push_select_cond; + tab->set_select_cond(tab->select->cond, __LINE__); + tab->select_cond->top_level_item(); + DBUG_EXECUTE("where",print_where(tab->select->cond, + "select and having", + QT_ORDINARY);); + + having= make_cond_for_table(thd, tmp_having, ~ (table_map) 0, + ~used_tables, false, false, false); + DBUG_EXECUTE("where", + print_where(having, "having after sort", QT_ORDINARY);); + } + + DBUG_RETURN(false); +} + /** Set info for aggregation tables @@ -2296,6 +2366,7 @@ bool JOIN::make_aggr_tables_info() TABLE *exec_tmp_table= NULL; bool distinct= false; bool keep_row_order= false; + bool is_having_added_as_table_cond= false; DBUG_ENTER("JOIN::make_aggr_tables_info"); const bool has_group_by= this->group; @@ -2482,29 +2553,6 @@ bool JOIN::make_aggr_tables_info() if (exec_tmp_table->distinct) optimize_distinct(); - /* - We don't have to store rows in temp table that doesn't match HAVING if: - - we are sorting the table and writing complete group rows to the - temp table. - - We are using DISTINCT without resolving the distinct as a GROUP BY - on all columns. - - If having is not handled here, it will be checked before the row - is sent to the client. - - In the case of window functions however, we *must* make sure to not - store any rows which don't match HAVING within the temp table, - as rows will end up being used during their computation. - */ - if (having && - (sort_and_group || (exec_tmp_table->distinct && !group_list) || - select_lex->have_window_funcs())) - { - /* Attach HAVING to tmp table's condition */ - curr_tab->having= having; - having= NULL; /* Already done */ - } - /* Change sum_fields reference to calculated fields in tmp_table */ items1= ref_ptr_array_slice(2); if ((sort_and_group || curr_tab->table->group || @@ -2532,6 +2580,38 @@ bool JOIN::make_aggr_tables_info() curr_tab->fields= &tmp_fields_list1; set_postjoin_aggr_write_func(curr_tab); + /* + If having is not handled here, it will be checked before the row is sent + to the client. + */ + if (tmp_having && + (sort_and_group || (exec_tmp_table->distinct && !group_list) || + select_lex->have_window_funcs())) + { + /* + If there is no select distinct and there are no window functions + then move the having to table conds of tmp table. + NOTE : We cannot apply having after distinct or window functions + If columns of having are not part of select distinct, + then distinct may remove rows which can satisfy having. + In the case of window functions we *must* make sure to not + store any rows which don't match HAVING within the temp table, + as rows will end up being used during their computation. + */ + if (!select_distinct && !select_lex->have_window_funcs() && + add_having_as_table_cond(curr_tab)) + DBUG_RETURN(true); + is_having_added_as_table_cond= tmp_having != having; + + /* + Having condition which we are not able to add as tmp table conds are + kept as before. And, this will be applied before storing the rows in + tmp table. + */ + curr_tab->having= having; + having= NULL; // Already done + } + tmp_table_param.func_count= 0; tmp_table_param.field_count+= tmp_table_param.func_count; if (sort_and_group || curr_tab->table->group) @@ -2721,60 +2801,11 @@ bool JOIN::make_aggr_tables_info() DBUG_PRINT("info",("Sorting for send_result_set_metadata")); THD_STAGE_INFO(thd, stage_sorting_result); /* If we have already done the group, add HAVING to sorted table */ - if (tmp_having && !group_list && !sort_and_group) + if (tmp_having && !is_having_added_as_table_cond && + !group_list && !sort_and_group) { - // Some tables may have been const - tmp_having->update_used_tables(); - table_map used_tables= (const_table_map | curr_tab->table->map); - - Item* sort_table_cond= make_cond_for_table(thd, tmp_having, used_tables, - (table_map) 0, false, - false, false); - if (sort_table_cond) - { - if (!curr_tab->select) - { - if (!(curr_tab->select= new SQL_SELECT)) - DBUG_RETURN(true); - curr_tab->select->head= curr_tab->table; - } - if (!curr_tab->select->cond) - curr_tab->select->cond= sort_table_cond; - else - { - if (!(curr_tab->select->cond= - new (thd->mem_root) Item_cond_and(thd, curr_tab->select->cond, - sort_table_cond))) - DBUG_RETURN(true); - } - if (curr_tab->pre_idx_push_select_cond) - { - if (sort_table_cond->type() == Item::COND_ITEM) - sort_table_cond= sort_table_cond->copy_andor_structure(thd); - if (!(curr_tab->pre_idx_push_select_cond= - new (thd->mem_root) Item_cond_and(thd, - curr_tab->pre_idx_push_select_cond, - sort_table_cond))) - DBUG_RETURN(true); - } - if (curr_tab->select->cond && !curr_tab->select->cond->fixed) - curr_tab->select->cond->fix_fields(thd, 0); - if (curr_tab->pre_idx_push_select_cond && - !curr_tab->pre_idx_push_select_cond->fixed) - curr_tab->pre_idx_push_select_cond->fix_fields(thd, 0); - curr_tab->select->pre_idx_push_select_cond= - curr_tab->pre_idx_push_select_cond; - curr_tab->set_select_cond(curr_tab->select->cond, __LINE__); - curr_tab->select_cond->top_level_item(); - DBUG_EXECUTE("where",print_where(curr_tab->select->cond, - "select and having", - QT_ORDINARY);); - - having= make_cond_for_table(thd, tmp_having, ~ (table_map) 0, - ~used_tables, false, false, false); - DBUG_EXECUTE("where", - print_where(having, "having after sort", QT_ORDINARY);); - } + if (add_having_as_table_cond(curr_tab)) + DBUG_RETURN(true); } if (group) diff --git a/sql/sql_select.h b/sql/sql_select.h index 260b86029c6..cc52cae02da 100644 --- a/sql/sql_select.h +++ b/sql/sql_select.h @@ -1464,6 +1464,8 @@ public: ordered_index_usage= ordered_index_void; need_distinct= 0; skip_sort_order= 0; + with_two_phase_optimization= 0; + is_for_splittable_grouping_derived= 0; need_tmp= 0; hidden_group_fields= 0; /*safety*/ error= 0; @@ -1708,6 +1710,7 @@ private: void optimize_distinct(); void cleanup_item_list(List<Item> &items) const; + bool add_having_as_table_cond(JOIN_TAB *tab); bool make_aggr_tables_info(); }; diff --git a/sql/sql_show.cc b/sql/sql_show.cc index f5fd3427fa6..2df84b473b8 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -93,7 +93,6 @@ enum enum_i_s_events_fields #define USERNAME_WITH_HOST_CHAR_LENGTH (USERNAME_CHAR_LENGTH + HOSTNAME_LENGTH + 2) - static const LEX_CSTRING trg_action_time_type_names[]= { { STRING_WITH_LEN("BEFORE") }, @@ -3103,17 +3102,17 @@ int fill_schema_processlist(THD* thd, TABLE_LIST* tables, COND* cond) { table->field[7]->store(tmp->query(), MY_MIN(PROCESS_LIST_INFO_WIDTH, - tmp->query_length()), cs); + tmp->query_length()), cs); table->field[7]->set_notnull(); } /* INFO_BINARY */ if (tmp->query()) { - table->field[15]->store(tmp->query(), + table->field[16]->store(tmp->query(), MY_MIN(PROCESS_LIST_INFO_WIDTH, tmp->query_length()), &my_charset_bin); - table->field[15]->set_notnull(); + table->field[16]->set_notnull(); } /* @@ -3136,14 +3135,14 @@ int fill_schema_processlist(THD* thd, TABLE_LIST* tables, COND* cond) */ table->field[12]->store((longlong) tmp->status_var.local_memory_used, FALSE); - table->field[12]->set_notnull(); - table->field[13]->store((longlong) tmp->get_examined_row_count(), TRUE); - table->field[13]->set_notnull(); + table->field[13]->store((longlong) tmp->status_var.max_local_memory_used, + FALSE); + table->field[14]->store((longlong) tmp->get_examined_row_count(), TRUE); /* QUERY_ID */ - table->field[14]->store(tmp->query_id, TRUE); + table->field[15]->store(tmp->query_id, TRUE); - table->field[16]->store(tmp->os_thread_id); + table->field[17]->store(tmp->os_thread_id); if (schema_table_store_record(thd, table)) { @@ -4304,14 +4303,15 @@ static void get_table_engine_for_i_s(THD *thd, char *buf, TABLE_LIST *tl, @retval TRUE - Failure. */ static bool -fill_schema_table_by_open(THD *thd, bool is_show_fields_or_keys, +fill_schema_table_by_open(THD *thd, MEM_ROOT *mem_root, + bool is_show_fields_or_keys, TABLE *table, ST_SCHEMA_TABLE *schema_table, LEX_CSTRING *orig_db_name, LEX_CSTRING *orig_table_name, Open_tables_backup *open_tables_state_backup, bool can_deadlock) { - Query_arena i_s_arena(thd->mem_root, + Query_arena i_s_arena(mem_root, Query_arena::STMT_CONVENTIONAL_EXECUTION), backup_arena, *old_arena; LEX *old_lex= thd->lex, temp_lex, *lex; @@ -4888,8 +4888,11 @@ int get_all_tables(THD *thd, TABLE_LIST *tables, COND *cond) #endif uint table_open_method= tables->table_open_method; bool can_deadlock; + MEM_ROOT tmp_mem_root; DBUG_ENTER("get_all_tables"); + bzero(&tmp_mem_root, sizeof(tmp_mem_root)); + /* In cases when SELECT from I_S table being filled by this call is part of statement which also uses other tables or is being executed @@ -4925,7 +4928,7 @@ int get_all_tables(THD *thd, TABLE_LIST *tables, COND *cond) table_name.str= lsel->table_list.first->table_name; table_name.length= lsel->table_list.first->table_name_length; - error= fill_schema_table_by_open(thd, TRUE, + error= fill_schema_table_by_open(thd, thd->mem_root, TRUE, table, schema_table, &db_name, &table_name, &open_tables_state_backup, @@ -4950,6 +4953,11 @@ int get_all_tables(THD *thd, TABLE_LIST *tables, COND *cond) if (make_db_list(thd, &db_names, &plan->lookup_field_vals)) goto err; + + /* Use tmp_mem_root to allocate data for opened tables */ + init_alloc_root(&tmp_mem_root, SHOW_ALLOC_BLOCK_SIZE, SHOW_ALLOC_BLOCK_SIZE, + MY_THREAD_SPECIFIC); + for (size_t i=0; i < db_names.elements(); i++) { LEX_CSTRING *db_name= db_names.at(i); @@ -5035,12 +5043,13 @@ int get_all_tables(THD *thd, TABLE_LIST *tables, COND *cond) } DEBUG_SYNC(thd, "before_open_in_get_all_tables"); - if (fill_schema_table_by_open(thd, FALSE, + if (fill_schema_table_by_open(thd, &tmp_mem_root, FALSE, table, schema_table, db_name, table_name, &open_tables_state_backup, can_deadlock)) goto err; + free_root(&tmp_mem_root, MY_MARK_BLOCKS_FREE); } } } @@ -5050,6 +5059,7 @@ int get_all_tables(THD *thd, TABLE_LIST *tables, COND *cond) error= 0; err: thd->restore_backup_open_tables_state(&open_tables_state_backup); + free_root(&tmp_mem_root, 0); DBUG_RETURN(error); } @@ -9074,6 +9084,7 @@ ST_FIELD_INFO processlist_fields_info[]= {"PROGRESS", 703, MYSQL_TYPE_DECIMAL, 0, 0, "Progress", SKIP_OPEN_TABLE}, {"MEMORY_USED", 7, MYSQL_TYPE_LONGLONG, 0, 0, "Memory_used", SKIP_OPEN_TABLE}, + {"MAX_MEMORY_USED", 7, MYSQL_TYPE_LONGLONG, 0, 0, "Max_memory_used", SKIP_OPEN_TABLE}, {"EXAMINED_ROWS", 7, MYSQL_TYPE_LONG, 0, 0, "Examined_rows", SKIP_OPEN_TABLE}, {"QUERY_ID", 4, MYSQL_TYPE_LONGLONG, 0, 0, 0, SKIP_OPEN_TABLE}, {"INFO_BINARY", PROCESS_LIST_INFO_WIDTH, MYSQL_TYPE_BLOB, 0, 1, diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 7371889cc7f..58a6666b219 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -8603,7 +8603,7 @@ bool mysql_alter_table(THD *thd, const char *new_db, const char *new_name, #endif } - THD_STAGE_INFO(thd, stage_init); + THD_STAGE_INFO(thd, stage_init_update); /* Code below can handle only base tables so ensure that we won't open a view. diff --git a/sql/sql_union.cc b/sql/sql_union.cc index fd988d53e53..8cce7f33057 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -713,13 +713,7 @@ bool st_select_lex_unit::join_union_type_handlers(THD *thd_arg, holders[pos].set_handler(item_type_handler); else { - if (first_sl->item_list.elements != sl->item_list.elements) - { - my_message(ER_WRONG_NUMBER_OF_COLUMNS_IN_SELECT, - ER_THD(thd_arg, ER_WRONG_NUMBER_OF_COLUMNS_IN_SELECT), - MYF(0)); - DBUG_RETURN(true); - } + DBUG_ASSERT(first_sl->item_list.elements == sl->item_list.elements); if (holders[pos].aggregate_for_result(item_type_handler)) { my_error(ER_ILLEGAL_PARAMETER_DATA_TYPES2_FOR_OPERATION, MYF(0), @@ -988,6 +982,16 @@ bool st_select_lex_unit::prepare(THD *thd_arg, select_result *sel_result, goto err; } } + else + { + if (first_sl->item_list.elements != sl->item_list.elements) + { + my_message(ER_WRONG_NUMBER_OF_COLUMNS_IN_SELECT, + ER_THD(thd_arg, ER_WRONG_NUMBER_OF_COLUMNS_IN_SELECT), + MYF(0)); + goto err; + } + } if (is_recursive) { if (!with_element->is_anchor(sl)) diff --git a/sql/sql_update.cc b/sql/sql_update.cc index 96f48be5ff2..47ec8b89d48 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -305,12 +305,12 @@ int mysql_update(THD *thd, if (lock_tables(thd, table_list, table_count, 0)) DBUG_RETURN(1); + THD_STAGE_INFO(thd, stage_init_update); if (table_list->handle_derived(thd->lex, DT_MERGE_FOR_INSERT)) DBUG_RETURN(1); if (table_list->handle_derived(thd->lex, DT_PREPARE)) DBUG_RETURN(1); - THD_STAGE_INFO(thd, stage_init); table= table_list->table; if (!table_list->single_table_updatable()) @@ -707,7 +707,6 @@ int mysql_update(THD *thd, */ thd->count_cuted_fields= CHECK_FIELD_WARN; thd->cuted_fields=0L; - THD_STAGE_INFO(thd, stage_updating); transactional_table= table->file->has_transactions(); thd->abort_on_warning= !ignore && thd->is_strict_mode(); @@ -735,6 +734,7 @@ int mysql_update(THD *thd, can_compare_record= records_are_comparable(table); explain->tracker.on_scan_init(); + THD_STAGE_INFO(thd, stage_updating); while (!(error=info.read_record()) && !thd->killed) { explain->tracker.on_record_read(); diff --git a/sql/sql_view.cc b/sql/sql_view.cc index 2d8129fd223..dd8c6b70446 100644 --- a/sql/sql_view.cc +++ b/sql/sql_view.cc @@ -705,7 +705,6 @@ bool mysql_create_view(THD *thd, TABLE_LIST *views, DBUG_RETURN(0); err: - THD_STAGE_INFO(thd, stage_end); lex->link_first_table_back(view, link_to_local); unit->cleanup(); DBUG_RETURN(res || thd->is_error()); diff --git a/sql/winservice.c b/sql/winservice.c index efbbb527c9b..388ea886cea 100644 --- a/sql/winservice.c +++ b/sql/winservice.c @@ -147,12 +147,13 @@ int get_mysql_service_properties(const wchar_t *bin_path, if(numargs == 2) { /* - There are rare cases where service config does not have - --defaults-filein the binary parth . There services were registered with - plain mysqld --install, the data directory is next to "bin" in this case. - Service name (second parameter) must be MySQL. + There are rare cases where service config does not have + --defaults-file in the binary parth . There services were + registered with plain mysqld --install, the data directory is + next to "bin" in this case. Service name (second parameter) + must be MySQL. */ - if(wcscmp(args[1], L"MySQL") != 0) + if (wcscmp(args[1], L"MySQL") != 0) goto end; have_inifile= FALSE; } diff --git a/sql/wsrep_applier.cc b/sql/wsrep_applier.cc index 465d1f25b5b..a5c39887cbd 100644 --- a/sql/wsrep_applier.cc +++ b/sql/wsrep_applier.cc @@ -235,11 +235,11 @@ wsrep_cb_status_t wsrep_apply_cb(void* const ctx, #ifdef WSREP_PROC_INFO snprintf(thd->wsrep_info, sizeof(thd->wsrep_info) - 1, - "applying write set %lld: %p, %zu", + "Applying write set %lld: %p, %zu", (long long)wsrep_thd_trx_seqno(thd), buf, buf_len); thd_proc_info(thd, thd->wsrep_info); #else - thd_proc_info(thd, "applying write set"); + thd_proc_info(thd, "Applying write set"); #endif /* WSREP_PROC_INFO */ /* tune FK and UK checking policy */ @@ -269,10 +269,10 @@ wsrep_cb_status_t wsrep_apply_cb(void* const ctx, #ifdef WSREP_PROC_INFO snprintf(thd->wsrep_info, sizeof(thd->wsrep_info) - 1, - "applied write set %lld", (long long)wsrep_thd_trx_seqno(thd)); + "Applied write set %lld", (long long)wsrep_thd_trx_seqno(thd)); thd_proc_info(thd, thd->wsrep_info); #else - thd_proc_info(thd, "applied write set"); + thd_proc_info(thd, "Applied write set"); #endif /* WSREP_PROC_INFO */ if (WSREP_CB_SUCCESS != rcode) @@ -294,10 +294,10 @@ static wsrep_cb_status_t wsrep_commit(THD* const thd) { #ifdef WSREP_PROC_INFO snprintf(thd->wsrep_info, sizeof(thd->wsrep_info) - 1, - "committing %lld", (long long)wsrep_thd_trx_seqno(thd)); + "Committing %lld", (long long)wsrep_thd_trx_seqno(thd)); thd_proc_info(thd, thd->wsrep_info); #else - thd_proc_info(thd, "committing"); + thd_proc_info(thd, "Committing"); #endif /* WSREP_PROC_INFO */ wsrep_cb_status_t const rcode(trans_commit(thd) ? @@ -318,10 +318,10 @@ static wsrep_cb_status_t wsrep_commit(THD* const thd) #ifdef WSREP_PROC_INFO snprintf(thd->wsrep_info, sizeof(thd->wsrep_info) - 1, - "committed %lld", (long long) wsrep_thd_trx_seqno(thd)); + "Committed %lld", (long long) wsrep_thd_trx_seqno(thd)); thd_proc_info(thd, thd->wsrep_info); #else - thd_proc_info(thd, "committed"); + thd_proc_info(thd, "Committed"); #endif /* WSREP_PROC_INFO */ return rcode; @@ -331,10 +331,10 @@ static wsrep_cb_status_t wsrep_rollback(THD* const thd) { #ifdef WSREP_PROC_INFO snprintf(thd->wsrep_info, sizeof(thd->wsrep_info) - 1, - "rolling back %lld", (long long)wsrep_thd_trx_seqno(thd)); + "Rolling back %lld", (long long)wsrep_thd_trx_seqno(thd)); thd_proc_info(thd, thd->wsrep_info); #else - thd_proc_info(thd, "rolling back"); + thd_proc_info(thd, "Rolling back"); #endif /* WSREP_PROC_INFO */ wsrep_cb_status_t const rcode(trans_rollback(thd) ? @@ -342,10 +342,10 @@ static wsrep_cb_status_t wsrep_rollback(THD* const thd) #ifdef WSREP_PROC_INFO snprintf(thd->wsrep_info, sizeof(thd->wsrep_info) - 1, - "rolled back %lld", (long long)wsrep_thd_trx_seqno(thd)); + "Rolled back %lld", (long long)wsrep_thd_trx_seqno(thd)); thd_proc_info(thd, thd->wsrep_info); #else - thd_proc_info(thd, "rolled back"); + thd_proc_info(thd, "Rolled back"); #endif /* WSREP_PROC_INFO */ return rcode; diff --git a/sql/wsrep_hton.cc b/sql/wsrep_hton.cc index e0d46159697..50ecacd9960 100644 --- a/sql/wsrep_hton.cc +++ b/sql/wsrep_hton.cc @@ -384,7 +384,7 @@ wsrep_run_wsrep_commit(THD *thd, bool all) mysql_mutex_unlock(&thd->LOCK_wsrep_thd); mysql_mutex_lock(&thd->mysys_var->mutex); - thd_proc_info(thd, "wsrep waiting on replaying"); + thd_proc_info(thd, "WSREP waiting on replaying"); thd->mysys_var->current_mutex= &LOCK_wsrep_replaying; thd->mysys_var->current_cond= &COND_wsrep_replaying; mysql_mutex_unlock(&thd->mysys_var->mutex); diff --git a/sql/wsrep_mysqld.cc b/sql/wsrep_mysqld.cc index 63d153a7af4..fd759717aaf 100644 --- a/sql/wsrep_mysqld.cc +++ b/sql/wsrep_mysqld.cc @@ -527,7 +527,7 @@ static void wsrep_synced_cb(void* app_ctx) if (wsrep_restart_slave_activated) { int rcode; - WSREP_INFO("MySQL slave restart"); + WSREP_INFO("MariaDB slave restart"); wsrep_restart_slave_activated= FALSE; mysql_mutex_lock(&LOCK_active_mi); diff --git a/sql/wsrep_thd.cc b/sql/wsrep_thd.cc index 04ecf0fcb59..32b812a9bb2 100644 --- a/sql/wsrep_thd.cc +++ b/sql/wsrep_thd.cc @@ -252,7 +252,7 @@ void wsrep_replay_transaction(THD *thd) MYSQL_END_STATEMENT(thd->m_statement_psi, thd->get_stmt_da()); thd->m_statement_psi= NULL; thd->m_digest= NULL; - thd_proc_info(thd, "wsrep replaying trx"); + thd_proc_info(thd, "WSREP replaying trx"); WSREP_DEBUG("replay trx: %s %lld", thd->query() ? thd->query() : "void", (long long)wsrep_thd_trx_seqno(thd)); @@ -463,7 +463,7 @@ static void wsrep_rollback_process(THD *thd) wsrep_aborting_thd= NULL; while (thd->killed == NOT_KILLED) { - thd_proc_info(thd, "wsrep aborter idle"); + thd_proc_info(thd, "WSREP aborter idle"); thd->mysys_var->current_mutex= &LOCK_wsrep_rollback; thd->mysys_var->current_cond= &COND_wsrep_rollback; @@ -472,7 +472,7 @@ static void wsrep_rollback_process(THD *thd) WSREP_DEBUG("WSREP rollback thread wakes for signal"); mysql_mutex_lock(&thd->mysys_var->mutex); - thd_proc_info(thd, "wsrep aborter active"); + thd_proc_info(thd, "WSREP aborter active"); thd->mysys_var->current_mutex= 0; thd->mysys_var->current_cond= 0; mysql_mutex_unlock(&thd->mysys_var->mutex); diff --git a/storage/connect/tabtbl.cpp b/storage/connect/tabtbl.cpp index 0c56b3e6614..9b83a1c93a5 100644 --- a/storage/connect/tabtbl.cpp +++ b/storage/connect/tabtbl.cpp @@ -650,7 +650,7 @@ bool TDBTBM::IsLocal(PTABLE tbp) return ((!stricmp(tdbp->Host, "localhost") || !strcmp(tdbp->Host, "127.0.0.1")) && - tdbp->Port == (int)GetDefaultPort()); + (int) tdbp->Port == (int)GetDefaultPort()); } // end of IsLocal /***********************************************************************/ diff --git a/storage/innobase/btr/btr0cur.cc b/storage/innobase/btr/btr0cur.cc index 83e64c854d6..e3ac8fb7605 100644 --- a/storage/innobase/btr/btr0cur.cc +++ b/storage/innobase/btr/btr0cur.cc @@ -5041,7 +5041,7 @@ btr_cur_del_mark_set_clust_rec( << rec_printer(rec, offsets).str()); if (dict_index_is_online_ddl(index)) { - row_log_table_delete(rec, entry, index, offsets, NULL); + row_log_table_delete(rec, index, offsets, NULL); } row_upd_rec_sys_fields(rec, page_zip, index, offsets, trx, roll_ptr); diff --git a/storage/innobase/buf/buf0buf.cc b/storage/innobase/buf/buf0buf.cc index 84ab2015348..53f92927b28 100644 --- a/storage/innobase/buf/buf0buf.cc +++ b/storage/innobase/buf/buf0buf.cc @@ -4161,7 +4161,8 @@ buf_page_get_gen( ulint retries = 0; buf_pool_t* buf_pool = buf_pool_get(page_id); - ut_ad(mtr->is_active()); + ut_ad((mtr == NULL) == (mode == BUF_EVICT_IF_IN_POOL)); + ut_ad(!mtr || mtr->is_active()); ut_ad((rw_latch == RW_S_LATCH) || (rw_latch == RW_X_LATCH) || (rw_latch == RW_SX_LATCH) @@ -4173,29 +4174,31 @@ buf_page_get_gen( #ifdef UNIV_DEBUG switch (mode) { + case BUF_EVICT_IF_IN_POOL: + /* After DISCARD TABLESPACE, the tablespace would not exist, + but in IMPORT TABLESPACE, PageConverter::operator() must + replace any old pages, which were not evicted during DISCARD. + Skip the assertion on space_page_size. */ + break; + default: + ut_error; case BUF_GET_NO_LATCH: ut_ad(rw_latch == RW_NO_LATCH); - break; + /* fall through */ case BUF_GET: case BUF_GET_IF_IN_POOL: case BUF_PEEK_IF_IN_POOL: case BUF_GET_IF_IN_POOL_OR_WATCH: case BUF_GET_POSSIBLY_FREED: - break; - default: - ut_error; + bool found; + const page_size_t& space_page_size + = fil_space_get_page_size(page_id.space(), &found); + ut_ad(found); + ut_ad(page_size.equals_to(space_page_size)); } - - bool found; - const page_size_t& space_page_size - = fil_space_get_page_size(page_id.space(), &found); - - ut_ad(found); - - ut_ad(page_size.equals_to(space_page_size)); #endif /* UNIV_DEBUG */ - ut_ad(!ibuf_inside(mtr) + ut_ad(!mtr || !ibuf_inside(mtr) || ibuf_page_low(page_id, page_size, FALSE, file, line, NULL)); buf_pool->stat.n_page_gets++; @@ -4283,13 +4286,15 @@ loop: rw_lock_x_unlock(hash_lock); } - if (mode == BUF_GET_IF_IN_POOL - || mode == BUF_PEEK_IF_IN_POOL - || mode == BUF_GET_IF_IN_POOL_OR_WATCH) { - + switch (mode) { + case BUF_GET_IF_IN_POOL: + case BUF_GET_IF_IN_POOL_OR_WATCH: + case BUF_PEEK_IF_IN_POOL: + case BUF_EVICT_IF_IN_POOL: +#ifdef UNIV_SYNC_DEBUG ut_ad(!rw_lock_own(hash_lock, RW_LOCK_X)); ut_ad(!rw_lock_own(hash_lock, RW_LOCK_S)); - +#endif /* UNIV_SYNC_DEBUG */ return(NULL); } @@ -4383,8 +4388,10 @@ loop: got_block: - if (mode == BUF_GET_IF_IN_POOL || mode == BUF_PEEK_IF_IN_POOL) { - + switch (mode) { + case BUF_GET_IF_IN_POOL: + case BUF_PEEK_IF_IN_POOL: + case BUF_EVICT_IF_IN_POOL: buf_page_t* fix_page = &fix_block->page; BPageMutex* fix_mutex = buf_page_get_mutex(fix_page); mutex_enter(fix_mutex); @@ -4416,6 +4423,20 @@ got_block: os_thread_sleep(WAIT_FOR_WRITE); goto loop; } + + if (UNIV_UNLIKELY(mode == BUF_EVICT_IF_IN_POOL)) { +evict_from_pool: + ut_ad(!fix_block->page.oldest_modification); + buf_pool_mutex_enter(buf_pool); + buf_block_unfix(fix_block); + + if (!buf_LRU_free_page(&fix_block->page, true)) { + ut_ad(0); + } + + buf_pool_mutex_exit(buf_pool); + return(NULL); + } break; case BUF_BLOCK_ZIP_PAGE: @@ -4448,6 +4469,10 @@ got_block: goto loop; } + if (UNIV_UNLIKELY(mode == BUF_EVICT_IF_IN_POOL)) { + goto evict_from_pool; + } + /* Buffer-fix the block so that it cannot be evicted or relocated while we are attempting to allocate an uncompressed page. */ diff --git a/storage/innobase/buf/buf0flu.cc b/storage/innobase/buf/buf0flu.cc index 44a3c19235b..043328902ee 100644 --- a/storage/innobase/buf/buf0flu.cc +++ b/storage/innobase/buf/buf0flu.cc @@ -3879,24 +3879,16 @@ FlushObserver::notify_remove( void FlushObserver::flush() { - buf_remove_t buf_remove; - - if (m_interrupted) { - buf_remove = BUF_REMOVE_FLUSH_NO_WRITE; - } else { - buf_remove = BUF_REMOVE_FLUSH_WRITE; - - if (m_stage != NULL) { - ulint pages_to_flush = - buf_flush_get_dirty_pages_count( - m_space_id, this); - - m_stage->begin_phase_flush(pages_to_flush); - } + if (!m_interrupted && m_stage) { + m_stage->begin_phase_flush(buf_flush_get_dirty_pages_count( + m_space_id, this)); } - /* Flush or remove dirty pages. */ - buf_LRU_flush_or_remove_pages(m_space_id, buf_remove, m_trx); + /* MDEV-14317 FIXME: Discard all changes to only those pages + that will be freed by the clean-up of the ALTER operation. + (Maybe, instead of buf_pool->flush_list, use a dedicated list + for pages on which redo logging has been disabled.) */ + buf_LRU_flush_or_remove_pages(m_space_id, m_trx); /* Wait for all dirty pages were flushed. */ for (ulint i = 0; i < srv_buf_pool_instances; i++) { diff --git a/storage/innobase/buf/buf0lru.cc b/storage/innobase/buf/buf0lru.cc index 2137760e815..9d0d9627d26 100644 --- a/storage/innobase/buf/buf0lru.cc +++ b/storage/innobase/buf/buf0lru.cc @@ -586,8 +586,8 @@ rescan: /* If flush observer is NULL, flush page for space id, or flush page for flush observer. */ - if ((observer != NULL && observer != bpage->flush_observer) - || (observer == NULL && id != bpage->id.space())) { + if (observer ? (observer != bpage->flush_observer) + : (id != bpage->id.space())) { /* Skip this block, as it does not belong to the target space. */ @@ -657,24 +657,27 @@ rescan: return(all_freed ? DB_SUCCESS : DB_FAIL); } -/******************************************************************//** -Remove or flush all the dirty pages that belong to a given tablespace +/** Remove or flush all the dirty pages that belong to a given tablespace inside a specific buffer pool instance. The pages will remain in the LRU list and will be evicted from the LRU list as they age and move towards -the tail of the LRU list. */ +the tail of the LRU list. +@param[in,out] buf_pool buffer pool +@param[in] id tablespace identifier +@param[in] observer flush observer, + or NULL if the files should not be written to +@param[in] trx transaction (to check for interrupt), + or NULL if the files should not be written to +*/ static void buf_flush_dirty_pages( -/*==================*/ - buf_pool_t* buf_pool, /*!< buffer pool instance */ - ulint id, /*!< in: space id */ - FlushObserver* observer, /*!< in: flush observer */ - bool flush, /*!< in: flush to disk if true otherwise - remove the pages without flushing */ - const trx_t* trx) /*!< to check if the operation must - be interrupted */ + buf_pool_t* buf_pool, + ulint id, + FlushObserver* observer, + const trx_t* trx) { dberr_t err; + bool flush = trx != NULL; do { buf_pool_mutex_enter(buf_pool); @@ -708,238 +711,30 @@ buf_flush_dirty_pages( || buf_pool_get_dirty_pages_count(buf_pool, id, observer) == 0); } -/******************************************************************//** -Remove all pages that belong to a given tablespace inside a specific -buffer pool instance when we are DISCARDing the tablespace. */ -static -void -buf_LRU_remove_all_pages( -/*=====================*/ - buf_pool_t* buf_pool, /*!< buffer pool instance */ - ulint id) /*!< in: space id */ -{ - buf_page_t* bpage; - ibool all_freed; - -scan_again: - buf_pool_mutex_enter(buf_pool); - - all_freed = TRUE; - - for (bpage = UT_LIST_GET_LAST(buf_pool->LRU); - bpage != NULL; - /* No op */) { - - rw_lock_t* hash_lock; - buf_page_t* prev_bpage; - BPageMutex* block_mutex; - - ut_a(buf_page_in_file(bpage)); - ut_ad(bpage->in_LRU_list); - - prev_bpage = UT_LIST_GET_PREV(LRU, bpage); - - /* bpage->id.space() and bpage->io_fix are protected by - buf_pool->mutex and the block_mutex. It is safe to check - them while holding buf_pool->mutex only. */ - - if (bpage->id.space() != id) { - /* Skip this block, as it does not belong to - the space that is being invalidated. */ - goto next_page; - } else if (buf_page_get_io_fix(bpage) != BUF_IO_NONE) { - /* We cannot remove this page during this scan - yet; maybe the system is currently reading it - in, or flushing the modifications to the file */ - - all_freed = FALSE; - goto next_page; - } else { - hash_lock = buf_page_hash_lock_get(buf_pool, bpage->id); - - rw_lock_x_lock(hash_lock); - - block_mutex = buf_page_get_mutex(bpage); - - mutex_enter(block_mutex); - - if (bpage->buf_fix_count > 0) { - - mutex_exit(block_mutex); - - rw_lock_x_unlock(hash_lock); - - /* We cannot remove this page during - this scan yet; maybe the system is - currently reading it in, or flushing - the modifications to the file */ - - all_freed = FALSE; - - goto next_page; - } - } - - ut_ad(mutex_own(block_mutex)); - - DBUG_PRINT("ib_buf", ("evict page %u:%u" - " state %u", - bpage->id.space(), - bpage->id.page_no(), - bpage->state)); -#ifdef BTR_CUR_HASH_ADAPT - if (buf_page_get_state(bpage) != BUF_BLOCK_FILE_PAGE) { - /* Do nothing, because the adaptive hash index - covers uncompressed pages only. */ - } else if (((buf_block_t*) bpage)->index) { - buf_pool_mutex_exit(buf_pool); - - rw_lock_x_unlock(hash_lock); - - mutex_exit(block_mutex); - - /* Note that the following call will acquire - and release block->lock X-latch. - Note that the table cannot be evicted during - the execution of ALTER TABLE...DISCARD TABLESPACE - because MySQL is keeping the table handle open. */ - - btr_search_drop_page_hash_when_freed( - bpage->id, bpage->size); - - goto scan_again; - } else { - /* This debug check uses a dirty read that could - theoretically cause false positives while - buf_pool_clear_hash_index() is executing, - if the writes to block->index=NULL and - block->n_pointers=0 are reordered. - (Other conflicting access paths to the adaptive hash - index should not be possible, because when a - tablespace is being discarded or dropped, there must - be no concurrect access to the contained tables.) */ - assert_block_ahi_empty((buf_block_t*) bpage); - } -#endif /* BTR_CUR_HASH_ADAPT */ - - if (bpage->oldest_modification != 0) { - - buf_flush_remove(bpage); - } - - ut_ad(!bpage->in_flush_list); - - /* Remove from the LRU list. */ - - if (buf_LRU_block_remove_hashed(bpage, true)) { - buf_LRU_block_free_hashed_page((buf_block_t*) bpage); - } else { - ut_ad(block_mutex == &buf_pool->zip_mutex); - } - - ut_ad(!mutex_own(block_mutex)); - - /* buf_LRU_block_remove_hashed() releases the hash_lock */ - ut_ad(!rw_lock_own(hash_lock, RW_LOCK_X)); - ut_ad(!rw_lock_own(hash_lock, RW_LOCK_S)); - -next_page: - bpage = prev_bpage; - } - - buf_pool_mutex_exit(buf_pool); - - if (!all_freed) { - os_thread_sleep(20000); - - goto scan_again; - } -} - -/******************************************************************//** -Remove pages belonging to a given tablespace inside a specific -buffer pool instance when we are deleting the data file(s) of that -tablespace. The pages still remain a part of LRU and are evicted from -the list as they age towards the tail of the LRU only if buf_remove -is BUF_REMOVE_FLUSH_NO_WRITE. */ -static +/** Empty the flush list for all pages belonging to a tablespace. +@param[in] id tablespace identifier +@param[in] trx transaction, for checking for user interrupt; + or NULL if nothing is to be written +@param[in] drop_ahi whether to drop the adaptive hash index */ void -buf_LRU_remove_pages( -/*=================*/ - buf_pool_t* buf_pool, /*!< buffer pool instance */ - ulint id, /*!< in: space id */ - buf_remove_t buf_remove, /*!< in: remove or flush strategy */ - const trx_t* trx) /*!< to check if the operation must - be interrupted */ +buf_LRU_flush_or_remove_pages(ulint id, const trx_t* trx, bool drop_ahi) { FlushObserver* observer = (trx == NULL) ? NULL : trx->flush_observer; + /* Pages in the system tablespace must never be discarded. */ + ut_ad(id || trx); - switch (buf_remove) { - case BUF_REMOVE_ALL_NO_WRITE: - buf_LRU_remove_all_pages(buf_pool, id); - break; - - case BUF_REMOVE_FLUSH_NO_WRITE: - /* Pass trx as NULL to avoid interruption check. */ - buf_flush_dirty_pages(buf_pool, id, observer, false, NULL); - break; - - case BUF_REMOVE_FLUSH_WRITE: - buf_flush_dirty_pages(buf_pool, id, observer, true, trx); - - if (observer == NULL) { - /* Ensure that all asynchronous IO is completed. */ - os_aio_wait_until_no_pending_writes(); - fil_flush(id); + for (ulint i = 0; i < srv_buf_pool_instances; i++) { + buf_pool_t* buf_pool = buf_pool_from_array(i); + if (drop_ahi) { + buf_LRU_drop_page_hash_for_tablespace(buf_pool, id); } - - break; + buf_flush_dirty_pages(buf_pool, id, observer, trx); } -} -/******************************************************************//** -Flushes all dirty pages or removes all pages belonging -to a given tablespace. A PROBLEM: if readahead is being started, what -guarantees that it will not try to read in pages after this operation -has completed? */ -void -buf_LRU_flush_or_remove_pages( -/*==========================*/ - ulint id, /*!< in: space id */ - buf_remove_t buf_remove, /*!< in: remove or flush strategy */ - const trx_t* trx) /*!< to check if the operation must - be interrupted */ -{ - ulint i; - - /* Before we attempt to drop pages one by one we first - attempt to drop page hash index entries in batches to make - it more efficient. The batching attempt is a best effort - attempt and does not guarantee that all pages hash entries - will be dropped. We get rid of remaining page hash entries - one by one below. */ - for (i = 0; i < srv_buf_pool_instances; i++) { - buf_pool_t* buf_pool; - - buf_pool = buf_pool_from_array(i); -#ifdef BTR_CUR_HASH_ADAPT - switch (buf_remove) { - case BUF_REMOVE_ALL_NO_WRITE: - buf_LRU_drop_page_hash_for_tablespace(buf_pool, id); - break; - - case BUF_REMOVE_FLUSH_NO_WRITE: - /* It is a DROP TABLE for a single table - tablespace. No AHI entries exist because - we already dealt with them when freeing up - extents. */ - case BUF_REMOVE_FLUSH_WRITE: - /* We allow read-only queries against the - table, there is no need to drop the AHI entries. */ - break; - } -#endif /* BTR_CUR_HASH_ADAPT */ - buf_LRU_remove_pages(buf_pool, id, buf_remove, trx); + if (trx && !observer && !trx_is_interrupted(trx)) { + /* Ensure that all asynchronous IO is completed. */ + os_aio_wait_until_no_pending_writes(); + fil_flush(id); } } diff --git a/storage/innobase/dict/dict0dict.cc b/storage/innobase/dict/dict0dict.cc index 071218c4060..b07140b8dd7 100644 --- a/storage/innobase/dict/dict0dict.cc +++ b/storage/innobase/dict/dict0dict.cc @@ -1630,7 +1630,7 @@ dict_table_rename_in_cache( return(DB_OUT_OF_MEMORY); } - fil_delete_tablespace(table->space, BUF_REMOVE_ALL_NO_WRITE); + fil_delete_tablespace(table->space, true); /* Delete any temp file hanging around. */ if (os_file_status(filepath, &exists, &ftype) diff --git a/storage/innobase/fil/fil0fil.cc b/storage/innobase/fil/fil0fil.cc index 73132754fdf..90a3baa6f83 100644 --- a/storage/innobase/fil/fil0fil.cc +++ b/storage/innobase/fil/fil0fil.cc @@ -2449,7 +2449,7 @@ fil_recreate_tablespace( /* Step-1: Invalidate buffer pool pages belonging to the tablespace to re-create. */ - buf_LRU_flush_or_remove_pages(space_id, BUF_REMOVE_ALL_NO_WRITE, 0); + buf_LRU_flush_or_remove_pages(space_id, NULL); /* Remove all insert buffer entries for the tablespace */ ibuf_delete_for_discarded_space(space_id); @@ -2907,7 +2907,7 @@ fil_close_tablespace( completely and permanently. The flag stop_new_ops also prevents fil_flush() from being applied to this tablespace. */ - buf_LRU_flush_or_remove_pages(id, BUF_REMOVE_FLUSH_WRITE, trx); + buf_LRU_flush_or_remove_pages(id, trx); /* If the free is successful, the X lock will be released before the space memory data structure is freed. */ @@ -2959,17 +2959,12 @@ fil_table_accessible(const dict_table_t* table) } } -/** Deletes an IBD tablespace, either general or single-table. -The tablespace must be cached in the memory cache. This will delete the -datafile, fil_space_t & fil_node_t entries from the file_system_t cache. -@param[in] space_id Tablespace id -@param[in] buf_remove Specify the action to take on the pages -for this table in the buffer pool. -@return DB_SUCCESS or error */ +/** Delete a tablespace and associated .ibd file. +@param[in] id tablespace identifier +@param[in] drop_ahi whether to drop the adaptive hash index +@return DB_SUCCESS or error */ dberr_t -fil_delete_tablespace( - ulint id, - buf_remove_t buf_remove) +fil_delete_tablespace(ulint id, bool drop_ahi) { char* path = 0; fil_space_t* space = 0; @@ -3012,7 +3007,7 @@ fil_delete_tablespace( To deal with potential read requests, we will check the ::stop_new_ops flag in fil_io(). */ - buf_LRU_flush_or_remove_pages(id, buf_remove, 0); + buf_LRU_flush_or_remove_pages(id, NULL, drop_ahi); /* If it is a delete then also delete any generated files, otherwise when we drop the database the remove directory will fail. */ @@ -3103,7 +3098,7 @@ fil_truncate_tablespace( /* Step-2: Invalidate buffer pool pages belonging to the tablespace to re-create. Remove all insert buffer entries for the tablespace */ - buf_LRU_flush_or_remove_pages(space_id, BUF_REMOVE_ALL_NO_WRITE, 0); + buf_LRU_flush_or_remove_pages(space_id, NULL); /* Step-3: Truncate the tablespace and accordingly update the fil_space_t handler that is used to access this tablespace. */ @@ -3199,7 +3194,7 @@ fil_reinit_space_header_for_table( from disabling AHI during the scan */ btr_search_s_lock_all(); DEBUG_SYNC_C("buffer_pool_scan"); - buf_LRU_flush_or_remove_pages(id, BUF_REMOVE_ALL_NO_WRITE, 0); + buf_LRU_flush_or_remove_pages(id, NULL); btr_search_s_unlock_all(); row_mysql_lock_data_dictionary(trx); @@ -3292,7 +3287,7 @@ fil_discard_tablespace( { dberr_t err; - switch (err = fil_delete_tablespace(id, BUF_REMOVE_ALL_NO_WRITE)) { + switch (err = fil_delete_tablespace(id, true)) { case DB_SUCCESS: break; @@ -4348,8 +4343,19 @@ fil_ibd_discover( /* Look for a remote file-per-table tablespace. */ - df_rem_per.set_name(db); - if (df_rem_per.open_link_file() == DB_SUCCESS) { + switch (srv_operation) { + case SRV_OPERATION_BACKUP: + case SRV_OPERATION_RESTORE_DELTA: + ut_ad(0); + break; + case SRV_OPERATION_RESTORE_EXPORT: + case SRV_OPERATION_RESTORE: + break; + case SRV_OPERATION_NORMAL: + df_rem_per.set_name(db); + if (df_rem_per.open_link_file() != DB_SUCCESS) { + break; + } /* An ISL file was found with contents. */ if (df_rem_per.open_read_only(false) != DB_SUCCESS @@ -4439,6 +4445,18 @@ fil_ibd_load( return(FIL_LOAD_OK); } + if (srv_operation == SRV_OPERATION_RESTORE) { + /* Replace absolute DATA DIRECTORY file paths with + short names relative to the backup directory. */ + if (const char* name = strrchr(filename, OS_PATH_SEPARATOR)) { + while (--name > filename + && *name != OS_PATH_SEPARATOR); + if (name > filename) { + filename = name + 1; + } + } + } + Datafile file; file.set_filepath(filename); file.open_read_only(false); diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index 10d54498feb..96aca74c217 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -19640,7 +19640,7 @@ wsrep_innobase_kill_one_trx( wsrep_thd_awake(thd, signal); } else { /* abort currently executing query */ - DBUG_PRINT("wsrep",("sending KILL_QUERY to: %ld", + DBUG_PRINT("wsrep",("sending KILL_QUERY to: %lu", thd_get_thread_id(thd))); WSREP_DEBUG("kill query for: %ld", thd_get_thread_id(thd)); @@ -19784,7 +19784,8 @@ wsrep_fake_trx_id( mutex_enter(&trx_sys->mutex); trx_id_t trx_id = trx_sys_get_new_trx_id(); mutex_exit(&trx_sys->mutex); - WSREP_DEBUG("innodb fake trx id: %lu thd: %s", trx_id, wsrep_thd_query(thd)); + WSREP_DEBUG("innodb fake trx id: " TRX_ID_FMT " thd: %s", + trx_id, wsrep_thd_query(thd)); wsrep_ws_handle_for_trx(wsrep_thd_ws_handle(thd), trx_id); } diff --git a/storage/innobase/handler/handler0alter.cc b/storage/innobase/handler/handler0alter.cc index 7b9980c22bb..67174336a7c 100644 --- a/storage/innobase/handler/handler0alter.cc +++ b/storage/innobase/handler/handler0alter.cc @@ -427,6 +427,26 @@ innobase_fulltext_exist( return(false); } +/** Determine whether indexed virtual columns exist in a table. +@param[in] table table definition +@return whether indexes exist on virtual columns */ +static bool innobase_indexed_virtual_exist(const TABLE* table) +{ + const KEY* const end = &table->key_info[table->s->keys]; + + for (const KEY* key = table->key_info; key < end; key++) { + const KEY_PART_INFO* const key_part_end = key->key_part + + key->user_defined_key_parts; + for (const KEY_PART_INFO* key_part = key->key_part; + key_part < key_part_end; key_part++) { + if (!key_part->field->stored_in_db()) + return true; + } + } + + return false; +} + /** Determine if spatial indexes exist in a given table. @param table MySQL table @return whether spatial indexes exist on the table */ @@ -1134,7 +1154,8 @@ next_column: & Alter_inplace_info::ADD_PK_INDEX) || innobase_need_rebuild(ha_alter_info, table)) && (innobase_fulltext_exist(altered_table) - || innobase_spatial_exist(altered_table))) { + || innobase_spatial_exist(altered_table) + || innobase_indexed_virtual_exist(altered_table))) { /* Refuse to rebuild the table online, if FULLTEXT OR SPATIAL indexes are to survive the rebuild. */ online = false; @@ -1150,6 +1171,10 @@ next_column: ha_alter_info->unsupported_reason = innobase_get_err_msg( ER_ALTER_OPERATION_NOT_SUPPORTED_REASON_GIS); + } else if (!innobase_fulltext_exist(altered_table)) { + /* MDEV-14341 FIXME: Remove this limitation. */ + ha_alter_info->unsupported_reason = + "online rebuild with indexed virtual columns"; } else { ha_alter_info->unsupported_reason = innobase_get_err_msg( @@ -5308,7 +5333,7 @@ not_instant_add_column: if (alt_opt.encryption != opt.encryption || alt_opt.encryption_key_id != opt.encryption_key_id) { - key_id = alt_opt.encryption_key_id; + key_id = uint32_t(alt_opt.encryption_key_id); mode = fil_encryption_t(alt_opt.encryption); } } diff --git a/storage/innobase/ibuf/ibuf0ibuf.cc b/storage/innobase/ibuf/ibuf0ibuf.cc index c276a4ce137..b0d9ccbde7d 100644 --- a/storage/innobase/ibuf/ibuf0ibuf.cc +++ b/storage/innobase/ibuf/ibuf0ibuf.cc @@ -4964,21 +4964,36 @@ ibuf_check_bitmap_on_import( const trx_t* trx, /*!< in: transaction */ ulint space_id) /*!< in: tablespace identifier */ { - ulint size; ulint page_no; ut_ad(space_id); ut_ad(trx->mysql_thd); - bool found; - const page_size_t& page_size - = fil_space_get_page_size(space_id, &found); - - if (!found) { + FilSpace space(space_id); + if (!space()) { return(DB_TABLE_NOT_FOUND); } - size = fil_space_get_size(space_id); + const page_size_t page_size(space->flags); + /* fil_space_t::size and fil_space_t::free_limit would still be 0 + at this point. So, we will have to read page 0. */ + ut_ad(!space->free_limit); + ut_ad(!space->size); + + mtr_t mtr; + ulint size; + mtr.start(); + if (buf_block_t* sp = buf_page_get(page_id_t(space_id, 0), page_size, + RW_S_LATCH, &mtr)) { + size = std::min( + mach_read_from_4(FSP_HEADER_OFFSET + FSP_FREE_LIMIT + + sp->frame), + mach_read_from_4(FSP_HEADER_OFFSET + FSP_SIZE + + sp->frame)); + } else { + size = 0; + } + mtr.commit(); if (size == 0) { return(DB_TABLE_NOT_FOUND); @@ -4993,7 +5008,6 @@ ibuf_check_bitmap_on_import( the space, as usual. */ for (page_no = 0; page_no < size; page_no += page_size.physical()) { - mtr_t mtr; page_t* bitmap_page; ulint i; diff --git a/storage/innobase/include/buf0buf.h b/storage/innobase/include/buf0buf.h index 516898066aa..4a54c30629b 100644 --- a/storage/innobase/include/buf0buf.h +++ b/storage/innobase/include/buf0buf.h @@ -65,6 +65,7 @@ struct fil_addr_t; #define BUF_GET_POSSIBLY_FREED 16 /*!< Like BUF_GET, but do not mind if the file page has been freed. */ +#define BUF_EVICT_IF_IN_POOL 20 /*!< evict a clean block if found */ /* @} */ /** @name Modes for buf_page_get_known_nowait */ /* @{ */ diff --git a/storage/innobase/include/buf0lru.h b/storage/innobase/include/buf0lru.h index 3cc01473da1..54c001ce478 100644 --- a/storage/innobase/include/buf0lru.h +++ b/storage/innobase/include/buf0lru.h @@ -50,18 +50,14 @@ These are low-level functions /** Minimum LRU list length for which the LRU_old pointer is defined */ #define BUF_LRU_OLD_MIN_LEN 512 /* 8 megabytes of 16k pages */ -/******************************************************************//** -Flushes all dirty pages or removes all pages belonging -to a given tablespace. A PROBLEM: if readahead is being started, what -guarantees that it will not try to read in pages after this operation -has completed? */ +/** Empty the flush list for all pages belonging to a tablespace. +@param[in] id tablespace identifier +@param[in] trx transaction, for checking for user interrupt; + or NULL if nothing is to be written +@param[in] drop_ahi whether to drop the adaptive hash index */ +UNIV_INTERN void -buf_LRU_flush_or_remove_pages( -/*==========================*/ - ulint id, /*!< in: space id */ - buf_remove_t buf_remove, /*!< in: remove or flush strategy */ - const trx_t* trx); /*!< to check if the operation must - be interrupted */ +buf_LRU_flush_or_remove_pages(ulint id, const trx_t* trx, bool drop_ahi=false); #if defined UNIV_DEBUG || defined UNIV_BUF_DEBUG /********************************************************************//** diff --git a/storage/innobase/include/buf0types.h b/storage/innobase/include/buf0types.h index 102b831ec61..719699f5ee2 100644 --- a/storage/innobase/include/buf0types.h +++ b/storage/innobase/include/buf0types.h @@ -59,17 +59,6 @@ enum buf_flush_t { BUF_FLUSH_N_TYPES /*!< index of last element + 1 */ }; -/** Algorithm to remove the pages for a tablespace from the buffer pool. -See buf_LRU_flush_or_remove_pages(). */ -enum buf_remove_t { - BUF_REMOVE_ALL_NO_WRITE, /*!< Remove all pages from the buffer - pool, don't write or sync to disk */ - BUF_REMOVE_FLUSH_NO_WRITE, /*!< Remove only, from the flush list, - don't write or sync to disk */ - BUF_REMOVE_FLUSH_WRITE /*!< Flush dirty pages to disk only - don't remove from the buffer pool */ -}; - /** Flags for io_fix types */ enum buf_io_fix { BUF_IO_NONE = 0, /**< no pending I/O */ diff --git a/storage/innobase/include/fil0fil.h b/storage/innobase/include/fil0fil.h index 12395a3f060..695c490ea94 100644 --- a/storage/innobase/include/fil0fil.h +++ b/storage/innobase/include/fil0fil.h @@ -940,17 +940,12 @@ bool fil_table_accessible(const dict_table_t* table) MY_ATTRIBUTE((warn_unused_result, nonnull)); -/** Deletes an IBD tablespace, either general or single-table. -The tablespace must be cached in the memory cache. This will delete the -datafile, fil_space_t & fil_node_t entries from the file_system_t cache. -@param[in] space_id Tablespace id -@param[in] buf_remove Specify the action to take on the pages -for this table in the buffer pool. -@return true if success */ +/** Delete a tablespace and associated .ibd file. +@param[in] id tablespace identifier +@param[in] drop_ahi whether to drop the adaptive hash index +@return DB_SUCCESS or error */ dberr_t -fil_delete_tablespace( - ulint id, - buf_remove_t buf_remove); +fil_delete_tablespace(ulint id, bool drop_ahi = false); /** Truncate the tablespace to needed size. @param[in] space_id id of tablespace to truncate diff --git a/storage/innobase/include/rem0rec.h b/storage/innobase/include/rem0rec.h index 58802e23e77..062e4f8d8ab 100644 --- a/storage/innobase/include/rem0rec.h +++ b/storage/innobase/include/rem0rec.h @@ -989,29 +989,6 @@ rec_convert_dtuple_to_temp( rec_comp_status_t status = REC_STATUS_ORDINARY) MY_ATTRIBUTE((nonnull)); -/** Determine the converted size of virtual column data in a temporary file. -@see rec_convert_dtuple_to_temp_v() -@param[in] index clustered index -@param[in] v clustered index record augmented with the values - of virtual columns -@return size in bytes */ -ulint -rec_get_converted_size_temp_v(const dict_index_t* index, const dtuple_t* v) - MY_ATTRIBUTE((warn_unused_result, nonnull)); - -/** Write indexed virtual column data into a temporary file. -@see rec_get_converted_size_temp_v() -@param[out] rec serialized record -@param[in] index clustered index -@param[in] v_entry clustered index record augmented with the values - of virtual columns */ -void -rec_convert_dtuple_to_temp_v( - byte* rec, - const dict_index_t* index, - const dtuple_t* v_entry) - MY_ATTRIBUTE((nonnull)); - /**************************************************************//** Copies the first n fields of a physical record to a new physical record in a buffer. diff --git a/storage/innobase/include/row0log.h b/storage/innobase/include/row0log.h index 11b7b8e9ad3..df9920d9bcc 100644 --- a/storage/innobase/include/row0log.h +++ b/storage/innobase/include/row0log.h @@ -1,6 +1,7 @@ /***************************************************************************** Copyright (c) 2011, 2016, Oracle and/or its affiliates. All Rights Reserved. +Copyright (c) 2017, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -132,7 +133,6 @@ row_log_table_delete( /*=================*/ const rec_t* rec, /*!< in: clustered index leaf page record, page X-latched */ - const dtuple_t* ventry, /*!< in: dtuple holding virtual column info */ dict_index_t* index, /*!< in/out: clustered index, S-latched or X-latched */ const ulint* offsets,/*!< in: rec_get_offsets(rec,index) */ @@ -151,12 +151,8 @@ row_log_table_update( dict_index_t* index, /*!< in/out: clustered index, S-latched or X-latched */ const ulint* offsets,/*!< in: rec_get_offsets(rec,index) */ - const dtuple_t* old_pk, /*!< in: row_log_table_get_pk() + const dtuple_t* old_pk);/*!< in: row_log_table_get_pk() before the update */ - const dtuple_t* new_v_row,/*!< in: dtuple contains the new virtual - columns */ - const dtuple_t* old_v_row);/*!< in: dtuple contains the old virtual - columns */ /******************************************************//** Constructs the old PRIMARY KEY and DB_TRX_ID,DB_ROLL_PTR @@ -185,7 +181,6 @@ row_log_table_insert( /*=================*/ const rec_t* rec, /*!< in: clustered index leaf page record, page X-latched */ - const dtuple_t* ventry, /*!< in: dtuple holding virtual column info */ dict_index_t* index, /*!< in/out: clustered index, S-latched or X-latched */ const ulint* offsets);/*!< in: rec_get_offsets(rec,index) */ diff --git a/storage/innobase/include/trx0rec.h b/storage/innobase/include/trx0rec.h index a6889696036..ed45e1de82e 100644 --- a/storage/innobase/include/trx0rec.h +++ b/storage/innobase/include/trx0rec.h @@ -276,15 +276,13 @@ trx_undo_rec_get_col_val( @param[in] table the table @param[in] ptr undo log pointer @param[in,out] row the dtuple to fill -@param[in] in_purge called by purge thread -@param[in] col_map online rebuild column map */ +@param[in] in_purge whether this is called by purge */ void trx_undo_read_v_cols( const dict_table_t* table, const byte* ptr, const dtuple_t* row, - bool in_purge, - const ulint* col_map); + bool in_purge); /** Read virtual column index from undo log if the undo log contains such info, and verify the column is still indexed, and output its position diff --git a/storage/innobase/os/os0file.cc b/storage/innobase/os/os0file.cc index c6b9def79a1..e556f6bef6d 100644 --- a/storage/innobase/os/os0file.cc +++ b/storage/innobase/os/os0file.cc @@ -5382,13 +5382,21 @@ fallback: } while (err == EINTR && srv_shutdown_state == SRV_SHUTDOWN_NONE); - if (err) { + switch (err) { + case 0: + return true; + default: ib::error() << "preallocating " << size << " bytes for file " << name << " failed with error " << err; + /* fall through */ + case EINTR: + errno = err; + return false; + case EINVAL: + /* fall back to the code below */ + break; } - errno = err; - return(!err); # endif /* HAVE_POSIX_ALLOCATE */ #endif /* _WIN32*/ @@ -5410,14 +5418,9 @@ fallback: memset(buf, 0, buf_size); os_offset_t current_size = os_file_get_size(file); - bool write_progress_info = - (size - current_size >= (os_offset_t) 100 << 20); - - if (write_progress_info) { - ib::info() << "Progress in MB:"; - } - while (current_size < size) { + while (current_size < size + && srv_shutdown_state == SRV_SHUTDOWN_NONE) { ulint n_bytes; if (size - current_size < (os_offset_t) buf_size) { @@ -5433,32 +5436,15 @@ fallback: request, name, file, buf, current_size, n_bytes); if (err != DB_SUCCESS) { - - ut_free(buf2); - return(false); - } - - /* Print about progress for each 100 MB written */ - if (write_progress_info && - ((current_size + n_bytes) / (100 << 20) - != current_size / (100 << 20))) { - - fprintf(stderr, " %lu00", - (ulong) ((current_size + n_bytes) - / (100 << 20))); + break; } current_size += n_bytes; } - if (write_progress_info) { - - fprintf(stderr, "\n"); - } - ut_free(buf2); - return(os_file_flush(file)); + return(current_size >= size && os_file_flush(file)); } /** Truncates a file to a specified size in bytes. diff --git a/storage/innobase/rem/rem0rec.cc b/storage/innobase/rem/rem0rec.cc index 70710a1e6ca..8fb24855e97 100644 --- a/storage/innobase/rem/rem0rec.cc +++ b/storage/innobase/rem/rem0rec.cc @@ -840,6 +840,7 @@ rec_get_offsets_func( ut_ad(is_user_rec || n == 1); ut_ad(!is_user_rec || leaf || index->is_dummy || dict_index_is_ibuf(index) + || n == n_fields /* dict_stats_analyze_index_level() */ || n == dict_index_get_n_unique_in_tree_nonleaf(index) + 1); ut_ad(!is_user_rec || !leaf || index->is_dummy @@ -1199,49 +1200,6 @@ rec_get_converted_size_comp_prefix_low( return(extra_size + data_size); } -/** Determine the converted size of virtual column data in a temporary file. -@see rec_convert_dtuple_to_temp_v() -@param[in] index clustered index -@param[in] v clustered index record augmented with the values - of virtual columns -@return size in bytes */ -ulint -rec_get_converted_size_temp_v(const dict_index_t* index, const dtuple_t* v) -{ - ut_ad(dict_index_is_clust(index)); - - /* length marker */ - ulint data_size = 2; - const ulint n_v_fields = dtuple_get_n_v_fields(v); - - for (ulint i = 0; i < n_v_fields; i++) { - const dict_v_col_t* col - = dict_table_get_nth_v_col(index->table, i); - - /* Only those indexed needs to be logged */ - if (!col->m_col.ord_part) { - continue; - } - - data_size += mach_get_compressed_size(i + REC_MAX_N_FIELDS); - const dfield_t* vfield = dtuple_get_nth_v_field(v, col->v_pos); - ulint flen = vfield->len; - - if (flen != UNIV_SQL_NULL) { - flen = ut_min( - flen, - static_cast<ulint>( - DICT_MAX_FIELD_LEN_BY_FORMAT( - index->table))); - data_size += flen; - } - - data_size += mach_get_compressed_size(flen); - } - - return(data_size); -} - /**********************************************************//** Determines the size of a data tuple prefix in ROW_FORMAT=COMPACT. @return total size */ @@ -1650,68 +1608,6 @@ rec_convert_dtuple_to_rec_comp( } } -/** Write indexed virtual column data into a temporary file. -@see rec_get_converted_size_temp_v() -@param[out] rec serialized record -@param[in] index clustered index -@param[in] v_entry clustered index record augmented with the values - of virtual columns */ -void -rec_convert_dtuple_to_temp_v( - byte* rec, - const dict_index_t* index, - const dtuple_t* v_entry) -{ - ut_ad(dict_index_is_clust(index)); - const ulint num_v = dtuple_get_n_v_fields(v_entry); - - /* reserve 2 bytes for writing length */ - byte* ptr = rec; - ptr += 2; - - /* Now log information on indexed virtual columns */ - for (ulint col_no = 0; col_no < num_v; col_no++) { - dfield_t* vfield; - ulint flen; - - const dict_v_col_t* col - = dict_table_get_nth_v_col(index->table, col_no); - - if (col->m_col.ord_part) { - ulint pos = col_no; - - pos += REC_MAX_N_FIELDS; - - ptr += mach_write_compressed(ptr, pos); - - vfield = dtuple_get_nth_v_field( - v_entry, col->v_pos); - - flen = vfield->len; - - if (flen != UNIV_SQL_NULL) { - /* The virtual column can only be in sec - index, and index key length is bound by - DICT_MAX_FIELD_LEN_BY_FORMAT */ - flen = ut_min( - flen, - static_cast<ulint>( - DICT_MAX_FIELD_LEN_BY_FORMAT( - index->table))); - } - - ptr += mach_write_compressed(ptr, flen); - - if (flen != UNIV_SQL_NULL) { - ut_memcpy(ptr, dfield_get_data(vfield), flen); - ptr += flen; - } - } - } - - mach_write_to_2(rec, ptr - rec); -} - /*********************************************************//** Builds a new-style physical record out of a data tuple and stores it beginning from the start of the given buffer. diff --git a/storage/innobase/row/row0import.cc b/storage/innobase/row/row0import.cc index 757fbd28a88..9ea0bdd949c 100644 --- a/storage/innobase/row/row0import.cc +++ b/storage/innobase/row/row0import.cc @@ -1544,18 +1544,16 @@ PageConverter::PageConverter( : AbstractCallback(trx), m_cfg(cfg), + m_index(cfg->m_indexes), + m_current_lsn(log_get_lsn()), m_page_zip_ptr(0), - m_heap(0) UNIV_NOTHROW + m_rec_iter(), + m_offsets_(), m_offsets(m_offsets_), + m_heap(0), + m_cluster_index(dict_table_get_first_index(cfg->m_table)) UNIV_NOTHROW { - m_index = m_cfg->m_indexes; - - m_current_lsn = log_get_lsn(); ut_a(m_current_lsn > 0); - - m_offsets = m_offsets_; rec_offs_init(m_offsets_); - - m_cluster_index = dict_table_get_first_index(m_cfg->m_table); } /** Adjust the BLOB reference for a single column that is externally stored @@ -2024,7 +2022,7 @@ PageConverter::operator() ( we can work on them */ if ((err = update_page(block, page_type)) != DB_SUCCESS) { - return(err); + break; } /* Note: For compressed pages this function will write to the @@ -2063,9 +2061,15 @@ PageConverter::operator() ( << " at offset " << offset << " looks corrupted in file " << m_filepath; - return(DB_CORRUPTION); + err = DB_CORRUPTION; } + /* If we already had and old page with matching number + in the buffer pool, evict it now, because + we no longer evict the pages on DISCARD TABLESPACE. */ + buf_page_get_gen(block->page.id, get_page_size(), + RW_NO_LATCH, NULL, BUF_EVICT_IF_IN_POOL, + __FILE__, __LINE__, NULL, NULL); return(err); } @@ -3668,8 +3672,7 @@ row_import_for_mysql( The only dirty pages generated should be from the pessimistic purge of delete marked records that couldn't be purged in Phase I. */ - buf_LRU_flush_or_remove_pages( - prebuilt->table->space, BUF_REMOVE_FLUSH_WRITE, trx); + buf_LRU_flush_or_remove_pages(prebuilt->table->space, trx); if (trx_is_interrupted(trx)) { ib::info() << "Phase III - Flush interrupted"; diff --git a/storage/innobase/row/row0ins.cc b/storage/innobase/row/row0ins.cc index 3729256c03b..2200a2092bd 100644 --- a/storage/innobase/row/row0ins.cc +++ b/storage/innobase/row/row0ins.cc @@ -2509,8 +2509,7 @@ row_ins_index_entry_big_rec( if (error == DB_SUCCESS && dict_index_is_online_ddl(index)) { - row_log_table_insert(btr_pcur_get_rec(&pcur), entry, - index, offsets); + row_log_table_insert(btr_pcur_get_rec(&pcur), index, offsets); } mtr.commit(); @@ -2727,7 +2726,7 @@ err_exit: entry_heap, entry, thr, &mtr); if (err == DB_SUCCESS && dict_index_is_online_ddl(index)) { - row_log_table_insert(btr_cur_get_rec(cursor), entry, + row_log_table_insert(btr_cur_get_rec(cursor), index, offsets); } @@ -2788,7 +2787,7 @@ do_insert: if (err == DB_SUCCESS && dict_index_is_online_ddl(index)) { row_log_table_insert( - insert_rec, entry, index, offsets); + insert_rec, index, offsets); } mtr_commit(&mtr); diff --git a/storage/innobase/row/row0log.cc b/storage/innobase/row/row0log.cc index be4a7138ac7..76ca4e8b940 100644 --- a/storage/innobase/row/row0log.cc +++ b/storage/innobase/row/row0log.cc @@ -217,11 +217,6 @@ struct row_log_t { byte* crypt_head; /*!< reader context; temporary buffer used in encryption, decryption or NULL */ - ulint n_old_col; - /*!< number of non-virtual column in - old table */ - ulint n_old_vcol; - /*!< number of virtual column in old table */ const char* path; /*!< where to create temporary file during log operation */ }; @@ -609,7 +604,6 @@ row_log_table_delete( /*=================*/ const rec_t* rec, /*!< in: clustered index leaf page record, page X-latched */ - const dtuple_t* ventry, /*!< in: dtuple holding virtual column info */ dict_index_t* index, /*!< in/out: clustered index, S-latched or X-latched */ const ulint* offsets,/*!< in: rec_get_offsets(rec,index) */ @@ -739,11 +733,6 @@ row_log_table_delete( } } - /* Check if we need to log virtual column data */ - if (ventry->n_v_fields > 0) { - mrec_size += rec_get_converted_size_temp_v(new_index, ventry); - } - if (byte* b = row_log_table_open(index->online_log, mrec_size, &avail_size)) { *b++ = ROW_T_DELETE; @@ -786,12 +775,6 @@ row_log_table_delete( b += ext_size; } - /* log virtual columns */ - if (ventry->n_v_fields > 0) { - rec_convert_dtuple_to_temp_v(b, new_index, ventry); - b += mach_read_from_2(b); - } - row_log_table_close(index, b, mrec_size, avail_size); } @@ -808,10 +791,6 @@ row_log_table_low_redundant( const rec_t* rec, /*!< in: clustered index leaf page record in ROW_FORMAT=REDUNDANT, page X-latched */ - const dtuple_t* ventry, /*!< in: dtuple holding virtual - column info or NULL */ - const dtuple_t* o_ventry,/*!< in: old dtuple holding virtual - column info or NULL */ dict_index_t* index, /*!< in/out: clustered index, S-latched or X-latched */ bool insert, /*!< in: true if insert, @@ -831,7 +810,6 @@ row_log_table_low_redundant( ulint avail_size; mem_heap_t* heap = NULL; dtuple_t* tuple; - ulint num_v = ventry ? dtuple_get_n_v_fields(ventry) : 0; const ulint n_fields = rec_get_n_fields_old(rec); ut_ad(!page_is_comp(page_align(rec))); @@ -842,13 +820,9 @@ row_log_table_low_redundant( ut_ad(dict_index_is_clust(new_index)); heap = mem_heap_create(DTUPLE_EST_ALLOC(n_fields)); - tuple = dtuple_create_with_vcol(heap, n_fields, num_v); + tuple = dtuple_create(heap, n_fields); dict_index_copy_types(tuple, index, n_fields); - if (num_v) { - dict_table_copy_v_types(tuple, index->table); - } - dtuple_set_n_fields_cmp(tuple, dict_index_get_n_unique(index)); if (rec_get_1byte_offs_flag(rec)) { @@ -888,19 +862,8 @@ row_log_table_low_redundant( size++; extra_size++; } - ulint v_size = num_v - ? rec_get_converted_size_temp_v(index, ventry) : 0; - - mrec_size = ROW_LOG_HEADER_SIZE + size + v_size + (extra_size >= 0x80); - if (num_v) { - if (o_ventry) { - mrec_size += rec_get_converted_size_temp_v( - index, o_ventry); - } - } else if (index->table->n_v_cols) { - mrec_size += 2; - } + mrec_size = ROW_LOG_HEADER_SIZE + size + (extra_size >= 0x80); if (insert || index->online_log->same_pk) { ut_ad(!old_pk); @@ -957,22 +920,6 @@ row_log_table_low_redundant( b + extra_size, index, tuple->fields, tuple->n_fields, status); b += size; - ut_ad(!num_v == !v_size); - if (num_v) { - rec_convert_dtuple_to_temp_v(b, new_index, ventry); - b += v_size; - if (o_ventry) { - rec_convert_dtuple_to_temp_v( - b, new_index, o_ventry); - b += mach_read_from_2(b); - } - } else if (index->table->n_v_cols) { - /* The table contains virtual columns, but nothing - has changed for them, so just mark a 2 bytes length - field */ - mach_write_to_2(b, 2); - b += 2; - } row_log_table_close(index, b, mrec_size, avail_size); } @@ -988,9 +935,6 @@ row_log_table_low( /*==============*/ const rec_t* rec, /*!< in: clustered index leaf page record, page X-latched */ - const dtuple_t* ventry, /*!< in: dtuple holding virtual column info */ - const dtuple_t* o_ventry,/*!< in: dtuple holding old virtual column - info */ dict_index_t* index, /*!< in/out: clustered index, S-latched or X-latched */ const ulint* offsets,/*!< in: rec_get_offsets(rec,index) */ @@ -1036,8 +980,6 @@ row_log_table_low( with no information on virtual columns */ ut_ad(!old_pk || !insert); ut_ad(!old_pk || old_pk->n_v_fields == 0); - ut_ad(!o_ventry || !insert); - ut_ad(!o_ventry || ventry); if (dict_index_is_corrupted(index) || !dict_index_is_online_ddl(index) @@ -1047,8 +989,7 @@ row_log_table_low( if (!rec_offs_comp(offsets)) { row_log_table_low_redundant( - rec, ventry, o_ventry, index, insert, - old_pk, new_index); + rec, index, insert, old_pk, new_index); return; } @@ -1065,20 +1006,6 @@ row_log_table_low( + (extra_size >= 0x80) + rec_offs_size(offsets) - omit_size + index->is_instant(); - if (ventry && ventry->n_v_fields > 0) { - mrec_size += rec_get_converted_size_temp_v(new_index, ventry); - - if (o_ventry) { - mrec_size += rec_get_converted_size_temp_v( - new_index, o_ventry); - } - } else if (index->table->n_v_cols) { - /* Always leave 2 bytes length marker for virtual column - data logging even if there is none of them is indexed if table - has virtual columns */ - mrec_size += 2; - } - if (insert || index->online_log->same_pk) { ut_ad(!old_pk); old_pk_extra_size = old_pk_size = 0; @@ -1133,23 +1060,6 @@ row_log_table_low( memcpy(b, rec, rec_offs_data_size(offsets)); b += rec_offs_data_size(offsets); - if (ventry && ventry->n_v_fields > 0) { - rec_convert_dtuple_to_temp_v(b, new_index, ventry); - b += mach_read_from_2(b); - - if (o_ventry) { - rec_convert_dtuple_to_temp_v( - b, new_index, o_ventry); - b += mach_read_from_2(b); - } - } else if (index->table->n_v_cols) { - /* The table contains virtual columns, but nothing - has changed for them, so just mark a 2 bytes length - field */ - mach_write_to_2(b, 2); - b += 2; - } - row_log_table_close(index, b, mrec_size, avail_size); } } @@ -1165,15 +1075,10 @@ row_log_table_update( dict_index_t* index, /*!< in/out: clustered index, S-latched or X-latched */ const ulint* offsets,/*!< in: rec_get_offsets(rec,index) */ - const dtuple_t* old_pk, /*!< in: row_log_table_get_pk() + const dtuple_t* old_pk) /*!< in: row_log_table_get_pk() before the update */ - const dtuple_t* new_v_row,/*!< in: dtuple contains the new virtual - columns */ - const dtuple_t* old_v_row)/*!< in: dtuple contains the old virtual - columns */ { - row_log_table_low(rec, new_v_row, old_v_row, index, offsets, - false, old_pk); + row_log_table_low(rec, index, offsets, false, old_pk); } /** Gets the old table column of a PRIMARY KEY column. @@ -1477,12 +1382,11 @@ row_log_table_insert( /*=================*/ const rec_t* rec, /*!< in: clustered index leaf page record, page X-latched */ - const dtuple_t* ventry, /*!< in: dtuple holding virtual column info */ dict_index_t* index, /*!< in/out: clustered index, S-latched or X-latched */ const ulint* offsets)/*!< in: rec_get_offsets(rec,index) */ { - row_log_table_low(rec, ventry, NULL, index, offsets, true, NULL); + row_log_table_low(rec, index, offsets, true, NULL); } /******************************************************//** @@ -1579,7 +1483,6 @@ row_log_table_apply_convert_mrec( reason of failure */ { dtuple_t* row; - ulint num_v = dict_table_get_n_v_cols(log->table); *error = DB_SUCCESS; @@ -1593,8 +1496,7 @@ row_log_table_apply_convert_mrec( dfield_get_type(dtuple_get_nth_field(row, i))); } } else { - row = dtuple_create_with_vcol( - heap, dict_table_get_n_cols(log->table), num_v); + row = dtuple_create(heap, dict_table_get_n_cols(log->table)); dict_table_copy_types(row, log->table); } @@ -1719,14 +1621,6 @@ blob_done: dfield_get_type(dfield))); } - /* read the virtual column data if any */ - if (num_v) { - byte* b = const_cast<byte*>(mrec) - + rec_offs_data_size(offsets); - trx_undo_read_v_cols(log->table, b, row, false, - &(log->col_map[log->n_old_col])); - } - return(row); } @@ -1867,8 +1761,6 @@ row_log_table_apply_delete_low( /*===========================*/ btr_pcur_t* pcur, /*!< in/out: B-tree cursor, will be trashed */ - const dtuple_t* ventry, /*!< in: dtuple holding - virtual column info */ const ulint* offsets, /*!< in: offsets on pcur */ const row_ext_t* save_ext, /*!< in: saved external field info, or NULL */ @@ -1894,9 +1786,6 @@ row_log_table_apply_delete_low( ROW_COPY_DATA, index, btr_pcur_get_rec(pcur), offsets, NULL, NULL, NULL, save_ext ? NULL : &ext, heap); - if (ventry) { - dtuple_copy_v_fields(row, ventry); - } if (!save_ext) { save_ext = ext; @@ -1988,20 +1877,15 @@ row_log_table_apply_delete( mtr_t mtr; btr_pcur_t pcur; ulint* offsets; - ulint num_v = new_table->n_v_cols; ut_ad(rec_offs_n_fields(moffsets) == dict_index_get_n_unique(index) + 2); ut_ad(!rec_offs_any_extern(moffsets)); /* Convert the row to a search tuple. */ - old_pk = dtuple_create_with_vcol(heap, index->n_uniq, num_v); + old_pk = dtuple_create(heap, index->n_uniq); dict_index_copy_types(old_pk, index, index->n_uniq); - if (num_v) { - dict_table_copy_v_types(old_pk, index->table); - } - for (ulint i = 0; i < index->n_uniq; i++) { ulint len; const void* field; @@ -2089,14 +1973,7 @@ all_done: } } - if (num_v) { - byte* b = (byte*)mrec + rec_offs_data_size(moffsets) - + ext_size; - trx_undo_read_v_cols(log->table, b, old_pk, false, - &(log->col_map[log->n_old_col])); - } - - return(row_log_table_apply_delete_low(&pcur, old_pk, + return(row_log_table_apply_delete_low(&pcur, offsets, save_ext, heap, &mtr)); } @@ -2309,13 +2186,12 @@ func_exit_committed: /* Some BLOBs are missing, so we are interpreting this ROW_T_UPDATE as ROW_T_DELETE (see *1). */ error = row_log_table_apply_delete_low( - &pcur, old_pk, cur_offsets, NULL, heap, &mtr); + &pcur, cur_offsets, NULL, heap, &mtr); goto func_exit_committed; } - /** It allows to create tuple with virtual column information. */ dtuple_t* entry = row_build_index_entry_low( - row, NULL, index, heap, ROW_BUILD_FOR_INSERT); + row, NULL, index, heap, ROW_BUILD_NORMAL); upd_t* update = row_upd_build_difference_binary( index, entry, btr_pcur_get_rec(&pcur), cur_offsets, false, NULL, heap, dup->table); @@ -2348,7 +2224,7 @@ func_exit_committed: } error = row_log_table_apply_delete_low( - &pcur, old_pk, cur_offsets, NULL, heap, &mtr); + &pcur, cur_offsets, NULL, heap, &mtr); ut_ad(mtr.has_committed()); if (error == DB_SUCCESS) { @@ -2543,13 +2419,6 @@ row_log_table_apply_op( next_mrec = mrec + rec_offs_data_size(offsets); - if (log->table->n_v_cols) { - if (next_mrec + 2 > mrec_end) { - return(NULL); - } - next_mrec += mach_read_from_2(next_mrec); - } - if (next_mrec > mrec_end) { return(NULL); } else { @@ -2581,13 +2450,6 @@ row_log_table_apply_op( rec_offs_set_n_fields(offsets, new_index->n_uniq + 2); rec_init_offsets_temp(mrec, new_index, offsets); next_mrec = mrec + rec_offs_data_size(offsets) + ext_size; - if (log->table->n_v_cols) { - if (next_mrec + 2 > mrec_end) { - return(NULL); - } - - next_mrec += mach_read_from_2(next_mrec); - } if (next_mrec > mrec_end) { return(NULL); @@ -2632,7 +2494,6 @@ row_log_table_apply_op( definition of the columns belonging to PRIMARY KEY is not changed, the log will only contain DB_TRX_ID,new_row. */ - ulint num_v = new_index->table->n_v_cols; if (dup->index->online_log->same_pk) { ut_ad(new_index->n_uniq == dup->index->n_uniq); @@ -2667,14 +2528,9 @@ row_log_table_apply_op( return(NULL); } - old_pk = dtuple_create_with_vcol( - heap, new_index->n_uniq, num_v); + old_pk = dtuple_create(heap, new_index->n_uniq); dict_index_copy_types( old_pk, new_index, old_pk->n_fields); - if (num_v) { - dict_table_copy_v_types( - old_pk, new_index->table); - } /* Copy the PRIMARY KEY fields from mrec to old_pk. */ for (ulint i = 0; i < new_index->n_uniq; i++) { @@ -2715,16 +2571,10 @@ row_log_table_apply_op( /* Copy the PRIMARY KEY fields and DB_TRX_ID, DB_ROLL_PTR from mrec to old_pk. */ - old_pk = dtuple_create_with_vcol( - heap, new_index->n_uniq + 2, num_v); + old_pk = dtuple_create(heap, new_index->n_uniq + 2); dict_index_copy_types(old_pk, new_index, old_pk->n_fields); - if (num_v) { - dict_table_copy_v_types( - old_pk, new_index->table); - } - for (ulint i = 0; i < dict_index_get_n_unique(new_index) + 2; i++) { @@ -2777,31 +2627,6 @@ row_log_table_apply_op( } } - /* Read virtual column info from log */ - if (num_v) { - ulint o_v_size = 0; - ulint n_v_size = 0; - n_v_size = mach_read_from_2(next_mrec); - next_mrec += n_v_size; - if (next_mrec > mrec_end) { - return(NULL); - } - - /* if there is more than 2 bytes length info */ - if (n_v_size > 2) { - trx_undo_read_v_cols( - log->table, const_cast<byte*>( - next_mrec), old_pk, false, - &(log->col_map[log->n_old_col])); - o_v_size = mach_read_from_2(next_mrec); - } - - next_mrec += o_v_size; - if (next_mrec > mrec_end) { - return(NULL); - } - } - ut_ad(next_mrec <= mrec_end); log->head.total += next_mrec - mrec_start; dtuple_set_n_fields_cmp(old_pk, new_index->n_uniq); @@ -3344,8 +3169,6 @@ row_log_allocate( log->head.blocks = log->head.bytes = 0; log->head.total = 0; log->path = path; - log->n_old_col = index->table->n_cols; - log->n_old_vcol = index->table->n_v_cols; dict_index_set_online_status(index, ONLINE_INDEX_CREATION); index->online_log = log; diff --git a/storage/innobase/row/row0mysql.cc b/storage/innobase/row/row0mysql.cc index 3f7c500c7f5..c729e5b95f4 100644 --- a/storage/innobase/row/row0mysql.cc +++ b/storage/innobase/row/row0mysql.cc @@ -2505,10 +2505,7 @@ err_exit: /* We already have .ibd file here. it should be deleted. */ if (dict_table_is_file_per_table(table) - && fil_delete_tablespace( - table->space, - BUF_REMOVE_FLUSH_NO_WRITE) - != DB_SUCCESS) { + && fil_delete_tablespace(table->space) != DB_SUCCESS) { ib::error() << "Not able to delete tablespace " << table->space << " of table " @@ -3177,9 +3174,6 @@ row_discard_tablespace( 4) FOREIGN KEY operations: if table->n_foreign_key_checks_running > 0, we do not allow the discard. */ - /* Play safe and remove all insert buffer entries, though we should - have removed them already when DISCARD TABLESPACE was called */ - ibuf_delete_for_discarded_space(table->space); table_id_t new_id; @@ -3544,8 +3538,7 @@ row_drop_single_table_tablespace( ib::info() << "Removed datafile " << filepath << " for table " << tablename; - } else if (fil_delete_tablespace(space_id, BUF_REMOVE_FLUSH_NO_WRITE) - != DB_SUCCESS) { + } else if (fil_delete_tablespace(space_id) != DB_SUCCESS) { ib::error() << "We removed the InnoDB internal data" " dictionary entry of table " << tablename diff --git a/storage/innobase/row/row0quiesce.cc b/storage/innobase/row/row0quiesce.cc index 54583956107..ccf58b9e73f 100644 --- a/storage/innobase/row/row0quiesce.cc +++ b/storage/innobase/row/row0quiesce.cc @@ -1,6 +1,7 @@ /***************************************************************************** Copyright (c) 2012, 2016, Oracle and/or its affiliates. All Rights Reserved. +Copyright (c) 2017, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -536,8 +537,7 @@ row_quiesce_table_start( } if (!trx_is_interrupted(trx)) { - buf_LRU_flush_or_remove_pages( - table->space, BUF_REMOVE_FLUSH_WRITE, trx); + buf_LRU_flush_or_remove_pages(table->space, trx); if (trx_is_interrupted(trx)) { diff --git a/storage/innobase/row/row0uins.cc b/storage/innobase/row/row0uins.cc index 6628007909e..58707fb21c5 100644 --- a/storage/innobase/row/row0uins.cc +++ b/storage/innobase/row/row0uins.cc @@ -117,7 +117,7 @@ row_undo_ins_remove_clust_rec( mem_heap_t* heap = NULL; const ulint* offsets = rec_get_offsets( rec, index, NULL, true, ULINT_UNDEFINED, &heap); - row_log_table_delete(rec, node->row, index, offsets, NULL); + row_log_table_delete(rec, index, offsets, NULL); mem_heap_free(heap); } @@ -457,7 +457,7 @@ close_table: } if (node->table->n_v_cols) { trx_undo_read_v_cols(node->table, ptr, - node->row, false, NULL); + node->row, false); } } else { diff --git a/storage/innobase/row/row0umod.cc b/storage/innobase/row/row0umod.cc index ecf6b76a593..0b1d800212f 100644 --- a/storage/innobase/row/row0umod.cc +++ b/storage/innobase/row/row0umod.cc @@ -334,18 +334,16 @@ row_undo_mod_clust( switch (node->rec_type) { case TRX_UNDO_DEL_MARK_REC: row_log_table_insert( - btr_pcur_get_rec(pcur), node->row, - index, offsets); + btr_pcur_get_rec(pcur), index, offsets); break; case TRX_UNDO_UPD_EXIST_REC: row_log_table_update( btr_pcur_get_rec(pcur), index, offsets, - rebuilt_old_pk, node->undo_row, node->row); + rebuilt_old_pk); break; case TRX_UNDO_UPD_DEL_REC: row_log_table_delete( - btr_pcur_get_rec(pcur), node->row, - index, offsets, sys); + btr_pcur_get_rec(pcur), index, offsets, sys); break; default: ut_ad(0); diff --git a/storage/innobase/row/row0upd.cc b/storage/innobase/row/row0upd.cc index 26ee2849be3..8e59fe7f113 100644 --- a/storage/innobase/row/row0upd.cc +++ b/storage/innobase/row/row0upd.cc @@ -2914,18 +2914,9 @@ row_upd_clust_rec( if (err == DB_SUCCESS) { success: if (dict_index_is_online_ddl(index)) { - dtuple_t* new_v_row = NULL; - dtuple_t* old_v_row = NULL; - - if (!(node->cmpl_info & UPD_NODE_NO_ORD_CHANGE)) { - new_v_row = node->upd_row; - old_v_row = node->update->old_vrow; - } - row_log_table_update( btr_cur_get_rec(btr_cur), - index, offsets, rebuilt_old_pk, new_v_row, - old_v_row); + index, offsets, rebuilt_old_pk); } } diff --git a/storage/innobase/srv/srv0start.cc b/storage/innobase/srv/srv0start.cc index 25a5a964375..988ddf1a759 100644 --- a/storage/innobase/srv/srv0start.cc +++ b/storage/innobase/srv/srv0start.cc @@ -1097,21 +1097,22 @@ srv_undo_tablespaces_init(bool create_new_db) mtr_commit(&mtr); /* Step-2: Flush the dirty pages from the buffer pool. */ + trx_t* trx = trx_allocate_for_background(); + for (undo::undo_spaces_t::const_iterator it = undo::Truncate::s_fix_up_spaces.begin(); it != undo::Truncate::s_fix_up_spaces.end(); ++it) { - buf_LRU_flush_or_remove_pages( - TRX_SYS_SPACE, BUF_REMOVE_FLUSH_WRITE, NULL); + buf_LRU_flush_or_remove_pages(TRX_SYS_SPACE, trx); - buf_LRU_flush_or_remove_pages( - *it, BUF_REMOVE_FLUSH_WRITE, NULL); + buf_LRU_flush_or_remove_pages(*it, trx); /* Remove the truncate redo log file. */ undo::Truncate undo_trunc; undo_trunc.done_logging(*it); } + trx_free_for_background(trx); } return(DB_SUCCESS); diff --git a/storage/innobase/trx/trx0rec.cc b/storage/innobase/trx/trx0rec.cc index 50a321ea68b..7f9476832ba 100644 --- a/storage/innobase/trx/trx0rec.cc +++ b/storage/innobase/trx/trx0rec.cc @@ -2366,7 +2366,7 @@ trx_undo_prev_version_build( ut_ad(index->table->n_v_cols); trx_undo_read_v_cols(index->table, ptr, *vrow, - v_status & TRX_UNDO_PREV_IN_PURGE, NULL); + v_status & TRX_UNDO_PREV_IN_PURGE); } return(true); @@ -2375,16 +2375,14 @@ trx_undo_prev_version_build( /** Read virtual column value from undo log @param[in] table the table @param[in] ptr undo log pointer -@param[in,out] row the row struct to fill -@param[in] in_purge called by purge thread -@param[in] col_map online rebuild column map */ +@param[in,out] row the dtuple to fill +@param[in] in_purge whether this is called by purge */ void trx_undo_read_v_cols( const dict_table_t* table, const byte* ptr, const dtuple_t* row, - bool in_purge, - const ulint* col_map) + bool in_purge) { const byte* end_ptr; bool first_v_col = true; @@ -2424,21 +2422,10 @@ trx_undo_read_v_cols( } if (is_virtual) { - ulint col_no; dict_v_col_t* vcol = dict_table_get_nth_v_col( table, field_no); - if (!col_map) { - col_no = vcol->v_pos; - } else { - col_no = col_map[vcol->v_pos]; - } - - if (col_no == ULINT_UNDEFINED) { - continue; - } - - dfield = dtuple_get_nth_v_field(row, col_no); + dfield = dtuple_get_nth_v_field(row, vcol->v_pos); if (!in_purge || dfield_get_type(dfield)->mtype == DATA_MISSING) { diff --git a/storage/maria/ma_open.c b/storage/maria/ma_open.c index 5a0c81d3e3e..2092e024e28 100644 --- a/storage/maria/ma_open.c +++ b/storage/maria/ma_open.c @@ -274,7 +274,7 @@ MARIA_HA *maria_open(const char *name, int mode, uint open_flags) { int kfile,open_mode,save_errno; uint i,j,len,errpos,head_length,base_pos,keys, realpath_err, - key_parts,unique_key_parts,fulltext_keys,uniques; + key_parts,base_key_parts,unique_key_parts,fulltext_keys,uniques; uint internal_table= MY_TEST(open_flags & HA_OPEN_INTERNAL_TABLE); uint file_version; size_t info_length; @@ -404,21 +404,11 @@ MARIA_HA *maria_open(const char *name, int mode, uint open_flags) Allocate space for header information and for data that is too big to keep on stack */ - if (!my_multi_malloc(MY_WME, - &disk_cache, info_length+128, - &rec_per_key_part, - (sizeof(*rec_per_key_part) * HA_MAX_POSSIBLE_KEY * - HA_MAX_KEY_SEG), - &nulls_per_key_part, - (sizeof(*nulls_per_key_part) * HA_MAX_POSSIBLE_KEY * - HA_MAX_KEY_SEG), - NullS)) + if (!(disk_cache= my_malloc(info_length+128, MYF(MY_WME)))) { my_errno=ENOMEM; goto err; } - share_buff.state.rec_per_key_part= rec_per_key_part; - share_buff.state.nulls_per_key_part= nulls_per_key_part; end_pos=disk_cache+info_length; errpos= 3; @@ -431,7 +421,7 @@ MARIA_HA *maria_open(const char *name, int mode, uint open_flags) keys= (uint) share->state.header.keys; uniques= (uint) share->state.header.uniques; fulltext_keys= (uint) share->state.header.fulltext_keys; - key_parts= mi_uint2korr(share->state.header.key_parts); + base_key_parts= key_parts= mi_uint2korr(share->state.header.key_parts); unique_key_parts= mi_uint2korr(share->state.header.unique_key_parts); if (len != MARIA_STATE_INFO_SIZE) { @@ -441,7 +431,8 @@ MARIA_HA *maria_open(const char *name, int mode, uint open_flags) } share->state_diff_length=len-MARIA_STATE_INFO_SIZE; - _ma_state_info_read(disk_cache, &share->state); + if (!_ma_state_info_read(disk_cache, &share->state)) + goto err; len= mi_uint2korr(share->state.header.base_info_length); if (len != MARIA_BASE_INFO_SIZE) { @@ -582,9 +573,9 @@ MARIA_HA *maria_open(const char *name, int mode, uint open_flags) share->open_file_name.length= strlen(name); if (!my_multi_malloc(MY_WME, &share,sizeof(*share), - &share->state.rec_per_key_part, + &rec_per_key_part, sizeof(double) * key_parts, - &share->state.nulls_per_key_part, + &nulls_per_key_part, sizeof(long)* key_parts, &share->keyinfo,keys*sizeof(MARIA_KEYDEF), &share->uniqueinfo,uniques*sizeof(MARIA_UNIQUEDEF), @@ -609,11 +600,16 @@ MARIA_HA *maria_open(const char *name, int mode, uint open_flags) goto err; errpos= 4; - *share=share_buff; - memcpy((char*) share->state.rec_per_key_part, - (char*) rec_per_key_part, sizeof(double)*key_parts); - memcpy((char*) share->state.nulls_per_key_part, - (char*) nulls_per_key_part, sizeof(long)*key_parts); + *share= share_buff; + share->state.rec_per_key_part= rec_per_key_part; + share->state.nulls_per_key_part= nulls_per_key_part; + + memcpy((char*) rec_per_key_part, + (char*) share_buff.state.rec_per_key_part, + sizeof(double)*base_key_parts); + memcpy((char*) nulls_per_key_part, + (char*) share_buff.state.nulls_per_key_part, + sizeof(long)*base_key_parts); memcpy((char*) share->state.key_root, (char*) key_root, sizeof(my_off_t)*keys); strmov(share->unique_file_name.str, name_buff); @@ -911,6 +907,10 @@ MARIA_HA *maria_open(const char *name, int mode, uint open_flags) (keys ? MARIA_INDEX_BLOCK_MARGIN * share->block_size * keys : 0)); my_free(disk_cache); + my_free(share_buff.state.rec_per_key_part); + disk_cache= 0; + share_buff.state.rec_per_key_part= 0; + _ma_setup_functions(share); max_data_file_length= share->base.max_data_file_length; if ((*share->once_init)(share, info.dfile.file)) @@ -1092,6 +1092,7 @@ err: /* fall through */ case 3: my_free(disk_cache); + my_free(share_buff.state.rec_per_key_part); /* fall through */ case 1: mysql_file_close(kfile,MYF(0)); @@ -1507,6 +1508,16 @@ static uchar *_ma_state_info_read(uchar *ptr, MARIA_STATE_INFO *state) keys= (uint) state->header.keys; key_parts= mi_uint2korr(state->header.key_parts); + /* Allocate memory for key parts if not already done */ + if (!state->rec_per_key_part && + !my_multi_malloc(MY_WME, + &state->rec_per_key_part, + sizeof(*state->rec_per_key_part) * key_parts, + &state->nulls_per_key_part, + sizeof(*state->nulls_per_key_part) * key_parts, + NullS)) + DBUG_RETURN(0); + state->open_count = mi_uint2korr(ptr); ptr+= 2; state->changed= mi_uint2korr(ptr); ptr+= 2; state->create_rename_lsn= lsn_korr(ptr); ptr+= LSN_STORE_SIZE; diff --git a/storage/perfschema/pfs_autosize.cc b/storage/perfschema/pfs_autosize.cc index 6f267cb4599..fd428cd6004 100644 --- a/storage/perfschema/pfs_autosize.cc +++ b/storage/perfschema/pfs_autosize.cc @@ -124,7 +124,7 @@ PFS_sizing_data small_data= /* Account / user / host */ 10, 5, 20, /* History sizes */ - 5, 100, 5, 100, 5, 100, + 10, 100, 10, 100, 10, 100, /* Digests */ 1000, /* Session connect attrs. */ @@ -140,7 +140,7 @@ PFS_sizing_data medium_data= /* Account / user / host */ 100, 100, 100, /* History sizes */ - 10, 1000, 10, 1000, 10, 1000, + 20, 1000, 20, 1000, 20, 1000, /* Digests */ 5000, /* Session connect attrs. */ @@ -156,7 +156,7 @@ PFS_sizing_data large_data= /* Account / user / host */ 100, 100, 100, /* History sizes */ - 10, 10000, 10, 10000, 10, 10000, + 20, 10000, 20, 10000, 20, 10000, /* Digests */ 10000, /* Session connect attrs. */ diff --git a/storage/perfschema/pfs_server.cc b/storage/perfschema/pfs_server.cc index 7577154515d..ee965c0e7da 100644 --- a/storage/perfschema/pfs_server.cc +++ b/storage/perfschema/pfs_server.cc @@ -67,8 +67,10 @@ initialize_performance_schema(PFS_global_param *param) The performance schema is disabled in the startup command line. All the instrumentation is turned off. */ + pfs_enabled= 0; return NULL; } + pfs_enabled= TRUE; init_timers(); diff --git a/storage/perfschema/pfs_server.h b/storage/perfschema/pfs_server.h index bc0c69e86b9..dd092713d8e 100644 --- a/storage/perfschema/pfs_server.h +++ b/storage/perfschema/pfs_server.h @@ -49,7 +49,7 @@ #define PFS_MAX_SETUP_OBJECT 100 #endif #ifndef PFS_MAX_STAGE_CLASS - #define PFS_MAX_STAGE_CLASS 150 + #define PFS_MAX_STAGE_CLASS 160 #endif #ifndef PFS_STATEMENTS_STACK_SIZE #define PFS_STATEMENTS_STACK_SIZE 10 diff --git a/storage/rocksdb/mysql-test/rocksdb/r/bulk_load_rev_data.result b/storage/rocksdb/mysql-test/rocksdb/r/bulk_load_rev_data.result index d2d3befdf04..e566691af28 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/bulk_load_rev_data.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/bulk_load_rev_data.result @@ -21,6 +21,7 @@ b CHAR(30), PRIMARY KEY(pk) COMMENT "cf1", KEY(a) ) COLLATE 'latin1_bin' PARTITION BY KEY() PARTITIONS 4; +connect other,localhost,root,,; set session transaction isolation level repeatable read; select * from information_schema.rocksdb_dbstats where stat_type='DB_NUM_SNAPSHOTS'; STAT_TYPE VALUE @@ -29,6 +30,7 @@ start transaction with consistent snapshot; select * from information_schema.rocksdb_dbstats where stat_type='DB_NUM_SNAPSHOTS'; STAT_TYPE VALUE DB_NUM_SNAPSHOTS 1 +connection default; set rocksdb_bulk_load=1; set rocksdb_bulk_load_size=100000; LOAD DATA INFILE <input_file> INTO TABLE t1; @@ -79,4 +81,5 @@ count(b) 5000000 longfilenamethatvalidatesthatthiswillgetdeleted.bulk_load.tmp test.bulk_load.tmp +disconnect other; DROP TABLE t1, t2, t3; diff --git a/storage/rocksdb/mysql-test/rocksdb/r/read_only_tx.result b/storage/rocksdb/mysql-test/rocksdb/r/read_only_tx.result index b83f0a474cc..db21c3c01d4 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/read_only_tx.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/read_only_tx.result @@ -1,11 +1,14 @@ DROP TABLE IF EXISTS t1; +connect con1,localhost,root,,; +connect con2,localhost,root,,; +connection con1; CREATE TABLE t1 (id INT, value int, PRIMARY KEY (id), INDEX (value)) ENGINE=RocksDB; INSERT INTO t1 VALUES (1,1); select variable_value into @p from information_schema.global_status where variable_name='rocksdb_number_sst_entry_put'; select variable_value into @s from information_schema.global_status where variable_name='rocksdb_number_sst_entry_singledelete'; -START TRANSACTION WITH CONSISTENT ROCKSDB SNAPSHOT; -File Position Gtid_executed -master-bin.000001 734 uuid:1-3 +START TRANSACTION WITH CONSISTENT SNAPSHOT; +connection con2; +connection con1; select case when variable_value-@p < 1000 then 'true' else variable_value-@p end from information_schema.global_status where variable_name='rocksdb_number_sst_entry_put'; case when variable_value-@p < 1000 then 'true' else variable_value-@p end true @@ -27,10 +30,15 @@ id value 1 10001 2 2 BEGIN; +connection con2; +connection con1; SELECT COUNT(*) FROM t1; COUNT(*) 9998 COMMIT; +connection default; +disconnect con1; +disconnect con2; OPTIMIZE TABLE t1; Table Op Msg_type Msg_text test.t1 optimize status OK diff --git a/storage/rocksdb/mysql-test/rocksdb/t/add_index_inplace_crash.test b/storage/rocksdb/mysql-test/rocksdb/t/add_index_inplace_crash.test index 84fe0046e7b..d715eb7df7a 100644 --- a/storage/rocksdb/mysql-test/rocksdb/t/add_index_inplace_crash.test +++ b/storage/rocksdb/mysql-test/rocksdb/t/add_index_inplace_crash.test @@ -105,3 +105,13 @@ SHOW CREATE TABLE t1; SELECT COUNT(*) FROM t1; DROP TABLE t1; + +# Cleanup temporary #sql files. In the future server will remove these +# automatically but for now we need to do the delete explicit + +--disable_query_log +--disable_result_log +let $datadir=`select @@datadir`; +--remove_files_wildcard $datadir/test #sql* +--enable_result_log +--enable_query_log diff --git a/storage/rocksdb/mysql-test/rocksdb/t/disabled.def b/storage/rocksdb/mysql-test/rocksdb/t/disabled.def index 3af1d99ff22..118d8598de3 100644 --- a/storage/rocksdb/mysql-test/rocksdb/t/disabled.def +++ b/storage/rocksdb/mysql-test/rocksdb/t/disabled.def @@ -67,6 +67,8 @@ lock_wait_timeout_stats: MDEV-13404 compact_deletes: MDEV-12663 : rocksdb.compact_deletes times out and causes other tests to fail blind_delete_without_tx_api: MDEV-12286: rocksdb.blind_delete_without_tx_api test fails +unique_check: wrong error number +autoinc_vars_thread: debug sync point wait timed out # Enabling these didn't seem to cause any trouble: # autoinc_vars_thread : MDEV-12474 Regularly fails on buildbot @@ -80,7 +82,5 @@ blind_delete_without_tx_api: MDEV-12286: rocksdb.blind_delete_without_tx_api tes ## information_schema : MariaRocks: requires GTIDs mysqlbinlog_gtid_skip_empty_trans_rocksdb : MariaRocks: requires GTIDs -read_only_tx : MariaRocks: requires GTIDs +#read_only_tx : MariaRocks: requires GTIDs rpl_row_triggers : MariaRocks: requires GTIDs - - diff --git a/storage/rocksdb/mysql-test/rocksdb/t/read_only_tx-master.opt b/storage/rocksdb/mysql-test/rocksdb/t/read_only_tx-master.opt index 52f4895dc2f..221b35c672a 100644 --- a/storage/rocksdb/mysql-test/rocksdb/t/read_only_tx-master.opt +++ b/storage/rocksdb/mysql-test/rocksdb/t/read_only_tx-master.opt @@ -1 +1 @@ ---rocksdb_default_cf_options=write_buffer_size=16k --log-bin --binlog_format=row --gtid_mode=ON --enforce_gtid_consistency --log-slave-updates +--rocksdb_default_cf_options=write_buffer_size=16k --log-bin --binlog_format=row --log-slave-updates diff --git a/storage/rocksdb/mysql-test/rocksdb/t/read_only_tx.test b/storage/rocksdb/mysql-test/rocksdb/t/read_only_tx.test index 52f65095d33..3a1025a3623 100644 --- a/storage/rocksdb/mysql-test/rocksdb/t/read_only_tx.test +++ b/storage/rocksdb/mysql-test/rocksdb/t/read_only_tx.test @@ -2,9 +2,9 @@ --source include/have_rocksdb.inc --source include/count_sessions.inc --disable_warnings ---source include/have_gtid.inc +#--source include/have_gtid.inc --enable_warnings --- let $uuid = `select @@server_uuid;` +#-- let $uuid = `select @@server_uuid;` --disable_warnings DROP TABLE IF EXISTS t1; @@ -20,8 +20,8 @@ INSERT INTO t1 VALUES (1,1); # Read-only, long-running transaction. SingleDelete/Put shouldn't increase much. select variable_value into @p from information_schema.global_status where variable_name='rocksdb_number_sst_entry_put'; select variable_value into @s from information_schema.global_status where variable_name='rocksdb_number_sst_entry_singledelete'; --- replace_result $uuid uuid -START TRANSACTION WITH CONSISTENT ROCKSDB SNAPSHOT; +#-- replace_result $uuid uuid +START TRANSACTION WITH CONSISTENT SNAPSHOT; connection con2; --disable_query_log diff --git a/storage/tokudb/mysql-test/tokudb_bugs/r/checkpoint_lock.result b/storage/tokudb/mysql-test/tokudb_bugs/r/checkpoint_lock.result index dff746fa280..1a09412ea08 100644 --- a/storage/tokudb/mysql-test/tokudb_bugs/r/checkpoint_lock.result +++ b/storage/tokudb/mysql-test/tokudb_bugs/r/checkpoint_lock.result @@ -17,7 +17,7 @@ flush logs;; connection conn1; select DB, command, state, info from information_schema.processlist where id != connection_id(); DB command state info -test Query init flush logs +test Query Init flush logs set tokudb_checkpoint_lock=0; connection default; disconnect conn1; |