diff options
433 files changed, 15996 insertions, 12457 deletions
diff --git a/.travis.yml b/.travis.yml index 2541cc2c4d1..f1ffdbb5dfc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ language: cpp os: - linux - osx -osx_image: xcode8.3 +osx_image: xcode9.1 compiler: - gcc - clang 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/client/mysql_upgrade.c b/client/mysql_upgrade.c index a6215d0a977..771fb947e73 100644 --- a/client/mysql_upgrade.c +++ b/client/mysql_upgrade.c @@ -965,8 +965,9 @@ static int install_used_engines(void) { char buf[512]; DYNAMIC_STRING ds_result; - const char *query = "SELECT DISTINCT LOWER(engine) FROM information_schema.tables" - " WHERE table_comment LIKE 'Unknown storage engine%'"; + const char *query = "SELECT DISTINCT LOWER(engine) AS c1 FROM information_schema.tables" + " WHERE table_comment LIKE 'Unknown storage engine%'" + " ORDER BY c1"; if (opt_systables_only || !from_before_10_1()) { 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/include/source_revision.h.in b/include/source_revision.h.in index 5b657d0940e..991df992e2f 100644 --- a/include/source_revision.h.in +++ b/include/source_revision.h.in @@ -1 +1 @@ -#cmakedefine SOURCE_REVISION "@SOURCE_REVISION@" +#define SOURCE_REVISION "@SOURCE_REVISION@" diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt index ed10262de50..e4c860a5157 100644 --- a/libmysqld/CMakeLists.txt +++ b/libmysqld/CMakeLists.txt @@ -118,6 +118,7 @@ SET(SQL_EMBEDDED_SOURCES emb_qcache.cc libmysqld.c lib_sql.cc ../sql/temporary_tables.cc ../sql/session_tracker.cc ../sql/proxy_protocol.cc + ../sql/sql_tvc.cc ../sql/sql_tvc.h ../sql/item_vers.cc ../sql/vtmd.cc ${GEN_SOURCES} 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/include/mtr_check.sql b/mysql-test/include/mtr_check.sql index 89f9f66ae1d..f2c0b70e192 100644 --- a/mysql-test/include/mtr_check.sql +++ b/mysql-test/include/mtr_check.sql @@ -39,12 +39,14 @@ BEGIN -- Dump all databases, there should be none -- except those that was created during bootstrap - SELECT * FROM INFORMATION_SCHEMA.SCHEMATA; + SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY BINARY SCHEMA_NAME; -- and the mtr_wsrep_notify schema which is populated by the std_data/wsrep_notify.sh script -- and the suite/galera/t/galera_var_notify_cmd.test -- and the wsrep_schema schema that may be created by Galera - SELECT * FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME NOT IN ('mtr_wsrep_notify', 'wsrep_schema'); + SELECT * FROM INFORMATION_SCHEMA.SCHEMATA + WHERE SCHEMA_NAME NOT IN ('mtr_wsrep_notify', 'wsrep_schema') + ORDER BY BINARY SCHEMA_NAME; -- The test database should not contain any tables SELECT table_name AS tables_in_test FROM INFORMATION_SCHEMA.TABLES diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index a3f2d98d18e..12e397c02d7 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -1917,10 +1917,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 { @@ -2210,7 +2210,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". @@ -2541,7 +2541,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 @@ -4397,12 +4397,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/compound.result b/mysql-test/r/compound.result index 49ad567a055..a54faff4562 100644 --- a/mysql-test/r/compound.result +++ b/mysql-test/r/compound.result @@ -112,7 +112,8 @@ select @a| /**/ while (select count(*) from information_schema.tables where table_schema='test') do select concat('drop table ', table_name) into @a -from information_schema.tables where table_schema='test' limit 1; +from information_schema.tables where table_schema='test' + order by table_name limit 1; select @a as 'executing:'; prepare dt from @a; execute dt; diff --git a/mysql-test/r/create.result b/mysql-test/r/create.result index 7459936eabb..239a9dce05a 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/default.result b/mysql-test/r/default.result index a03da4f8df1..3b1912f4a55 100644 --- a/mysql-test/r/default.result +++ b/mysql-test/r/default.result @@ -232,7 +232,7 @@ CREATE TABLE t1 (a INT DEFAULT 10); INSERT INTO t1 VALUES (11); CREATE VIEW v1 AS SELECT a AS a FROM t1; CREATE VIEW v2 AS SELECT DEFAULT(a) AS a FROM t1; -CREATE VIEW v3 AS SELECT VALUES(a) AS a FROM t1; +CREATE VIEW v3 AS SELECT VALUE(a) AS a FROM t1; SELECT * FROM v1; a 11 @@ -546,8 +546,8 @@ CREATE PROCEDURE p1() CREATE TABLE t1 (a INT DEFAULT par); CALL p1; ERROR 42S22: Unknown column 'par' in 'DEFAULT' DROP PROCEDURE p1; -CREATE TABLE t1 (a INT DEFAULT VALUES(a)); -ERROR HY000: Function or expression 'values()' cannot be used in the DEFAULT clause of `a` +CREATE TABLE t1 (a INT DEFAULT VALUE(a)); +ERROR HY000: Function or expression 'value()' cannot be used in the DEFAULT clause of `a` CREATE TABLE t1 (a INT); CREATE TRIGGER tr1 AFTER INSERT ON t1 FOR EACH ROW CREATE TABLE t2 (a INT DEFAULT NEW.a); ERROR HY000: Function or expression 'NEW.a' cannot be used in the DEFAULT clause of `a` 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 bcc171e404d..ba05a2b37d4 100644 --- a/mysql-test/r/errors.result +++ b/mysql-test/r/errors.result @@ -150,17 +150,17 @@ ERROR 22003: BIGINT value is out of range in '-73 * -2465717823867977728' # CREATE TABLE t1 (a INT); CREATE TABLE t2(a INT PRIMARY KEY, b INT); -SELECT '' AS b FROM t1 GROUP BY VALUES(b); +SELECT '' AS b FROM t1 GROUP BY VALUE(b); ERROR 42S22: Unknown column '' in 'VALUES() function' -REPLACE t2(b) SELECT '' AS b FROM t1 GROUP BY VALUES(b); +REPLACE t2(b) SELECT '' AS b FROM t1 GROUP BY VALUE(b); ERROR 42S22: Unknown column '' in 'VALUES() function' -UPDATE t2 SET a=(SELECT '' AS b FROM t1 GROUP BY VALUES(b)); +UPDATE t2 SET a=(SELECT '' AS b FROM t1 GROUP BY VALUE(b)); ERROR 42S22: Unknown column '' in 'VALUES() function' INSERT INTO t2 VALUES (1,0) ON DUPLICATE KEY UPDATE -b=(SELECT '' AS b FROM t1 GROUP BY VALUES(b)); +b=(SELECT '' AS b FROM t1 GROUP BY VALUE(b)); ERROR 42S22: Unknown column '' in 'VALUES() function' INSERT INTO t2(a,b) VALUES (1,0) ON DUPLICATE KEY UPDATE -b=(SELECT VALUES(a)+2 FROM t1); +b=(SELECT VALUE(a)+2 FROM t1); DROP TABLE t1, t2; # # MDEV-492: incorrect error check before sending OK in mysql_update @@ -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/except.result b/mysql-test/r/except.result index fdaa625ea65..594bb7118eb 100644 --- a/mysql-test/r/except.result +++ b/mysql-test/r/except.result @@ -525,3 +525,13 @@ t3 CREATE TABLE `t3` ( `b1` blob DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop tables t1,t2,t3; +# +# MDEV-13723: Server crashes in ha_heap::find_unique_row or +# Assertion `0' failed in st_select_lex_unit::optimize with INTERSECT +# +CREATE TABLE t (i INT); +INSERT INTO t VALUES (1),(2); +SELECT * FROM t WHERE i != ANY ( SELECT 3 EXCEPT SELECT 3 ); +i +drop table t; +# End of 10.3 tests diff --git a/mysql-test/r/func_group_innodb.result b/mysql-test/r/func_group_innodb.result index 52d5922df95..e340c04107d 100644 --- a/mysql-test/r/func_group_innodb.result +++ b/mysql-test/r/func_group_innodb.result @@ -226,7 +226,7 @@ create table y select 1 b; select 1 from y group by b; 1 1 -select 1 from y group by values(b); +select 1 from y group by value(b); 1 1 drop table y; diff --git a/mysql-test/r/func_misc.result b/mysql-test/r/func_misc.result index 299b6344192..982856e980a 100644 --- a/mysql-test/r/func_misc.result +++ b/mysql-test/r/func_misc.result @@ -286,11 +286,11 @@ NAME_CONST('a', -(1)) OR 1 CREATE TABLE t1 (a INT, b INT) ENGINE=MyISAM; INSERT INTO t1 VALUES (1,10); CREATE VIEW v1 AS SELECT * FROM t1; -EXPLAIN EXTENDED SELECT VALUES(b) FROM v1; +EXPLAIN EXTENDED SELECT VALUE(b) FROM v1; id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE t1 system NULL NULL NULL NULL 1 100.00 Warnings: -Note 1003 select values(10) AS `VALUES(b)` from dual +Note 1003 select value(10) AS `VALUE(b)` from dual drop view v1; drop table t1; End of 5.3 tests @@ -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/group_by_null.result b/mysql-test/r/group_by_null.result index 01053514cb0..1ae090fdc63 100644 --- a/mysql-test/r/group_by_null.result +++ b/mysql-test/r/group_by_null.result @@ -1,6 +1,6 @@ create table t1 (a int); insert into t1 values (1),(2); -select max('foo') from t1 group by values(a), extractvalue('bar','qux') order by "v"; +select max('foo') from t1 group by value(a), extractvalue('bar','qux') order by "v"; max('foo') foo drop table t1; 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/information_schema.result b/mysql-test/r/information_schema.result index 6f25e264d9e..edc8794c1c5 100644 --- a/mysql-test/r/information_schema.result +++ b/mysql-test/r/information_schema.result @@ -588,8 +588,8 @@ select s1 from t1 where s1 in (select version from information_schema.tables) union select version from information_schema.tables; s1 -11 10 +11 drop table t1; SHOW CREATE TABLE INFORMATION_SCHEMA.character_sets; Table Create Table @@ -773,11 +773,18 @@ table_name v2 v3 select column_name from information_schema.columns -where table_schema='test'; +where table_schema='test' and table_name='t4'; column_name f1 +select column_name from information_schema.columns +where table_schema='test' and table_name='v2'; +column_name Warnings: Warning 1356 View 'test.v2' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them +select column_name from information_schema.columns +where table_schema='test' and table_name='v3'; +column_name +Warnings: Warning 1356 View 'test.v3' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them select index_name from information_schema.statistics where table_schema='test'; index_name @@ -842,7 +849,8 @@ drop view a2, a1; drop table t_crashme; select table_schema,table_name, column_name from information_schema.columns -where data_type = 'longtext' and table_schema != 'performance_schema'; +where data_type = 'longtext' and table_schema != 'performance_schema' +order by binary table_name, ordinal_position; table_schema table_name column_name information_schema ALL_PLUGINS PLUGIN_DESCRIPTION information_schema COLUMNS COLUMN_DEFAULT @@ -863,7 +871,8 @@ information_schema TRIGGERS ACTION_CONDITION information_schema TRIGGERS ACTION_STATEMENT information_schema VIEWS VIEW_DEFINITION select table_name, column_name, data_type from information_schema.columns -where data_type = 'datetime' and table_name not like 'innodb_%'; +where data_type = 'datetime' and table_name not like 'innodb_%' +order by binary table_name, ordinal_position; table_name column_name data_type EVENTS EXECUTE_AT datetime EVENTS STARTS datetime @@ -1278,7 +1287,7 @@ sql security definer view v2 as select 1; connect con16681,localhost,mysqltest_1,,test; connection con16681; select * from information_schema.views -where table_name='v1' or table_name='v2'; +where table_name='v1' or table_name='v2' order by table_name; TABLE_CATALOG TABLE_SCHEMA TABLE_NAME VIEW_DEFINITION CHECK_OPTION IS_UPDATABLE DEFINER SECURITY_TYPE CHARACTER_SET_CLIENT COLLATION_CONNECTION ALGORITHM def test v1 NONE YES root@localhost DEFINER latin1 latin1_swedish_ci UNDEFINED def test v2 select 1 AS `1` NONE NO mysqltest_1@localhost DEFINER latin1 latin1_swedish_ci UNDEFINED @@ -1291,7 +1300,7 @@ set @a:= '.'; create table t1(f1 char(5)); create table t2(f1 char(5)); select concat(@a, table_name), @a, table_name -from information_schema.tables where table_schema = 'test'; +from information_schema.tables where table_schema = 'test' order by table_name; concat(@a, table_name) @a table_name .t1 . t1 .t2 . t2 @@ -1378,7 +1387,8 @@ create table t2 (f1 int(11), f2 int(11)); select table_name from information_schema.tables where table_schema = 'test' and table_name not in (select table_name from information_schema.columns -where table_schema = 'test' and column_name = 'f3'); +where table_schema = 'test' and column_name = 'f3') +order by table_name; table_name t1 t2 @@ -1387,7 +1397,7 @@ create table t1(f1 int); create view v1 as select f1+1 as a from t1; create table t2 (f1 int, f2 int); create view v2 as select f1+1 as a, f2 as b from t2; -select table_name, is_updatable from information_schema.views; +select table_name, is_updatable from information_schema.views order by table_name; table_name is_updatable v1 NO v2 YES @@ -1846,12 +1856,12 @@ rename table t2 to t3; connection default; # These statements should not be blocked by pending lock requests select table_name, column_name, data_type from information_schema.columns -where table_schema = 'test' and table_name in ('t1', 't2'); +where table_schema = 'test' and table_name in ('t1', 't2') order by table_name, column_name; table_name column_name data_type t1 i int t2 j int select table_name, auto_increment from information_schema.tables -where table_schema = 'test' and table_name in ('t1', 't2'); +where table_schema = 'test' and table_name in ('t1', 't2') order by table_name; table_name auto_increment t1 NULL t2 1 @@ -2000,7 +2010,7 @@ connect con12828477_2, localhost, root,,mysqltest; # Wait while the above RENAME is blocked. # Issue query to I_S which will open 't0' and get # blocked on 't1' because of RENAME. -select table_name, auto_increment from information_schema.tables where table_schema='mysqltest'; +select table_name, auto_increment from information_schema.tables where table_schema='mysqltest' and table_name='t0' union select table_name, auto_increment from information_schema.tables where table_schema='mysqltest' and table_name<>'t0' order by table_name; connect con12828477_3, localhost, root,,mysqltest; # Wait while the above SELECT is blocked. # diff --git a/mysql-test/r/information_schema2.result b/mysql-test/r/information_schema2.result index 7e9bdd7088f..e23e81b885c 100644 --- a/mysql-test/r/information_schema2.result +++ b/mysql-test/r/information_schema2.result @@ -11,7 +11,7 @@ create table t2 (x int); create table t3 (x int); create table t4 AS select table_name from information_schema.TABLES where table_schema = database() and table_type = 'BASE TABLE' ; delete from t4 where table_name not in (select table_name from information_schema.TABLES where table_schema = database() and table_type = 'BASE TABLE'); -select * from t4; +select * from t4 order by table_name; table_name t1 t2 diff --git a/mysql-test/r/information_schema_db.result b/mysql-test/r/information_schema_db.result index ca1ab45b98b..45ade65c502 100644 --- a/mysql-test/r/information_schema_db.result +++ b/mysql-test/r/information_schema_db.result @@ -72,14 +72,14 @@ create function f2 () returns int return (select max(i) from t2); create view v2 as select f2(); drop table t2; select table_name, table_type, table_comment from information_schema.tables -where table_schema='test'; +where table_schema='test' order by table_name; table_name table_type table_comment t1 BASE TABLE v1 VIEW VIEW v2 VIEW VIEW drop table t1; select table_name, table_type, table_comment from information_schema.tables -where table_schema='test'; +where table_schema='test' order by table_name; table_name table_type table_comment v1 VIEW VIEW v2 VIEW VIEW diff --git a/mysql-test/r/information_schema_inno.result b/mysql-test/r/information_schema_inno.result index 7755d112f8e..d952e4372ca 100644 --- a/mysql-test/r/information_schema_inno.result +++ b/mysql-test/r/information_schema_inno.result @@ -10,18 +10,18 @@ TABLE_SCHEMA= "test"; CONSTRAINT_CATALOG CONSTRAINT_SCHEMA CONSTRAINT_NAME TABLE_SCHEMA TABLE_NAME CONSTRAINT_TYPE def test PRIMARY test t1 PRIMARY KEY def test PRIMARY test t2 PRIMARY KEY +def test PRIMARY test t3 PRIMARY KEY def test t2_ibfk_1 test t2 FOREIGN KEY def test t2_ibfk_2 test t2 FOREIGN KEY -def test PRIMARY test t3 PRIMARY KEY def test t3_ibfk_1 test t3 FOREIGN KEY select * from information_schema.KEY_COLUMN_USAGE where TABLE_SCHEMA= "test"; CONSTRAINT_CATALOG CONSTRAINT_SCHEMA CONSTRAINT_NAME TABLE_CATALOG TABLE_SCHEMA TABLE_NAME COLUMN_NAME ORDINAL_POSITION POSITION_IN_UNIQUE_CONSTRAINT REFERENCED_TABLE_SCHEMA REFERENCED_TABLE_NAME REFERENCED_COLUMN_NAME def test PRIMARY def test t1 id 1 NULL NULL NULL NULL def test PRIMARY def test t2 id 1 NULL NULL NULL NULL +def test PRIMARY def test t3 id 1 NULL NULL NULL NULL def test t2_ibfk_1 def test t2 t1_id 1 1 test t1 id def test t2_ibfk_2 def test t2 t1_id 1 1 test t1 id -def test PRIMARY def test t3 id 1 NULL NULL NULL NULL def test t3_ibfk_1 def test t3 id 1 1 test t2 t1_id def test t3_ibfk_1 def test t3 t2_id 2 2 test t2 id drop table t3, t2, t1; @@ -72,11 +72,12 @@ constraint fk_t1_1 foreign key (idtype) references `t-2` (id) use test; select referenced_table_schema, referenced_table_name from information_schema.key_column_usage -where constraint_schema = 'db-1'; +where constraint_schema = 'db-1' +order by referenced_table_schema, referenced_table_name; referenced_table_schema referenced_table_name NULL NULL -db-1 t-2 NULL NULL +db-1 t-2 drop database `db-1`; create table t1(id int primary key) engine = Innodb; create table t2(pid int, foreign key (pid) references t1(id)) engine = Innodb; diff --git a/mysql-test/r/information_schema_part.result b/mysql-test/r/information_schema_part.result index 081631a512f..4c0bb8908da 100644 --- a/mysql-test/r/information_schema_part.result +++ b/mysql-test/r/information_schema_part.result @@ -61,7 +61,7 @@ partition x2 values less than (5) ( subpartition x21 tablespace t1, subpartition x22 tablespace t2) ); -select * from information_schema.partitions where table_schema="test"; +select * from information_schema.partitions where table_schema="test" order by table_name, partition_name; TABLE_CATALOG TABLE_SCHEMA TABLE_NAME PARTITION_NAME SUBPARTITION_NAME PARTITION_ORDINAL_POSITION SUBPARTITION_ORDINAL_POSITION PARTITION_METHOD SUBPARTITION_METHOD PARTITION_EXPRESSION SUBPARTITION_EXPRESSION PARTITION_DESCRIPTION TABLE_ROWS AVG_ROW_LENGTH DATA_LENGTH MAX_DATA_LENGTH INDEX_LENGTH DATA_FREE CREATE_TIME UPDATE_TIME CHECK_TIME CHECKSUM PARTITION_COMMENT NODEGROUP TABLESPACE_NAME def test t1 x1 x11 1 1 RANGE HASH `a` `a` + `b` 1 0 0 0 # 1024 0 # # NULL NULL default t1 def test t1 x1 x12 1 2 RANGE HASH `a` `a` + `b` 1 0 0 0 # 1024 0 # # NULL NULL default t2 diff --git a/mysql-test/r/insert_update.result b/mysql-test/r/insert_update.result index e8e6e16fe5a..68a1003ad85 100644 --- a/mysql-test/r/insert_update.result +++ b/mysql-test/r/insert_update.result @@ -49,23 +49,23 @@ a b c 5 0 30 8 9 60 INSERT t1 VALUES (2,1,11), (7,4,40) ON DUPLICATE KEY UPDATE c=c+VALUES(a); -SELECT *, VALUES(a) FROM t1; -a b c VALUES(a) +SELECT *, VALUE(a) FROM t1; +a b c VALUE(a) 1 2 10 NULL 3 4 127 NULL 5 0 30 NULL 8 9 60 NULL 2 1 11 NULL -explain extended SELECT *, VALUES(a) FROM t1; +explain extended SELECT *, VALUE(a) FROM t1; id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE t1 ALL NULL NULL NULL NULL 5 100.00 Warnings: -Note 1003 select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b`,`test`.`t1`.`c` AS `c`,values(`test`.`t1`.`a`) AS `VALUES(a)` from `test`.`t1` -explain extended select * from t1 where values(a); +Note 1003 select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b`,`test`.`t1`.`c` AS `c`,value(`test`.`t1`.`a`) AS `VALUE(a)` from `test`.`t1` +explain extended select * from t1 where value(a); id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE t1 ALL NULL NULL NULL NULL 5 100.00 Using where Warnings: -Note 1003 select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b`,`test`.`t1`.`c` AS `c` from `test`.`t1` where values(`test`.`t1`.`a`) +Note 1003 select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b`,`test`.`t1`.`c` AS `c` from `test`.`t1` where value(`test`.`t1`.`a`) DROP TABLE t1; create table t1(a int primary key, b int); insert into t1 values(1,1),(2,2),(3,3),(4,4),(5,5); @@ -160,8 +160,8 @@ a b c INSERT t1 SELECT a,b,c FROM t2 WHERE d=2 ON DUPLICATE KEY UPDATE c=c+VALUES(a); ERROR 23000: Column 'c' in field list is ambiguous INSERT t1 SELECT a,b,c FROM t2 WHERE d=2 ON DUPLICATE KEY UPDATE c=t1.c+VALUES(t1.a); -SELECT *, VALUES(a) FROM t1; -a b c VALUES(a) +SELECT *, VALUE(a) FROM t1; +a b c VALUE(a) 1 2 10 NULL 3 4 127 NULL 5 0 30 NULL diff --git a/mysql-test/r/intersect.result b/mysql-test/r/intersect.result index 5dfb7fb6875..7a0301a23e6 100644 --- a/mysql-test/r/intersect.result +++ b/mysql-test/r/intersect.result @@ -689,3 +689,4 @@ View Create View character_set_client collation_connection v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS (select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1`) union select `__3`.`c` AS `c`,`__3`.`d` AS `d` from ((select `test`.`t2`.`c` AS `c`,`test`.`t2`.`d` AS `d` from `test`.`t2`) intersect (select `test`.`t3`.`e` AS `e`,`test`.`t3`.`f` AS `f` from `test`.`t3`)) `__3` union (select 4 AS `4`,4 AS `4`) latin1 latin1_swedish_ci drop view v1; drop tables t1,t2,t3; +# End of 10.3 tests diff --git a/mysql-test/r/mysql_upgrade_noengine.result b/mysql-test/r/mysql_upgrade_noengine.result index 582147d09df..cadd30d3555 100644 --- a/mysql-test/r/mysql_upgrade_noengine.result +++ b/mysql-test/r/mysql_upgrade_noengine.result @@ -2,7 +2,7 @@ install soname 'ha_blackhole'; install soname 'ha_archive'; create table t1 (a int) engine=blackhole; create table t2 (a int) engine=archive; -select table_catalog, table_schema, table_name, table_type, engine, row_format, table_rows, data_length, table_comment from information_schema.tables where table_schema='test'; +select table_catalog, table_schema, table_name, table_type, engine, row_format, table_rows, data_length, table_comment from information_schema.tables where table_schema='test' and table_name='t1'; table_catalog def table_schema test table_name t1 @@ -12,6 +12,7 @@ row_format Fixed table_rows 0 data_length 0 table_comment +select table_catalog, table_schema, table_name, table_type, engine, row_format, table_rows, data_length, table_comment from information_schema.tables where table_schema='test' and table_name='t2'; table_catalog def table_schema test table_name t2 @@ -24,7 +25,7 @@ table_comment flush tables; uninstall plugin blackhole; uninstall plugin archive; -select table_catalog, table_schema, table_name, table_type, engine, row_format, table_rows, data_length, table_comment from information_schema.tables where table_schema='test'; +select table_catalog, table_schema, table_name, table_type, engine, row_format, table_rows, data_length, table_comment from information_schema.tables where table_schema='test' and table_name='t1'; table_catalog def table_schema test table_name t1 @@ -34,6 +35,11 @@ row_format NULL table_rows NULL data_length NULL table_comment Unknown storage engine 'BLACKHOLE' +Warnings: +Level Warning +Code 1286 +Message Unknown storage engine 'BLACKHOLE' +select table_catalog, table_schema, table_name, table_type, engine, row_format, table_rows, data_length, table_comment from information_schema.tables where table_schema='test' and table_name='t2'; table_catalog def table_schema test table_name t2 @@ -46,9 +52,6 @@ table_comment Unknown storage engine 'ARCHIVE' Warnings: Level Warning Code 1286 -Message Unknown storage engine 'BLACKHOLE' -Level Warning -Code 1286 Message Unknown storage engine 'ARCHIVE' Phase 1/7: Checking and upgrading mysql database Processing databases @@ -110,7 +113,7 @@ Error : Unknown storage engine 'ARCHIVE' error : Corrupt Phase 7/7: Running 'FLUSH PRIVILEGES' OK -select table_catalog, table_schema, table_name, table_type, engine, row_format, table_rows, data_length, table_comment from information_schema.tables where table_schema='test'; +select table_catalog, table_schema, table_name, table_type, engine, row_format, table_rows, data_length, table_comment from information_schema.tables where table_schema='test' and table_name='t1'; table_catalog def table_schema test table_name t1 @@ -120,6 +123,11 @@ row_format NULL table_rows NULL data_length NULL table_comment Unknown storage engine 'BLACKHOLE' +Warnings: +Level Warning +Code 1286 +Message Unknown storage engine 'BLACKHOLE' +select table_catalog, table_schema, table_name, table_type, engine, row_format, table_rows, data_length, table_comment from information_schema.tables where table_schema='test' and table_name='t2'; table_catalog def table_schema test table_name t2 @@ -132,9 +140,6 @@ table_comment Unknown storage engine 'ARCHIVE' Warnings: Level Warning Code 1286 -Message Unknown storage engine 'BLACKHOLE' -Level Warning -Code 1286 Message Unknown storage engine 'ARCHIVE' alter table mysql.user drop column default_role, drop column max_statement_time; Phase 1/7: Checking and upgrading mysql database @@ -197,7 +202,7 @@ Error : Unknown storage engine 'ARCHIVE' error : Corrupt Phase 7/7: Running 'FLUSH PRIVILEGES' OK -select table_catalog, table_schema, table_name, table_type, engine, row_format, table_rows, data_length, table_comment from information_schema.tables where table_schema='test'; +select table_catalog, table_schema, table_name, table_type, engine, row_format, table_rows, data_length, table_comment from information_schema.tables where table_schema='test' and table_name='t1'; table_catalog def table_schema test table_name t1 @@ -207,6 +212,11 @@ row_format NULL table_rows NULL data_length NULL table_comment Unknown storage engine 'BLACKHOLE' +Warnings: +Level Warning +Code 1286 +Message Unknown storage engine 'BLACKHOLE' +select table_catalog, table_schema, table_name, table_type, engine, row_format, table_rows, data_length, table_comment from information_schema.tables where table_schema='test' and table_name='t2'; table_catalog def table_schema test table_name t2 @@ -219,9 +229,6 @@ table_comment Unknown storage engine 'ARCHIVE' Warnings: Level Warning Code 1286 -Message Unknown storage engine 'BLACKHOLE' -Level Warning -Code 1286 Message Unknown storage engine 'ARCHIVE' alter table mysql.user drop column default_role, drop column max_statement_time; Phase 1/7: Checking and upgrading mysql database @@ -259,8 +266,8 @@ mysql.vtmd_template OK Upgrading from a version before MariaDB-10.1 Phase 2/7: Installing used storage engines Checking for tables with unknown storage engine -installing plugin for 'blackhole' storage engine installing plugin for 'archive' storage engine +installing plugin for 'blackhole' storage engine Phase 3/7: Fixing views Phase 4/7: Running 'mysql_fix_privilege_tables' Phase 5/7: Fixing table and database names @@ -276,7 +283,7 @@ test.t1 OK test.t2 OK Phase 7/7: Running 'FLUSH PRIVILEGES' OK -select table_catalog, table_schema, table_name, table_type, engine, row_format, table_rows, data_length, table_comment from information_schema.tables where table_schema='test'; +select table_catalog, table_schema, table_name, table_type, engine, row_format, table_rows, data_length, table_comment from information_schema.tables where table_schema='test' and table_name='t1'; table_catalog def table_schema test table_name t1 @@ -286,6 +293,7 @@ row_format Fixed table_rows 0 data_length 0 table_comment +select table_catalog, table_schema, table_name, table_type, engine, row_format, table_rows, data_length, table_comment from information_schema.tables where table_schema='test' and table_name='t2'; table_catalog def table_schema test table_name t2 diff --git a/mysql-test/r/mysqld--help.result b/mysql-test/r/mysqld--help.result index 0037511b741..b5d68d6bee2 100644 --- a/mysql-test/r/mysqld--help.result +++ b/mysql-test/r/mysqld--help.result @@ -334,6 +334,10 @@ The following options may be given as the first argument: Specifies a directory to add to the ignore list when collecting database names from the datadir. Put a blank argument to reset the list accumulated so far. + --in-subquery-conversion-threshold[=#] + The minimum number of scalar elements in the value list + of IN predicate that triggers its conversion to IN + subquery --init-connect=name Command(s) that are executed for each new connection (unless the user has SUPER privilege) --init-file=name Read SQL commands from this file at startup @@ -475,8 +479,9 @@ The following options may be given as the first argument: file.Value can be between 0 and 11. Higher values mean more verbosity --long-query-time=# Log all queries that have taken more than long_query_time - seconds to execute to file. The argument will be treated - as a decimal value with microsecond precision + seconds to execute to the slow query log file. The + argument will be treated as a decimal value with + microsecond precision --low-priority-updates INSERT/DELETE/UPDATE has lower priority than selects --lower-case-table-names[=#] @@ -1354,6 +1359,7 @@ idle-transaction-timeout 0 idle-write-transaction-timeout 0 ignore-builtin-innodb FALSE ignore-db-dirs +in-subquery-conversion-threshold 1000 init-connect init-file (No default value) init-rpl-role MASTER @@ -1490,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/opt_tvc.result b/mysql-test/r/opt_tvc.result new file mode 100644 index 00000000000..3b03bd4ffaf --- /dev/null +++ b/mysql-test/r/opt_tvc.result @@ -0,0 +1,616 @@ +create table t1 (a int, b int); +insert into t1 +values (1,2), (4,6), (9,7), +(1,1), (2,5), (7,8); +create table t2 (a int, b int, c int); +insert into t2 +values (1,2,3), (5,1,2), (4,3,7), +(8,9,0), (10,7,1), (5,5,1); +create table t3 (a int, b varchar(16), index idx(a)); +insert into t3 values +(1, "abc"), (3, "egh"), (8, "axxx"), (10, "abc"), +(2, "ccw"), (8, "wqqe"), (7, "au"), (9, "waa"), +(3, "rass"), (9, "ert"), (9, "lok"), (8, "aww"), +(1, "todd"), (3, "rew"), (8, "aww"), (3, "sw"), +(11, "llk"), (7, "rbw"), (1, "sm"), (2, "jyp"), +(4, "yq"), (5, "pled"), (12, "ligin"), (12, "toww"), +(6, "mxm"), (15, "wanone"), (9, "sunqq"), (2, "abe"); +# optimization is not used +select * from t1 where a in (1,2); +a b +1 2 +1 1 +2 5 +explain extended select * from t1 where a in (1,2); +id select_type table type possible_keys key key_len ref rows filtered Extra +1 SIMPLE t1 ALL NULL NULL NULL NULL 6 100.00 Using where +Warnings: +Note 1003 select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where `test`.`t1`.`a` in (1,2) +# set minimum number of values in VALUEs list when optimization works to 2 +set @@in_subquery_conversion_threshold= 2; +# single IN-predicate in WHERE-part +select * from t1 where a in (1,2); +a b +1 2 +1 1 +2 5 +select * from t1 +where a in +( +select * +from (values (1),(2)) as tvc_0 +); +a b +1 2 +1 1 +2 5 +explain extended select * from t1 where a in (1,2); +id select_type table type possible_keys key key_len ref rows filtered Extra +1 PRIMARY <subquery2> ALL distinct_key NULL NULL NULL 2 100.00 +1 PRIMARY t1 ALL NULL NULL NULL NULL 6 100.00 Using where; Using join buffer (flat, BNL join) +2 MATERIALIZED <derived3> ALL NULL NULL NULL NULL 2 100.00 +3 DERIVED NULL NULL NULL NULL NULL NULL NULL NULL No tables used +Warnings: +Note 1003 /* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` semi join ((values (1),(2)) `tvc_0`) where `test`.`t1`.`a` = `tvc_0`.`1` +explain extended select * from t1 +where a in +( +select * +from (values (1),(2)) as tvc_0 +); +id select_type table type possible_keys key key_len ref rows filtered Extra +1 PRIMARY <subquery2> ALL distinct_key NULL NULL NULL 2 100.00 +1 PRIMARY t1 ALL NULL NULL NULL NULL 6 100.00 Using where; Using join buffer (flat, BNL join) +2 MATERIALIZED <derived3> ALL NULL NULL NULL NULL 2 100.00 +3 DERIVED NULL NULL NULL NULL NULL NULL NULL NULL No tables used +Warnings: +Note 1003 /* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` semi join ((values (1),(2)) `tvc_0`) where `test`.`t1`.`a` = `tvc_0`.`1` +# AND-condition with IN-predicates in WHERE-part +select * from t1 +where a in (1,2) and +b in (1,5); +a b +1 1 +2 5 +select * from t1 +where a in +( +select * +from (values (1),(2)) as tvc_0 +) +and b in +( +select * +from (values (1),(5)) as tvc_1 +); +a b +1 1 +2 5 +explain extended select * from t1 +where a in (1,2) and +b in (1,5); +id select_type table type possible_keys key key_len ref rows filtered Extra +1 PRIMARY <subquery4> ALL distinct_key NULL NULL NULL 2 100.00 +1 PRIMARY t1 ALL NULL NULL NULL NULL 6 100.00 Using where; Using join buffer (flat, BNL join) +1 PRIMARY <subquery2> eq_ref distinct_key distinct_key 4 func 1 100.00 +4 MATERIALIZED <derived5> ALL NULL NULL NULL NULL 2 100.00 +2 MATERIALIZED <derived3> ALL NULL NULL NULL NULL 2 100.00 +5 DERIVED NULL NULL NULL NULL NULL NULL NULL NULL No tables used +3 DERIVED NULL NULL NULL NULL NULL NULL NULL NULL No tables used +Warnings: +Note 1003 /* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` semi join ((values (1),(2)) `tvc_0`) semi join ((values (1),(5)) `tvc_1`) where `test`.`t1`.`b` = `tvc_1`.`1` +explain extended select * from t1 +where a in +( +select * +from (values (1),(2)) as tvc_0 +) +and b in +( +select * +from (values (1),(5)) as tvc_1 +); +id select_type table type possible_keys key key_len ref rows filtered Extra +1 PRIMARY <subquery4> ALL distinct_key NULL NULL NULL 2 100.00 +1 PRIMARY t1 ALL NULL NULL NULL NULL 6 100.00 Using where; Using join buffer (flat, BNL join) +1 PRIMARY <subquery2> eq_ref distinct_key distinct_key 4 func 1 100.00 +4 MATERIALIZED <derived5> ALL NULL NULL NULL NULL 2 100.00 +2 MATERIALIZED <derived3> ALL NULL NULL NULL NULL 2 100.00 +5 DERIVED NULL NULL NULL NULL NULL NULL NULL NULL No tables used +3 DERIVED NULL NULL NULL NULL NULL NULL NULL NULL No tables used +Warnings: +Note 1003 /* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` semi join ((values (1),(2)) `tvc_0`) semi join ((values (1),(5)) `tvc_1`) where `test`.`t1`.`b` = `tvc_1`.`1` +# subquery with IN-predicate +select * from t1 +where a in +( +select a +from t2 where b in (3,4) +); +a b +4 6 +select * from t1 +where a in +( +select a from t2 +where b in +( +select * +from (values (3),(4)) as tvc_0 +) +); +a b +4 6 +explain extended select * from t1 +where a in +( +select a +from t2 where b in (3,4) +); +id select_type table type possible_keys key key_len ref rows filtered Extra +1 PRIMARY t1 ALL NULL NULL NULL NULL 6 100.00 +1 PRIMARY <subquery2> eq_ref distinct_key distinct_key 4 func 1 100.00 +2 MATERIALIZED <derived4> ALL NULL NULL NULL NULL 2 100.00 +2 MATERIALIZED t2 ALL NULL NULL NULL NULL 6 100.00 Using where; Using join buffer (flat, BNL join) +4 DERIVED NULL NULL NULL NULL NULL NULL NULL NULL No tables used +Warnings: +Note 1003 /* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` semi join ((values (3),(4)) `tvc_0` join `test`.`t2`) where `test`.`t2`.`b` = `tvc_0`.`3` +explain extended select * from t1 +where a in +( +select a from t2 +where b in +( +select * +from (values (3),(4)) as tvc_0 +) +); +id select_type table type possible_keys key key_len ref rows filtered Extra +1 PRIMARY t1 ALL NULL NULL NULL NULL 6 100.00 +1 PRIMARY <subquery2> eq_ref distinct_key distinct_key 4 func 1 100.00 +2 MATERIALIZED <derived4> ALL NULL NULL NULL NULL 2 100.00 +2 MATERIALIZED t2 ALL NULL NULL NULL NULL 6 100.00 Using where; Using join buffer (flat, BNL join) +4 DERIVED NULL NULL NULL NULL NULL NULL NULL NULL No tables used +Warnings: +Note 1003 /* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` semi join ((values (3),(4)) `tvc_0` join `test`.`t2`) where `test`.`t2`.`b` = `tvc_0`.`3` +# derived table with IN-predicate +select * from +( +select * +from t1 +where a in (1,2) +) as dr_table; +a b +1 2 +1 1 +2 5 +select * from +( +select * +from t1 +where a in +( +select * +from (values (1),(2)) +as tvc_0 +) +) as dr_table; +a b +1 2 +1 1 +2 5 +explain extended select * from +( +select * +from t1 +where a in (1,2) +) as dr_table; +id select_type table type possible_keys key key_len ref rows filtered Extra +1 PRIMARY <subquery3> ALL distinct_key NULL NULL NULL 2 100.00 +1 PRIMARY t1 ALL NULL NULL NULL NULL 6 100.00 Using where; Using join buffer (flat, BNL join) +3 MATERIALIZED <derived4> ALL NULL NULL NULL NULL 2 100.00 +4 DERIVED NULL NULL NULL NULL NULL NULL NULL NULL No tables used +Warnings: +Note 1003 /* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` semi join ((values (1),(2)) `tvc_0`) where `test`.`t1`.`a` = `tvc_0`.`1` +explain extended select * from +( +select * +from t1 +where a in +( +select * +from (values (1),(2)) +as tvc_0 +) +) as dr_table; +id select_type table type possible_keys key key_len ref rows filtered Extra +1 PRIMARY <subquery3> ALL distinct_key NULL NULL NULL 2 100.00 +1 PRIMARY t1 ALL NULL NULL NULL NULL 6 100.00 Using where; Using join buffer (flat, BNL join) +3 MATERIALIZED <derived4> ALL NULL NULL NULL NULL 2 100.00 +4 DERIVED NULL NULL NULL NULL NULL NULL NULL NULL No tables used +Warnings: +Note 1003 /* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` semi join ((values (1),(2)) `tvc_0`) where `test`.`t1`.`a` = `tvc_0`.`1` +# non-recursive CTE with IN-predicate +with tvc_0 as +( +select * +from t1 +where a in (1,2) +) +select * from tvc_0; +a b +1 2 +1 1 +2 5 +select * from +( +select * +from t1 +where a in +( +select * +from (values (1),(2)) +as tvc_0 +) +) as dr_table; +a b +1 2 +1 1 +2 5 +explain extended with tvc_0 as +( +select * +from t1 +where a in (1,2) +) +select * from tvc_0; +id select_type table type possible_keys key key_len ref rows filtered Extra +1 PRIMARY <subquery3> ALL distinct_key NULL NULL NULL 2 100.00 +1 PRIMARY t1 ALL NULL NULL NULL NULL 6 100.00 Using where; Using join buffer (flat, BNL join) +3 MATERIALIZED <derived4> ALL NULL NULL NULL NULL 2 100.00 +4 DERIVED NULL NULL NULL NULL NULL NULL NULL NULL No tables used +Warnings: +Note 1003 with tvc_0 as (/* select#2 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` semi join ((values (1),(2)) `tvc_0`) where `test`.`t1`.`a` in (1,2))/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` semi join ((values (1),(2)) `tvc_0`) where `test`.`t1`.`a` = `tvc_0`.`1` +explain extended select * from +( +select * +from t1 +where a in +( +select * +from (values (1),(2)) +as tvc_0 +) +) as dr_table; +id select_type table type possible_keys key key_len ref rows filtered Extra +1 PRIMARY <subquery3> ALL distinct_key NULL NULL NULL 2 100.00 +1 PRIMARY t1 ALL NULL NULL NULL NULL 6 100.00 Using where; Using join buffer (flat, BNL join) +3 MATERIALIZED <derived4> ALL NULL NULL NULL NULL 2 100.00 +4 DERIVED NULL NULL NULL NULL NULL NULL NULL NULL No tables used +Warnings: +Note 1003 /* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` semi join ((values (1),(2)) `tvc_0`) where `test`.`t1`.`a` = `tvc_0`.`1` +# VIEW with IN-predicate +create view v1 as +select * +from t1 +where a in (1,2); +create view v2 as +select * +from t1 +where a in +( +select * +from (values (1),(2)) +as tvc_0 +) +; +select * from v1; +a b +1 2 +1 1 +2 5 +select * from v2; +a b +1 2 +1 1 +2 5 +explain extended select * from v1; +id select_type table type possible_keys key key_len ref rows filtered Extra +1 PRIMARY <subquery3> ALL distinct_key NULL NULL NULL 2 100.00 +1 PRIMARY t1 ALL NULL NULL NULL NULL 6 100.00 Using where; Using join buffer (flat, BNL join) +3 MATERIALIZED <derived4> ALL NULL NULL NULL NULL 2 100.00 +4 DERIVED NULL NULL NULL NULL NULL NULL NULL NULL No tables used +Warnings: +Note 1003 /* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` semi join ((values (1),(2)) `tvc_0`) where `test`.`t1`.`a` = `tvc_0`.`1` +explain extended select * from v2; +id select_type table type possible_keys key key_len ref rows filtered Extra +1 PRIMARY <subquery3> ALL distinct_key NULL NULL NULL 2 100.00 +1 PRIMARY t1 ALL NULL NULL NULL NULL 6 100.00 Using where; Using join buffer (flat, BNL join) +3 MATERIALIZED <derived4> ALL NULL NULL NULL NULL 2 100.00 +4 DERIVED NULL NULL NULL NULL NULL NULL NULL NULL No tables used +Warnings: +Note 1003 /* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` semi join ((values (1),(2)) `tvc_0`) where `test`.`t1`.`a` = `tvc_0`.`1` +drop view v1,v2; +# subselect defined by derived table with IN-predicate +select * from t1 +where a in +( +select 1 +from +( +select * +from t1 +where a in (1,2) +) +as dr_table +); +a b +1 2 +1 1 +select * from t1 +where a in +( +select 1 +from +( +select * +from t1 +where a in +( +select * +from (values (1),(2)) +as tvc_0 +) +) +as dr_table +); +a b +1 2 +1 1 +explain extended select * from t1 +where a in +( +select 1 +from +( +select * +from t1 +where a in (1,2) +) +as dr_table +); +id select_type table type possible_keys key key_len ref rows filtered Extra +1 PRIMARY t1 ALL NULL NULL NULL NULL 6 100.00 Using where +1 PRIMARY <subquery2> eq_ref distinct_key distinct_key 4 func 1 100.00 +2 MATERIALIZED <derived5> ALL NULL NULL NULL NULL 2 100.00 +2 MATERIALIZED t1 ALL NULL NULL NULL NULL 6 100.00 Using where; Using join buffer (flat, BNL join) +5 DERIVED NULL NULL NULL NULL NULL NULL NULL NULL No tables used +Warnings: +Note 1003 /* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` semi join ((values (1),(2)) `tvc_0` join `test`.`t1`) where `test`.`t1`.`a` = 1 and `test`.`t1`.`a` = `tvc_0`.`1` +explain extended select * from t1 +where a in +( +select 1 +from +( +select * +from t1 +where a in +( +select * +from (values (1),(2)) +as tvc_0 +) +) +as dr_table +); +id select_type table type possible_keys key key_len ref rows filtered Extra +1 PRIMARY t1 ALL NULL NULL NULL NULL 6 100.00 Using where +1 PRIMARY <subquery2> eq_ref distinct_key distinct_key 4 func 1 100.00 +2 MATERIALIZED <derived5> ALL NULL NULL NULL NULL 2 100.00 +2 MATERIALIZED t1 ALL NULL NULL NULL NULL 6 100.00 Using where; Using join buffer (flat, BNL join) +5 DERIVED NULL NULL NULL NULL NULL NULL NULL NULL No tables used +Warnings: +Note 1003 /* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` semi join ((values (1),(2)) `tvc_0` join `test`.`t1`) where `test`.`t1`.`a` = 1 and `test`.`t1`.`a` = `tvc_0`.`1` +# derived table with IN-predicate and group by +select * from +( +select max(a),b +from t1 +where b in (3,5) +group by b +) as dr_table; +max(a) b +2 5 +select * from +( +select max(a),b +from t1 +where b in +( +select * +from (values (3),(5)) +as tvc_0 +) +group by b +) as dr_table; +max(a) b +2 5 +explain extended select * from +( +select max(a),b +from t1 +where b in (3,5) +group by b +) as dr_table; +id select_type table type possible_keys key key_len ref rows filtered Extra +1 PRIMARY <derived2> ALL NULL NULL NULL NULL 12 100.00 +2 DERIVED t1 ALL NULL NULL NULL NULL 6 100.00 Using temporary; Using filesort +2 DERIVED <subquery3> eq_ref distinct_key distinct_key 4 func 1 100.00 +3 MATERIALIZED <derived4> ALL NULL NULL NULL NULL 2 100.00 +4 DERIVED NULL NULL NULL NULL NULL NULL NULL NULL No tables used +Warnings: +Note 1003 /* select#1 */ select `dr_table`.`max(a)` AS `max(a)`,`dr_table`.`b` AS `b` from (/* select#2 */ select max(`test`.`t1`.`a`) AS `max(a)`,`test`.`t1`.`b` AS `b` from `test`.`t1` semi join ((values (3),(5)) `tvc_0`) where 1 group by `test`.`t1`.`b`) `dr_table` +explain extended select * from +( +select max(a),b +from t1 +where b in +( +select * +from (values (3),(5)) +as tvc_0 +) +group by b +) as dr_table; +id select_type table type possible_keys key key_len ref rows filtered Extra +1 PRIMARY <derived2> ALL NULL NULL NULL NULL 12 100.00 +2 DERIVED t1 ALL NULL NULL NULL NULL 6 100.00 Using temporary; Using filesort +2 DERIVED <subquery3> eq_ref distinct_key distinct_key 4 func 1 100.00 +3 MATERIALIZED <derived4> ALL NULL NULL NULL NULL 2 100.00 +4 DERIVED NULL NULL NULL NULL NULL NULL NULL NULL No tables used +Warnings: +Note 1003 /* select#1 */ select `dr_table`.`max(a)` AS `max(a)`,`dr_table`.`b` AS `b` from (/* select#2 */ select max(`test`.`t1`.`a`) AS `max(a)`,`test`.`t1`.`b` AS `b` from `test`.`t1` semi join ((values (3),(5)) `tvc_0`) where 1 group by `test`.`t1`.`b`) `dr_table` +# prepare statement +prepare stmt from "select * from t1 where a in (1,2)"; +execute stmt; +a b +1 2 +1 1 +2 5 +execute stmt; +a b +1 2 +1 1 +2 5 +deallocate prepare stmt; +# use inside out access from tvc rows +set @@in_subquery_conversion_threshold= default; +select * from t3 where a in (1,4,10); +a b +1 abc +1 todd +1 sm +4 yq +10 abc +explain extended select * from t3 where a in (1,4,10); +id select_type table type possible_keys key key_len ref rows filtered Extra +1 SIMPLE t3 range idx idx 5 NULL 5 100.00 Using index condition +Warnings: +Note 1003 select `test`.`t3`.`a` AS `a`,`test`.`t3`.`b` AS `b` from `test`.`t3` where `test`.`t3`.`a` in (1,4,10) +set @@in_subquery_conversion_threshold= 2; +select * from t3 where a in (1,4,10); +a b +1 abc +1 todd +1 sm +4 yq +10 abc +explain extended select * from t3 where a in (1,4,10); +id select_type table type possible_keys key key_len ref rows filtered Extra +1 PRIMARY <subquery2> ALL distinct_key NULL NULL NULL 2 100.00 +1 PRIMARY t3 ref idx idx 5 tvc_0.1 3 100.00 +2 MATERIALIZED <derived3> ALL NULL NULL NULL NULL 2 100.00 +3 DERIVED NULL NULL NULL NULL NULL NULL NULL NULL No tables used +Warnings: +Note 1003 /* select#1 */ select `test`.`t3`.`a` AS `a`,`test`.`t3`.`b` AS `b` from `test`.`t3` semi join ((values (1),(4),(10)) `tvc_0`) where `test`.`t3`.`a` = `tvc_0`.`1` +# use vectors in IN predeicate +set @@in_subquery_conversion_threshold= 4; +select * from t1 where (a,b) in ((1,2),(3,4)); +a b +1 2 +explain extended select * from t1 where (a,b) in ((1,2),(3,4)); +id select_type table type possible_keys key key_len ref rows filtered Extra +1 PRIMARY <subquery2> ALL distinct_key NULL NULL NULL 2 100.00 +1 PRIMARY t1 ALL NULL NULL NULL NULL 6 100.00 Using where; Using join buffer (flat, BNL join) +2 MATERIALIZED <derived3> ALL NULL NULL NULL NULL 2 100.00 +3 DERIVED NULL NULL NULL NULL NULL NULL NULL NULL No tables used +Warnings: +Note 1003 /* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` semi join ((values (1,2),(3,4)) `tvc_0`) where `test`.`t1`.`a` = `tvc_0`.`1` and `test`.`t1`.`b` = `tvc_0`.`2` +set @@in_subquery_conversion_threshold= 2; +# trasformation works for the one IN predicate and doesn't work for the other +set @@in_subquery_conversion_threshold= 5; +select * from t2 +where (a,b) in ((1,2),(8,9)) and +(a,c) in ((1,3),(8,0),(5,1)); +a b c +1 2 3 +8 9 0 +explain extended select * from t2 +where (a,b) in ((1,2),(8,9)) and +(a,c) in ((1,3),(8,0),(5,1)); +id select_type table type possible_keys key key_len ref rows filtered Extra +1 PRIMARY <subquery2> ALL distinct_key NULL NULL NULL 2 100.00 +1 PRIMARY t2 ALL NULL NULL NULL NULL 6 100.00 Using where; Using join buffer (flat, BNL join) +2 MATERIALIZED <derived3> ALL NULL NULL NULL NULL 2 100.00 +3 DERIVED NULL NULL NULL NULL NULL NULL NULL NULL No tables used +Warnings: +Note 1003 /* select#1 */ select `test`.`t2`.`a` AS `a`,`test`.`t2`.`b` AS `b`,`test`.`t2`.`c` AS `c` from `test`.`t2` semi join ((values (1,3),(8,0),(5,1)) `tvc_0`) where `test`.`t2`.`a` = `tvc_0`.`1` and `test`.`t2`.`c` = `tvc_0`.`3` and (`tvc_0`.`1`,`test`.`t2`.`b`) in (<cache>((1,2)),<cache>((8,9))) +set @@in_subquery_conversion_threshold= 2; +# +# mdev-14281: conversion of NOT IN predicate into subquery predicate +# +select * from t1 +where (a,b) not in ((1,2),(8,9), (5,1)); +a b +4 6 +9 7 +1 1 +2 5 +7 8 +select * from t1 +where (a,b) not in (select * from (values (1,2),(8,9), (5,1)) as tvc_0); +a b +4 6 +9 7 +1 1 +2 5 +7 8 +explain extended select * from t1 +where (a,b) not in ((1,2),(8,9), (5,1)); +id select_type table type possible_keys key key_len ref rows filtered Extra +1 PRIMARY t1 ALL NULL NULL NULL NULL 6 100.00 Using where +2 MATERIALIZED <derived3> ALL NULL NULL NULL NULL 2 100.00 +3 DERIVED NULL NULL NULL NULL NULL NULL NULL NULL No tables used +Warnings: +Note 1003 /* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where !<expr_cache><`test`.`t1`.`a`,`test`.`t1`.`b`>(<in_optimizer>((`test`.`t1`.`a`,`test`.`t1`.`b`),(`test`.`t1`.`a`,`test`.`t1`.`b`) in ( <materialize> (/* select#2 */ select `tvc_0`.`1`,`tvc_0`.`2` from (values (1,2),(8,9),(5,1)) `tvc_0` ), <primary_index_lookup>(`test`.`t1`.`a` in <temporary table> on distinct_key where `test`.`t1`.`a` = `<subquery2>`.`1` and `test`.`t1`.`b` = `<subquery2>`.`2`)))) +explain extended select * from t1 +where (a,b) not in (select * from (values (1,2),(8,9), (5,1)) as tvc_0); +id select_type table type possible_keys key key_len ref rows filtered Extra +1 PRIMARY t1 ALL NULL NULL NULL NULL 6 100.00 Using where +2 MATERIALIZED <derived3> ALL NULL NULL NULL NULL 2 100.00 +3 DERIVED NULL NULL NULL NULL NULL NULL NULL NULL No tables used +Warnings: +Note 1003 /* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where !<expr_cache><`test`.`t1`.`a`,`test`.`t1`.`b`>(<in_optimizer>((`test`.`t1`.`a`,`test`.`t1`.`b`),(`test`.`t1`.`a`,`test`.`t1`.`b`) in ( <materialize> (/* select#2 */ select `tvc_0`.`1`,`tvc_0`.`2` from (values (1,2),(8,9),(5,1)) `tvc_0` ), <primary_index_lookup>(`test`.`t1`.`a` in <temporary table> on distinct_key where `test`.`t1`.`a` = `<subquery2>`.`1` and `test`.`t1`.`b` = `<subquery2>`.`2`)))) +select * from t1 +where b < 7 and (a,b) not in ((1,2),(8,9), (5,1)); +a b +4 6 +1 1 +2 5 +explain extended select * from t1 +where b < 7 and (a,b) not in ((1,2),(8,9), (5,1)); +id select_type table type possible_keys key key_len ref rows filtered Extra +1 PRIMARY t1 ALL NULL NULL NULL NULL 6 100.00 Using where +2 MATERIALIZED <derived3> ALL NULL NULL NULL NULL 2 100.00 +3 DERIVED NULL NULL NULL NULL NULL NULL NULL NULL No tables used +Warnings: +Note 1003 /* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where `test`.`t1`.`b` < 7 and !<expr_cache><`test`.`t1`.`a`,`test`.`t1`.`b`>(<in_optimizer>((`test`.`t1`.`a`,`test`.`t1`.`b`),(`test`.`t1`.`a`,`test`.`t1`.`b`) in ( <materialize> (/* select#2 */ select `tvc_0`.`1`,`tvc_0`.`2` from (values (1,2),(8,9),(5,1)) `tvc_0` ), <primary_index_lookup>(`test`.`t1`.`a` in <temporary table> on distinct_key where `test`.`t1`.`a` = `<subquery2>`.`1` and `test`.`t1`.`b` = `<subquery2>`.`2`)))) +select * from t2 +where (a,c) not in ((1,2),(8,9), (5,1)); +a b c +1 2 3 +5 1 2 +4 3 7 +8 9 0 +10 7 1 +explain extended select * from t2 +where (a,c) not in ((1,2),(8,9), (5,1)); +id select_type table type possible_keys key key_len ref rows filtered Extra +1 PRIMARY t2 ALL NULL NULL NULL NULL 6 100.00 Using where +2 MATERIALIZED <derived3> ALL NULL NULL NULL NULL 2 100.00 +3 DERIVED NULL NULL NULL NULL NULL NULL NULL NULL No tables used +Warnings: +Note 1003 /* select#1 */ select `test`.`t2`.`a` AS `a`,`test`.`t2`.`b` AS `b`,`test`.`t2`.`c` AS `c` from `test`.`t2` where !<expr_cache><`test`.`t2`.`a`,`test`.`t2`.`c`>(<in_optimizer>((`test`.`t2`.`a`,`test`.`t2`.`c`),(`test`.`t2`.`a`,`test`.`t2`.`c`) in ( <materialize> (/* select#2 */ select `tvc_0`.`1`,`tvc_0`.`2` from (values (1,2),(8,9),(5,1)) `tvc_0` ), <primary_index_lookup>(`test`.`t2`.`a` in <temporary table> on distinct_key where `test`.`t2`.`a` = `<subquery2>`.`1` and `test`.`t2`.`c` = `<subquery2>`.`2`)))) +drop table t1, t2, t3; +set @@in_subquery_conversion_threshold= default; diff --git a/mysql-test/r/partition_exchange.result b/mysql-test/r/partition_exchange.result index f37ba183560..3bce5aec8e2 100644 --- a/mysql-test/r/partition_exchange.result +++ b/mysql-test/r/partition_exchange.result @@ -40,7 +40,8 @@ Create Table CREATE TABLE `t2` ( ) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT SELECT TABLE_NAME, TABLE_TYPE, ENGINE, ROW_FORMAT, CREATE_OPTIONS FROM INFORMATION_SCHEMA.TABLES -WHERE TABLE_SCHEMA = 'test' AND TABLE_NAME IN ('t1', 't2'); +WHERE TABLE_SCHEMA = 'test' AND TABLE_NAME IN ('t1', 't2') +ORDER BY TABLE_NAME; TABLE_NAME t1 TABLE_TYPE BASE TABLE ENGINE InnoDB @@ -76,7 +77,8 @@ Create Table CREATE TABLE `t2` ( ) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT SELECT TABLE_NAME, TABLE_TYPE, ENGINE, ROW_FORMAT, CREATE_OPTIONS FROM INFORMATION_SCHEMA.TABLES -WHERE TABLE_SCHEMA = 'test' AND TABLE_NAME IN ('t1', 't2'); +WHERE TABLE_SCHEMA = 'test' AND TABLE_NAME IN ('t1', 't2') +ORDER BY TABLE_NAME; TABLE_NAME t1 TABLE_TYPE BASE TABLE ENGINE InnoDB @@ -124,7 +126,8 @@ Create Table CREATE TABLE `t2` ( ) ENGINE=InnoDB DEFAULT CHARSET=latin1 SELECT TABLE_NAME, TABLE_TYPE, ENGINE, ROW_FORMAT, CREATE_OPTIONS FROM INFORMATION_SCHEMA.TABLES -WHERE TABLE_SCHEMA = 'test' AND TABLE_NAME IN ('t1', 't2'); +WHERE TABLE_SCHEMA = 'test' AND TABLE_NAME IN ('t1', 't2') +ORDER BY TABLE_NAME; TABLE_NAME t1 TABLE_TYPE BASE TABLE ENGINE InnoDB @@ -184,7 +187,8 @@ Create Table CREATE TABLE `t2` ( ) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT SELECT TABLE_NAME, TABLE_TYPE, ENGINE, ROW_FORMAT, CREATE_OPTIONS FROM INFORMATION_SCHEMA.TABLES -WHERE TABLE_SCHEMA = 'test' AND TABLE_NAME IN ('t1', 't2'); +WHERE TABLE_SCHEMA = 'test' AND TABLE_NAME IN ('t1', 't2') +ORDER BY TABLE_NAME; TABLE_NAME t1 TABLE_TYPE BASE TABLE ENGINE InnoDB @@ -244,7 +248,8 @@ Create Table CREATE TABLE `t2` ( ) ENGINE=InnoDB DEFAULT CHARSET=latin1 SELECT TABLE_NAME, TABLE_TYPE, ENGINE, ROW_FORMAT, CREATE_OPTIONS FROM INFORMATION_SCHEMA.TABLES -WHERE TABLE_SCHEMA = 'test' AND TABLE_NAME IN ('t1', 't2'); +WHERE TABLE_SCHEMA = 'test' AND TABLE_NAME IN ('t1', 't2') +ORDER BY TABLE_NAME; TABLE_NAME t1 TABLE_TYPE BASE TABLE ENGINE InnoDB @@ -304,7 +309,8 @@ Create Table CREATE TABLE `t2` ( ) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=REDUNDANT SELECT TABLE_NAME, TABLE_TYPE, ENGINE, ROW_FORMAT, CREATE_OPTIONS FROM INFORMATION_SCHEMA.TABLES -WHERE TABLE_SCHEMA = 'test' AND TABLE_NAME IN ('t1', 't2'); +WHERE TABLE_SCHEMA = 'test' AND TABLE_NAME IN ('t1', 't2') +ORDER BY TABLE_NAME; TABLE_NAME t1 TABLE_TYPE BASE TABLE ENGINE InnoDB @@ -361,7 +367,8 @@ Create Table CREATE TABLE `t2` ( ) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=REDUNDANT SELECT TABLE_NAME, TABLE_TYPE, ENGINE, ROW_FORMAT, CREATE_OPTIONS FROM INFORMATION_SCHEMA.TABLES -WHERE TABLE_SCHEMA = 'test' AND TABLE_NAME IN ('t1', 't2'); +WHERE TABLE_SCHEMA = 'test' AND TABLE_NAME IN ('t1', 't2') +ORDER BY TABLE_NAME; TABLE_NAME t1 TABLE_TYPE BASE TABLE ENGINE InnoDB @@ -418,7 +425,8 @@ Create Table CREATE TABLE `t2` ( ) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=REDUNDANT SELECT TABLE_NAME, TABLE_TYPE, ENGINE, ROW_FORMAT, CREATE_OPTIONS FROM INFORMATION_SCHEMA.TABLES -WHERE TABLE_SCHEMA = 'test' AND TABLE_NAME IN ('t1', 't2'); +WHERE TABLE_SCHEMA = 'test' AND TABLE_NAME IN ('t1', 't2') +ORDER BY TABLE_NAME; TABLE_NAME t1 TABLE_TYPE BASE TABLE ENGINE InnoDB diff --git a/mysql-test/r/ps.result b/mysql-test/r/ps.result index f16d2928c2e..86d0f959edc 100644 --- a/mysql-test/r/ps.result +++ b/mysql-test/r/ps.result @@ -4795,7 +4795,7 @@ EXECUTE IMMEDIATE MAX('SELECT 1 AS c'); ERROR HY000: Invalid use of group function EXECUTE IMMEDIATE DEFAULT(a); ERROR 42S22: Unknown column 'a' in 'field list' -EXECUTE IMMEDIATE VALUES(a); +EXECUTE IMMEDIATE VALUE(a); ERROR 42S22: Unknown column 'a' in 'field list' CREATE FUNCTION f1() RETURNS VARCHAR(64) RETURN 't1'; EXECUTE IMMEDIATE f1(); diff --git a/mysql-test/r/range.result b/mysql-test/r/range.result index 735a0069ba0..80aef096828 100644 --- a/mysql-test/r/range.result +++ b/mysql-test/r/range.result @@ -1,3 +1,4 @@ +set in_subquery_conversion_threshold=10000; drop table if exists t1, t2, t3, t10, t100; CREATE TABLE t1 ( event_date date DEFAULT '0000-00-00' NOT NULL, @@ -3006,3 +3007,4 @@ drop table t1,t2,t3; # # End of 10.2 tests # +set in_subquery_conversion_threshold=default; diff --git a/mysql-test/r/range_mrr_icp.result b/mysql-test/r/range_mrr_icp.result index afce3c66c21..b0672eed54e 100644 --- a/mysql-test/r/range_mrr_icp.result +++ b/mysql-test/r/range_mrr_icp.result @@ -1,5 +1,6 @@ set @mrr_icp_extra_tmp=@@optimizer_switch; set optimizer_switch='mrr=on,mrr_sort_keys=on,index_condition_pushdown=on'; +set in_subquery_conversion_threshold=10000; drop table if exists t1, t2, t3, t10, t100; CREATE TABLE t1 ( event_date date DEFAULT '0000-00-00' NOT NULL, @@ -3018,4 +3019,5 @@ drop table t1,t2,t3; # # End of 10.2 tests # +set in_subquery_conversion_threshold=default; set optimizer_switch=@mrr_icp_extra_tmp; diff --git a/mysql-test/r/selectivity.result b/mysql-test/r/selectivity.result index 79b46183b60..7400dff3958 100644 --- a/mysql-test/r/selectivity.result +++ b/mysql-test/r/selectivity.result @@ -400,7 +400,7 @@ id select_type table type possible_keys key key_len ref rows filtered Extra 3 SUBQUERY customer ALL NULL NULL NULL NULL 150 100.00 Using where Warnings: Note 1276 Field or reference 'dbt3_s001.customer.c_custkey' of SELECT #4 was resolved in SELECT #2 -Note 1003 /* select#1 */ select substr(`dbt3_s001`.`customer`.`c_phone`,1,2) AS `cntrycode`,count(0) AS `numcust`,sum(`dbt3_s001`.`customer`.`c_acctbal`) AS `totacctbal` from `dbt3_s001`.`customer` where substr(`dbt3_s001`.`customer`.`c_phone`,1,2) in ('10','20','14','19','11','28','25') and `dbt3_s001`.`customer`.`c_acctbal` > (/* select#3 */ select avg(`dbt3_s001`.`customer`.`c_acctbal`) from `dbt3_s001`.`customer` where `dbt3_s001`.`customer`.`c_acctbal` > 0.00 and substr(`dbt3_s001`.`customer`.`c_phone`,1,2) in ('10','20','14','19','11','28','25')) and !<in_optimizer>(1,exists(/* select#4 */ select 1 from `dbt3_s001`.`orders` where `dbt3_s001`.`orders`.`o_custkey` = `dbt3_s001`.`customer`.`c_custkey`)) group by substr(`dbt3_s001`.`customer`.`c_phone`,1,2) order by substr(`dbt3_s001`.`customer`.`c_phone`,1,2) +Note 1003 /* select#1 */ select substr(`dbt3_s001`.`customer`.`c_phone`,1,2) AS `cntrycode`,count(0) AS `numcust`,sum(`dbt3_s001`.`customer`.`c_acctbal`) AS `totacctbal` from `dbt3_s001`.`customer` where substr(`dbt3_s001`.`customer`.`c_phone`,1,2) in ('10','20','14','19','11','28','25') and `dbt3_s001`.`customer`.`c_acctbal` > (/* select#3 */ select avg(`dbt3_s001`.`customer`.`c_acctbal`) from `dbt3_s001`.`customer` where `dbt3_s001`.`customer`.`c_acctbal` > 0.00 and substr(`dbt3_s001`.`customer`.`c_phone`,1,2) in ('10','20','14','19','11','28','25')) and !<in_optimizer>(1,<expr_cache><`dbt3_s001`.`customer`.`c_custkey`>(exists(/* select#4 */ select 1 from `dbt3_s001`.`orders` where `dbt3_s001`.`orders`.`o_custkey` = `dbt3_s001`.`customer`.`c_custkey`))) group by substr(`dbt3_s001`.`customer`.`c_phone`,1,2) order by substr(`dbt3_s001`.`customer`.`c_phone`,1,2) select cntrycode, count(*) as numcust, sum(c_acctbal) as totacctbal from ( select substr(c_phone, 1, 2) as cntrycode, c_acctbal @@ -441,7 +441,7 @@ id select_type table type possible_keys key key_len ref rows filtered Extra 3 SUBQUERY customer ALL NULL NULL NULL NULL 150 91.00 Using where Warnings: Note 1276 Field or reference 'dbt3_s001.customer.c_custkey' of SELECT #4 was resolved in SELECT #2 -Note 1003 /* select#1 */ select substr(`dbt3_s001`.`customer`.`c_phone`,1,2) AS `cntrycode`,count(0) AS `numcust`,sum(`dbt3_s001`.`customer`.`c_acctbal`) AS `totacctbal` from `dbt3_s001`.`customer` where substr(`dbt3_s001`.`customer`.`c_phone`,1,2) in ('10','20','14','19','11','28','25') and `dbt3_s001`.`customer`.`c_acctbal` > (/* select#3 */ select avg(`dbt3_s001`.`customer`.`c_acctbal`) from `dbt3_s001`.`customer` where `dbt3_s001`.`customer`.`c_acctbal` > 0.00 and substr(`dbt3_s001`.`customer`.`c_phone`,1,2) in ('10','20','14','19','11','28','25')) and !<in_optimizer>(1,exists(/* select#4 */ select 1 from `dbt3_s001`.`orders` where `dbt3_s001`.`orders`.`o_custkey` = `dbt3_s001`.`customer`.`c_custkey`)) group by substr(`dbt3_s001`.`customer`.`c_phone`,1,2) order by substr(`dbt3_s001`.`customer`.`c_phone`,1,2) +Note 1003 /* select#1 */ select substr(`dbt3_s001`.`customer`.`c_phone`,1,2) AS `cntrycode`,count(0) AS `numcust`,sum(`dbt3_s001`.`customer`.`c_acctbal`) AS `totacctbal` from `dbt3_s001`.`customer` where substr(`dbt3_s001`.`customer`.`c_phone`,1,2) in ('10','20','14','19','11','28','25') and `dbt3_s001`.`customer`.`c_acctbal` > (/* select#3 */ select avg(`dbt3_s001`.`customer`.`c_acctbal`) from `dbt3_s001`.`customer` where `dbt3_s001`.`customer`.`c_acctbal` > 0.00 and substr(`dbt3_s001`.`customer`.`c_phone`,1,2) in ('10','20','14','19','11','28','25')) and !<in_optimizer>(1,<expr_cache><`dbt3_s001`.`customer`.`c_custkey`>(exists(/* select#4 */ select 1 from `dbt3_s001`.`orders` where `dbt3_s001`.`orders`.`o_custkey` = `dbt3_s001`.`customer`.`c_custkey`))) group by substr(`dbt3_s001`.`customer`.`c_phone`,1,2) order by substr(`dbt3_s001`.`customer`.`c_phone`,1,2) select cntrycode, count(*) as numcust, sum(c_acctbal) as totacctbal from ( select substr(c_phone, 1, 2) as cntrycode, c_acctbal diff --git a/mysql-test/r/selectivity_innodb.result b/mysql-test/r/selectivity_innodb.result index 71657288c66..960a873c854 100644 --- a/mysql-test/r/selectivity_innodb.result +++ b/mysql-test/r/selectivity_innodb.result @@ -403,7 +403,7 @@ id select_type table type possible_keys key key_len ref rows filtered Extra 3 SUBQUERY customer ALL NULL NULL NULL NULL 150 100.00 Using where Warnings: Note 1276 Field or reference 'dbt3_s001.customer.c_custkey' of SELECT #4 was resolved in SELECT #2 -Note 1003 /* select#1 */ select substr(`dbt3_s001`.`customer`.`c_phone`,1,2) AS `cntrycode`,count(0) AS `numcust`,sum(`dbt3_s001`.`customer`.`c_acctbal`) AS `totacctbal` from `dbt3_s001`.`customer` where substr(`dbt3_s001`.`customer`.`c_phone`,1,2) in ('10','20','14','19','11','28','25') and `dbt3_s001`.`customer`.`c_acctbal` > (/* select#3 */ select avg(`dbt3_s001`.`customer`.`c_acctbal`) from `dbt3_s001`.`customer` where `dbt3_s001`.`customer`.`c_acctbal` > 0.00 and substr(`dbt3_s001`.`customer`.`c_phone`,1,2) in ('10','20','14','19','11','28','25')) and !<in_optimizer>(1,exists(/* select#4 */ select 1 from `dbt3_s001`.`orders` where `dbt3_s001`.`orders`.`o_custkey` = `dbt3_s001`.`customer`.`c_custkey`)) group by substr(`dbt3_s001`.`customer`.`c_phone`,1,2) order by substr(`dbt3_s001`.`customer`.`c_phone`,1,2) +Note 1003 /* select#1 */ select substr(`dbt3_s001`.`customer`.`c_phone`,1,2) AS `cntrycode`,count(0) AS `numcust`,sum(`dbt3_s001`.`customer`.`c_acctbal`) AS `totacctbal` from `dbt3_s001`.`customer` where substr(`dbt3_s001`.`customer`.`c_phone`,1,2) in ('10','20','14','19','11','28','25') and `dbt3_s001`.`customer`.`c_acctbal` > (/* select#3 */ select avg(`dbt3_s001`.`customer`.`c_acctbal`) from `dbt3_s001`.`customer` where `dbt3_s001`.`customer`.`c_acctbal` > 0.00 and substr(`dbt3_s001`.`customer`.`c_phone`,1,2) in ('10','20','14','19','11','28','25')) and !<in_optimizer>(1,<expr_cache><`dbt3_s001`.`customer`.`c_custkey`>(exists(/* select#4 */ select 1 from `dbt3_s001`.`orders` where `dbt3_s001`.`orders`.`o_custkey` = `dbt3_s001`.`customer`.`c_custkey`))) group by substr(`dbt3_s001`.`customer`.`c_phone`,1,2) order by substr(`dbt3_s001`.`customer`.`c_phone`,1,2) select cntrycode, count(*) as numcust, sum(c_acctbal) as totacctbal from ( select substr(c_phone, 1, 2) as cntrycode, c_acctbal @@ -444,7 +444,7 @@ id select_type table type possible_keys key key_len ref rows filtered Extra 3 SUBQUERY customer ALL NULL NULL NULL NULL 150 91.00 Using where Warnings: Note 1276 Field or reference 'dbt3_s001.customer.c_custkey' of SELECT #4 was resolved in SELECT #2 -Note 1003 /* select#1 */ select substr(`dbt3_s001`.`customer`.`c_phone`,1,2) AS `cntrycode`,count(0) AS `numcust`,sum(`dbt3_s001`.`customer`.`c_acctbal`) AS `totacctbal` from `dbt3_s001`.`customer` where substr(`dbt3_s001`.`customer`.`c_phone`,1,2) in ('10','20','14','19','11','28','25') and `dbt3_s001`.`customer`.`c_acctbal` > (/* select#3 */ select avg(`dbt3_s001`.`customer`.`c_acctbal`) from `dbt3_s001`.`customer` where `dbt3_s001`.`customer`.`c_acctbal` > 0.00 and substr(`dbt3_s001`.`customer`.`c_phone`,1,2) in ('10','20','14','19','11','28','25')) and !<in_optimizer>(1,exists(/* select#4 */ select 1 from `dbt3_s001`.`orders` where `dbt3_s001`.`orders`.`o_custkey` = `dbt3_s001`.`customer`.`c_custkey`)) group by substr(`dbt3_s001`.`customer`.`c_phone`,1,2) order by substr(`dbt3_s001`.`customer`.`c_phone`,1,2) +Note 1003 /* select#1 */ select substr(`dbt3_s001`.`customer`.`c_phone`,1,2) AS `cntrycode`,count(0) AS `numcust`,sum(`dbt3_s001`.`customer`.`c_acctbal`) AS `totacctbal` from `dbt3_s001`.`customer` where substr(`dbt3_s001`.`customer`.`c_phone`,1,2) in ('10','20','14','19','11','28','25') and `dbt3_s001`.`customer`.`c_acctbal` > (/* select#3 */ select avg(`dbt3_s001`.`customer`.`c_acctbal`) from `dbt3_s001`.`customer` where `dbt3_s001`.`customer`.`c_acctbal` > 0.00 and substr(`dbt3_s001`.`customer`.`c_phone`,1,2) in ('10','20','14','19','11','28','25')) and !<in_optimizer>(1,<expr_cache><`dbt3_s001`.`customer`.`c_custkey`>(exists(/* select#4 */ select 1 from `dbt3_s001`.`orders` where `dbt3_s001`.`orders`.`o_custkey` = `dbt3_s001`.`customer`.`c_custkey`))) group by substr(`dbt3_s001`.`customer`.`c_phone`,1,2) order by substr(`dbt3_s001`.`customer`.`c_phone`,1,2) select cntrycode, count(*) as numcust, sum(c_acctbal) as totacctbal from ( select substr(c_phone, 1, 2) as cntrycode, c_acctbal 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/sp.result b/mysql-test/r/sp.result index cb2237699fb..b66faec260f 100644 --- a/mysql-test/r/sp.result +++ b/mysql-test/r/sp.result @@ -4440,7 +4440,7 @@ create table t3 (id int not null primary key, county varchar(25))| insert into t3 (id, county) values (1, 'York')| create procedure bug15441(c varchar(25)) begin -update t3 set id=2, county=values(c); +update t3 set id=2, county=value(c); end| call bug15441('county')| ERROR 42S22: Unknown column 'c' in 'field list' @@ -4451,7 +4451,7 @@ declare c varchar(25) default "hello"; insert into t3 (id, county) values (1, county) on duplicate key update county= values(county); select * from t3; -update t3 set id=2, county=values(id); +update t3 set id=2, county=value(id); select * from t3; end| call bug15441('Yale')| @@ -4810,8 +4810,8 @@ select routine_name,routine_schema from information_schema.routines where routine_schema like 'bug18344%'| routine_name routine_schema bug18344 bug18344_012345678901 -bug18344_2 bug18344_012345678901 bug18344 bug18344_0123456789012 +bug18344_2 bug18344_012345678901 bug18344_2 bug18344_0123456789012 drop database bug18344_012345678901| drop database bug18344_0123456789012| diff --git a/mysql-test/r/status.result b/mysql-test/r/status.result index 9a8a5bd8f93..9b82c7896cb 100644 --- a/mysql-test/r/status.result +++ b/mysql-test/r/status.result @@ -386,6 +386,29 @@ Handler_tmp_write 2 Handler_update 0 Handler_write 0 drop table t1; +# +# MDEV-11153 - Introduce status variables for table cache monitoring and +# tuning +# +SET @old_table_open_cache= @@table_open_cache; +SET @@global.table_open_cache=10; +FLUSH TABLES; +FLUSH STATUS; +SHOW STATUS LIKE 'Table_open_cache%'; +Variable_name Value +Table_open_cache_active_instances 1 +Table_open_cache_hits 0 +Table_open_cache_misses 0 +Table_open_cache_overflows 0 +SHOW STATUS LIKE 'Table_open_cache%'; +Variable_name Value +Table_open_cache_active_instances 1 +Table_open_cache_hits 30 +Table_open_cache_misses 15 +Table_open_cache_overflows 5 +FLUSH TABLES; +FLUSH STATUS; +SET @@global.table_open_cache= @old_table_open_cache; connection default; set @@global.concurrent_insert= @old_concurrent_insert; SET GLOBAL log_output = @old_log_output; 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/subselect_sj.result b/mysql-test/r/subselect_sj.result index a601dac5337..9631192da33 100644 --- a/mysql-test/r/subselect_sj.result +++ b/mysql-test/r/subselect_sj.result @@ -2800,8 +2800,8 @@ CREATE TABLE t1 (db VARCHAR(64) DEFAULT NULL); INSERT INTO t1 VALUES ('mysql'),('information_schema'); SELECT * FROM t1 WHERE db IN (SELECT `SCHEMA_NAME` FROM information_schema.SCHEMATA); db -mysql information_schema +mysql DROP TABLE t1; # # MDEV-5581: Server crashes in in JOIN::prepare on 2nd execution of PS with materialization+semijoin diff --git a/mysql-test/r/table_elim.result b/mysql-test/r/table_elim.result index 04a9b47b6c9..cf9a4a38779 100644 --- a/mysql-test/r/table_elim.result +++ b/mysql-test/r/table_elim.result @@ -143,7 +143,7 @@ id select_type table type possible_keys key key_len ref rows filtered Extra 3 DEPENDENT SUBQUERY t2 ref PRIMARY PRIMARY 4 test.a2.id 2 100.00 Using index Warnings: Note 1276 Field or reference 'test.a2.id' of SELECT #3 was resolved in SELECT #2 -Note 1003 /* select#1 */ select `f`.`id` AS `id` from `test`.`t0` `f` join `test`.`t2` `a2` where `f`.`id` = `a2`.`id` and `a2`.`attr2` between 12 and 14 and `a2`.`fromdate` = (/* select#3 */ select max(`test`.`t2`.`fromdate`) from `test`.`t2` where `test`.`t2`.`id` = `a2`.`id`) +Note 1003 /* select#1 */ select `f`.`id` AS `id` from `test`.`t0` `f` join `test`.`t2` `a2` where `f`.`id` = `a2`.`id` and `a2`.`attr2` between 12 and 14 and `a2`.`fromdate` = <expr_cache><`a2`.`id`>((/* select#3 */ select max(`test`.`t2`.`fromdate`) from `test`.`t2` where `test`.`t2`.`id` = `a2`.`id`)) This should use one table: explain select id from v2 where id=2; id select_type table type possible_keys key key_len ref rows Extra @@ -171,7 +171,7 @@ id select_type table type possible_keys key key_len ref rows filtered Extra 3 DEPENDENT SUBQUERY t2 ref PRIMARY PRIMARY 4 test.f.id 2 100.00 Using index Warnings: Note 1276 Field or reference 'test.f.id' of SELECT #3 was resolved in SELECT #2 -Note 1003 /* select#1 */ select `f`.`id` AS `id` from `test`.`t0` `f` join `test`.`t2` `a2` where `f`.`id` = `a2`.`id` and `a2`.`attr2` between 12 and 14 and `a2`.`fromdate` = (/* select#3 */ select max(`test`.`t2`.`fromdate`) from `test`.`t2` where `test`.`t2`.`id` = `f`.`id`) +Note 1003 /* select#1 */ select `f`.`id` AS `id` from `test`.`t0` `f` join `test`.`t2` `a2` where `f`.`id` = `a2`.`id` and `a2`.`attr2` between 12 and 14 and `a2`.`fromdate` = <expr_cache><`f`.`id`>((/* select#3 */ select max(`test`.`t2`.`fromdate`) from `test`.`t2` where `test`.`t2`.`id` = `f`.`id`)) drop view v1, v2; drop table t0, t1, t2; create table t1 (a int); diff --git a/mysql-test/r/table_value_constr.result b/mysql-test/r/table_value_constr.result new file mode 100644 index 00000000000..39caba331ef --- /dev/null +++ b/mysql-test/r/table_value_constr.result @@ -0,0 +1,2073 @@ +create table t1 (a int, b int); +insert into t1 values (1,2),(4,6),(9,7), +(1,1),(2,5),(7,8); +# just VALUES +values (1,2); +1 2 +1 2 +values (1,2), (3,4), (5.6,0); +1 2 +1.0 2 +3.0 4 +5.6 0 +values ("abc", "def"); +abc def +abc def +# UNION that uses VALUES structure(s) +select 1,2 +union +values (1,2); +1 2 +1 2 +values (1,2) +union +select 1,2; +1 2 +1 2 +select 1,2 +union +values (1,2),(3,4),(5,6),(7,8); +1 2 +1 2 +3 4 +5 6 +7 8 +select 3,7 +union +values (1,2),(3,4),(5,6); +3 7 +3 7 +1 2 +3 4 +5 6 +select 3,7,4 +union +values (1,2,5),(4,5,6); +3 7 4 +3 7 4 +1 2 5 +4 5 6 +select 1,2 +union +values (1,7),(3,6.5); +1 2 +1 2.0 +1 7.0 +3 6.5 +select 1,2 +union +values (1,2.0),(3,6); +1 2 +1 2.0 +3 6.0 +select 1.8,2 +union +values (1,2),(3,6); +1.8 2 +1.8 2 +1.0 2 +3.0 6 +values (1,2.4),(3,6) +union +select 2.8,9; +1 2.4 +1.0 2.4 +3.0 6.0 +2.8 9.0 +values (1,2),(3,4),(5,6),(7,8) +union +select 5,6; +1 2 +1 2 +3 4 +5 6 +7 8 +select "ab","cdf" +union +values ("al","zl"),("we","q"); +ab cdf +ab cdf +al zl +we q +values ("ab", "cdf") +union +select "ab","cdf"; +ab cdf +ab cdf +values (1,2) +union +values (1,2),(5,6); +1 2 +1 2 +5 6 +values (1,2) +union +values (3,4),(5,6); +1 2 +1 2 +3 4 +5 6 +values (1,2) +union +values (1,2) +union values (4,5); +1 2 +1 2 +4 5 +# UNION ALL that uses VALUES structure +values (1,2),(3,4) +union all +select 5,6; +1 2 +1 2 +3 4 +5 6 +values (1,2),(3,4) +union all +select 1,2; +1 2 +1 2 +3 4 +1 2 +select 5,6 +union all +values (1,2),(3,4); +5 6 +5 6 +1 2 +3 4 +select 1,2 +union all +values (1,2),(3,4); +1 2 +1 2 +1 2 +3 4 +values (1,2) +union all +values (1,2),(5,6); +1 2 +1 2 +1 2 +5 6 +values (1,2) +union all +values (3,4),(5,6); +1 2 +1 2 +3 4 +5 6 +values (1,2) +union all +values (1,2) +union all +values (4,5); +1 2 +1 2 +1 2 +4 5 +values (1,2) +union all +values (1,2) +union values (1,2); +1 2 +1 2 +values (1,2) +union +values (1,2) +union all +values (1,2); +1 2 +1 2 +1 2 +# EXCEPT that uses VALUES structure(s) +select 1,2 +except +values (3,4),(5,6); +1 2 +1 2 +select 1,2 +except +values (1,2),(3,4); +1 2 +values (1,2),(3,4) +except +select 5,6; +1 2 +1 2 +3 4 +values (1,2),(3,4) +except +select 1,2; +1 2 +3 4 +values (1,2),(3,4) +except +values (5,6); +1 2 +1 2 +3 4 +values (1,2),(3,4) +except +values (1,2); +1 2 +3 4 +# INTERSECT that uses VALUES structure(s) +select 1,2 +intersect +values (3,4),(5,6); +1 2 +select 1,2 +intersect +values (1,2),(3,4); +1 2 +1 2 +values (1,2),(3,4) +intersect +select 5,6; +1 2 +values (1,2),(3,4) +intersect +select 1,2; +1 2 +1 2 +values (1,2),(3,4) +intersect +values (5,6); +1 2 +values (1,2),(3,4) +intersect +values (1,2); +1 2 +1 2 +# combination of different structures that uses VALUES structures : UNION + EXCEPT +values (1,2),(3,4) +except +select 1,2 +union values (1,2); +1 2 +1 2 +3 4 +values (1,2),(3,4) +except +values (1,2) +union +values (1,2); +1 2 +1 2 +3 4 +values (1,2),(3,4) +except +values (1,2) +union +values (3,4); +1 2 +3 4 +values (1,2),(3,4) +union +values (1,2) +except +values (1,2); +1 2 +3 4 +# combination of different structures that uses VALUES structures : UNION ALL + EXCEPT +values (1,2),(3,4) +except +select 1,2 +union all +values (1,2); +1 2 +1 2 +3 4 +values (1,2),(3,4) +except +values (1,2) +union all +values (1,2); +1 2 +1 2 +3 4 +values (1,2),(3,4) +except +values (1,2) +union all +values (3,4); +1 2 +3 4 +3 4 +values (1,2),(3,4) +union all +values (1,2) +except +values (1,2); +1 2 +3 4 +# combination of different structures that uses VALUES structures : UNION + INTERSECT +values (1,2),(3,4) +intersect +select 1,2 +union +values (1,2); +1 2 +1 2 +values (1,2),(3,4) +intersect +values (1,2) +union +values (1,2); +1 2 +1 2 +values (1,2),(3,4) +intersect +values (1,2) +union +values (3,4); +1 2 +1 2 +3 4 +values (1,2),(3,4) +union +values (1,2) +intersect +values (1,2); +1 2 +1 2 +3 4 +# combination of different structures that uses VALUES structures : UNION ALL + INTERSECT +values (1,2),(3,4) +intersect +select 1,2 +union all +values (1,2); +1 2 +1 2 +1 2 +values (1,2),(3,4) +intersect +values (1,2) +union all +values (1,2); +1 2 +1 2 +1 2 +values (1,2),(3,4) +intersect +values (1,2) +union all +values (3,4); +1 2 +1 2 +3 4 +values (1,2),(3,4) +union all +values (1,2) +intersect +values (1,2); +1 2 +1 2 +3 4 +1 2 +# combination of different structures that uses VALUES structures : UNION + UNION ALL +values (1,2),(3,4) +union all +select 1,2 +union +values (1,2); +1 2 +1 2 +3 4 +values (1,2),(3,4) +union all +values (1,2) +union +values (1,2); +1 2 +1 2 +3 4 +values (1,2),(3,4) +union all +values (1,2) +union +values (3,4); +1 2 +1 2 +3 4 +values (1,2),(3,4) +union +values (1,2) +union all +values (1,2); +1 2 +1 2 +3 4 +1 2 +values (1,2) +union +values (1,2) +union all +values (1,2); +1 2 +1 2 +1 2 +# CTE that uses VALUES structure(s) : non-recursive CTE +with t2 as +( +values (1,2),(3,4) +) +select * from t2; +1 2 +1 2 +3 4 +with t2 as +( +select 1,2 +union +values (1,2) +) +select * from t2; +1 2 +1 2 +with t2 as +( +select 1,2 +union +values (1,2),(3,4) +) +select * from t2; +1 2 +1 2 +3 4 +with t2 as +( +values (1,2) +union +select 1,2 +) +select * from t2; +1 2 +1 2 +with t2 as +( +values (1,2),(3,4) +union +select 1,2 +) +select * from t2; +1 2 +1 2 +3 4 +with t2 as +( +values (5,6) +union +values (1,2),(3,4) +) +select * from t2; +5 6 +5 6 +1 2 +3 4 +with t2 as +( +values (1,2) +union +values (1,2),(3,4) +) +select * from t2; +1 2 +1 2 +3 4 +with t2 as +( +select 1,2 +union all +values (1,2),(3,4) +) +select * from t2; +1 2 +1 2 +1 2 +3 4 +with t2 as +( +values (1,2),(3,4) +union all +select 1,2 +) +select * from t2; +1 2 +1 2 +3 4 +1 2 +with t2 as +( +values (1,2) +union all +values (1,2),(3,4) +) +select * from t2; +1 2 +1 2 +1 2 +3 4 +# recursive CTE that uses VALUES structure(s) : singe VALUES structure as anchor +with recursive t2(a,b) as +( +values(1,1) +union +select t1.a, t1.b +from t1,t2 +where t1.a=t2.a +) +select * from t2; +a b +1 1 +1 2 +with recursive t2(a,b) as +( +values(1,1) +union +select t1.a+1, t1.b +from t1,t2 +where t1.a=t2.a +) +select * from t2; +a b +1 1 +2 2 +2 1 +3 5 +# recursive CTE that uses VALUES structure(s) : several VALUES structures as anchors +with recursive t2(a,b) as +( +values(1,1) +union +values (3,4) +union +select t2.a+1, t1.b +from t1,t2 +where t1.a=t2.a +) +select * from t2; +a b +1 1 +3 4 +2 2 +2 1 +3 5 +# recursive CTE that uses VALUES structure(s) : that uses UNION ALL +with recursive t2(a,b,st) as +( +values(1,1,1) +union all +select t2.a, t1.b, t2.st+1 +from t1,t2 +where t1.a=t2.a and st<3 +) +select * from t2; +a b st +1 1 1 +1 2 2 +1 1 2 +1 2 3 +1 2 3 +1 1 3 +1 1 3 +# recursive CTE that uses VALUES structure(s) : computation of factorial (first 10 elements) +with recursive fact(n,f) as +( +values(1,1) +union +select n+1,f*n from fact where n < 10 +) +select * from fact; +n f +1 1 +2 1 +3 2 +4 6 +5 24 +6 120 +7 720 +8 5040 +9 40320 +10 362880 +# Derived table that uses VALUES structure(s) : singe VALUES structure +select * from (values (1,2),(3,4)) as t2; +1 2 +1 2 +3 4 +# Derived table that uses VALUES structure(s) : UNION with VALUES structure(s) +select * from (select 1,2 union values (1,2)) as t2; +1 2 +1 2 +select * from (select 1,2 union values (1,2),(3,4)) as t2; +1 2 +1 2 +3 4 +select * from (values (1,2) union select 1,2) as t2; +1 2 +1 2 +select * from (values (1,2),(3,4) union select 1,2) as t2; +1 2 +1 2 +3 4 +select * from (values (5,6) union values (1,2),(3,4)) as t2; +5 6 +5 6 +1 2 +3 4 +select * from (values (1,2) union values (1,2),(3,4)) as t2; +1 2 +1 2 +3 4 +# Derived table that uses VALUES structure(s) : UNION ALL with VALUES structure(s) +select * from (select 1,2 union all values (1,2),(3,4)) as t2; +1 2 +1 2 +1 2 +3 4 +select * from (values (1,2),(3,4) union all select 1,2) as t2; +1 2 +1 2 +3 4 +1 2 +select * from (values (1,2) union all values (1,2),(3,4)) as t2; +1 2 +1 2 +1 2 +3 4 +# CREATE VIEW that uses VALUES structure(s) : singe VALUES structure +create view v1 as values (1,2),(3,4); +select * from v1; +1 2 +1 2 +3 4 +drop view v1; +# CREATE VIEW that uses VALUES structure(s) : UNION with VALUES structure(s) +create view v1 as +select 1,2 +union +values (1,2); +select * from v1; +1 2 +1 2 +drop view v1; +create view v1 as +select 1,2 +union +values (1,2),(3,4); +select * from v1; +1 2 +1 2 +3 4 +drop view v1; +create view v1 as +values (1,2) +union +select 1,2; +select * from v1; +1 2 +1 2 +drop view v1; +create view v1 as +values (1,2),(3,4) +union +select 1,2; +select * from v1; +1 2 +1 2 +3 4 +drop view v1; +create view v1 as +values (5,6) +union +values (1,2),(3,4); +select * from v1; +5 6 +5 6 +1 2 +3 4 +drop view v1; +# CREATE VIEW that uses VALUES structure(s) : UNION ALL with VALUES structure(s) +create view v1 as +values (1,2) +union +values (1,2),(3,4); +select * from v1; +1 2 +1 2 +3 4 +drop view v1; +create view v1 as +select 1,2 +union all +values (1,2),(3,4); +select * from v1; +1 2 +1 2 +1 2 +3 4 +drop view v1; +create view v1 as +values (1,2),(3,4) +union all +select 1,2; +select * from v1; +1 2 +1 2 +3 4 +1 2 +drop view v1; +create view v1 as +values (1,2) +union all +values (1,2),(3,4); +select * from v1; +1 2 +1 2 +1 2 +3 4 +drop view v1; +# IN-subquery with VALUES structure(s) : simple case +select * from t1 +where a in (values (1)); +a b +1 2 +1 1 +select * from t1 +where a in (select * from (values (1)) as tvc_0); +a b +1 2 +1 1 +explain extended select * from t1 +where a in (values (1)); +id select_type table type possible_keys key key_len ref rows filtered Extra +1 PRIMARY <subquery3> ALL distinct_key NULL NULL NULL 2 100.00 +1 PRIMARY t1 ALL NULL NULL NULL NULL 6 100.00 Using where; Using join buffer (flat, BNL join) +3 MATERIALIZED <derived2> ALL NULL NULL NULL NULL 2 100.00 +2 DERIVED NULL NULL NULL NULL NULL NULL NULL NULL No tables used +Warnings: +Note 1003 select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` semi join ((values (1)) `tvc_0`) where `test`.`t1`.`a` = `tvc_0`.`1` +explain extended select * from t1 +where a in (select * from (values (1)) as tvc_0); +id select_type table type possible_keys key key_len ref rows filtered Extra +1 PRIMARY <subquery2> ALL distinct_key NULL NULL NULL 2 100.00 +1 PRIMARY t1 ALL NULL NULL NULL NULL 6 100.00 Using where; Using join buffer (flat, BNL join) +2 MATERIALIZED <derived3> ALL NULL NULL NULL NULL 2 100.00 +3 DERIVED NULL NULL NULL NULL NULL NULL NULL NULL No tables used +Warnings: +Note 1003 /* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` semi join ((values (1)) `tvc_0`) where `test`.`t1`.`a` = `tvc_0`.`1` +# IN-subquery with VALUES structure(s) : UNION with VALUES on the first place +select * from t1 +where a in (values (1) union select 2); +a b +1 2 +1 1 +2 5 +select * from t1 +where a in (select * from (values (1)) as tvc_0 union +select 2); +a b +1 2 +1 1 +2 5 +explain extended select * from t1 +where a in (values (1) union select 2); +id select_type table type possible_keys key key_len ref rows filtered Extra +1 PRIMARY t1 ALL NULL NULL NULL NULL 6 100.00 Using where +4 DEPENDENT SUBQUERY <derived2> ref key0 key0 4 func 2 100.00 +2 DERIVED NULL NULL NULL NULL NULL NULL NULL NULL No tables used +3 DEPENDENT UNION NULL NULL NULL NULL NULL NULL NULL NULL No tables used +NULL UNION RESULT <union4,3> ALL NULL NULL NULL NULL NULL NULL +Warnings: +Note 1003 /* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where <expr_cache><`test`.`t1`.`a`>(<in_optimizer>(`test`.`t1`.`a`,<exists>(/* select#4 */ select `tvc_0`.`1` from (values (1)) `tvc_0` where <cache>(`test`.`t1`.`a`) = `tvc_0`.`1` union /* select#3 */ select 2 having <cache>(`test`.`t1`.`a`) = <ref_null_helper>(2)))) +explain extended select * from t1 +where a in (select * from (values (1)) as tvc_0 union +select 2); +id select_type table type possible_keys key key_len ref rows filtered Extra +1 PRIMARY t1 ALL NULL NULL NULL NULL 6 100.00 Using where +2 DEPENDENT SUBQUERY <derived3> ref key0 key0 4 func 2 100.00 +3 DERIVED NULL NULL NULL NULL NULL NULL NULL NULL No tables used +4 DEPENDENT UNION NULL NULL NULL NULL NULL NULL NULL NULL No tables used +NULL UNION RESULT <union2,4> ALL NULL NULL NULL NULL NULL NULL +Warnings: +Note 1003 /* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where <expr_cache><`test`.`t1`.`a`>(<in_optimizer>(`test`.`t1`.`a`,<exists>(/* select#2 */ select `tvc_0`.`1` from (values (1)) `tvc_0` where <cache>(`test`.`t1`.`a`) = `tvc_0`.`1` union /* select#4 */ select 2 having <cache>(`test`.`t1`.`a`) = <ref_null_helper>(2)))) +# IN-subquery with VALUES structure(s) : UNION with VALUES on the second place +select * from t1 +where a in (select 2 union values (1)); +a b +1 2 +1 1 +2 5 +select * from t1 +where a in (select 2 union +select * from (values (1)) tvc_0); +a b +1 2 +1 1 +2 5 +explain extended select * from t1 +where a in (select 2 union values (1)); +id select_type table type possible_keys key key_len ref rows filtered Extra +1 PRIMARY t1 ALL NULL NULL NULL NULL 6 100.00 Using where +2 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL NULL No tables used +4 DEPENDENT UNION <derived3> ref key0 key0 4 func 2 100.00 +3 DERIVED NULL NULL NULL NULL NULL NULL NULL NULL No tables used +NULL UNION RESULT <union2,4> ALL NULL NULL NULL NULL NULL NULL +Warnings: +Note 1003 /* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where <expr_cache><`test`.`t1`.`a`>(<in_optimizer>(`test`.`t1`.`a`,<exists>(/* select#2 */ select 2 having <cache>(`test`.`t1`.`a`) = <ref_null_helper>(2) union /* select#4 */ select `tvc_0`.`1` from (values (1)) `tvc_0` where <cache>(`test`.`t1`.`a`) = `tvc_0`.`1`))) +explain extended select * from t1 +where a in (select 2 union +select * from (values (1)) tvc_0); +id select_type table type possible_keys key key_len ref rows filtered Extra +1 PRIMARY t1 ALL NULL NULL NULL NULL 6 100.00 Using where +2 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL NULL No tables used +3 DEPENDENT UNION <derived4> ref key0 key0 4 func 2 100.00 +4 DERIVED NULL NULL NULL NULL NULL NULL NULL NULL No tables used +NULL UNION RESULT <union2,3> ALL NULL NULL NULL NULL NULL NULL +Warnings: +Note 1003 /* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where <expr_cache><`test`.`t1`.`a`>(<in_optimizer>(`test`.`t1`.`a`,<exists>(/* select#2 */ select 2 having <cache>(`test`.`t1`.`a`) = <ref_null_helper>(2) union /* select#3 */ select `tvc_0`.`1` from (values (1)) `tvc_0` where <cache>(`test`.`t1`.`a`) = `tvc_0`.`1`))) +# IN-subquery with VALUES structure(s) : UNION ALL +select * from t1 +where a in (values (1) union all select b from t1); +a b +1 2 +1 1 +2 5 +7 8 +select * from t1 +where a in (select * from (values (1)) as tvc_0 union all +select b from t1); +a b +1 2 +1 1 +2 5 +7 8 +explain extended select * from t1 +where a in (values (1) union all select b from t1); +id select_type table type possible_keys key key_len ref rows filtered Extra +1 PRIMARY t1 ALL NULL NULL NULL NULL 6 100.00 Using where +4 DEPENDENT SUBQUERY <derived2> ref key0 key0 4 func 2 100.00 +2 DERIVED NULL NULL NULL NULL NULL NULL NULL NULL No tables used +3 DEPENDENT UNION t1 ALL NULL NULL NULL NULL 6 100.00 Using where +Warnings: +Note 1003 /* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where <expr_cache><`test`.`t1`.`a`>(<in_optimizer>(`test`.`t1`.`a`,<exists>(/* select#4 */ select `tvc_0`.`1` from (values (1)) `tvc_0` where <cache>(`test`.`t1`.`a`) = `tvc_0`.`1` union all /* select#3 */ select `test`.`t1`.`b` from `test`.`t1` where <cache>(`test`.`t1`.`a`) = `test`.`t1`.`b`))) +explain extended select * from t1 +where a in (select * from (values (1)) as tvc_0 union all +select b from t1); +id select_type table type possible_keys key key_len ref rows filtered Extra +1 PRIMARY t1 ALL NULL NULL NULL NULL 6 100.00 Using where +2 DEPENDENT SUBQUERY <derived3> ref key0 key0 4 func 2 100.00 +3 DERIVED NULL NULL NULL NULL NULL NULL NULL NULL No tables used +4 DEPENDENT UNION t1 ALL NULL NULL NULL NULL 6 100.00 Using where +Warnings: +Note 1003 /* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where <expr_cache><`test`.`t1`.`a`>(<in_optimizer>(`test`.`t1`.`a`,<exists>(/* select#2 */ select `tvc_0`.`1` from (values (1)) `tvc_0` where <cache>(`test`.`t1`.`a`) = `tvc_0`.`1` union all /* select#4 */ select `test`.`t1`.`b` from `test`.`t1` where <cache>(`test`.`t1`.`a`) = `test`.`t1`.`b`))) +# NOT IN subquery with VALUES structure(s) : simple case +select * from t1 +where a not in (values (1),(2)); +a b +4 6 +9 7 +7 8 +select * from t1 +where a not in (select * from (values (1),(2)) as tvc_0); +a b +4 6 +9 7 +7 8 +explain extended select * from t1 +where a not in (values (1),(2)); +id select_type table type possible_keys key key_len ref rows filtered Extra +1 PRIMARY t1 ALL NULL NULL NULL NULL 6 100.00 Using where +3 MATERIALIZED <derived2> ALL NULL NULL NULL NULL 2 100.00 +2 DERIVED NULL NULL NULL NULL NULL NULL NULL NULL No tables used +Warnings: +Note 1003 /* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where !<expr_cache><`test`.`t1`.`a`>(<in_optimizer>(`test`.`t1`.`a`,`test`.`t1`.`a` in ( <materialize> (/* select#3 */ select `tvc_0`.`1` from (values (1),(2)) `tvc_0` ), <primary_index_lookup>(`test`.`t1`.`a` in <temporary table> on distinct_key where `test`.`t1`.`a` = `<subquery3>`.`1`)))) +explain extended select * from t1 +where a not in (select * from (values (1),(2)) as tvc_0); +id select_type table type possible_keys key key_len ref rows filtered Extra +1 PRIMARY t1 ALL NULL NULL NULL NULL 6 100.00 Using where +2 MATERIALIZED <derived3> ALL NULL NULL NULL NULL 2 100.00 +3 DERIVED NULL NULL NULL NULL NULL NULL NULL NULL No tables used +Warnings: +Note 1003 /* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where !<expr_cache><`test`.`t1`.`a`>(<in_optimizer>(`test`.`t1`.`a`,`test`.`t1`.`a` in ( <materialize> (/* select#2 */ select `tvc_0`.`1` from (values (1),(2)) `tvc_0` ), <primary_index_lookup>(`test`.`t1`.`a` in <temporary table> on distinct_key where `test`.`t1`.`a` = `<subquery2>`.`1`)))) +# NOT IN subquery with VALUES structure(s) : UNION with VALUES on the first place +select * from t1 +where a not in (values (1) union select 2); +a b +4 6 +9 7 +7 8 +select * from t1 +where a not in (select * from (values (1)) as tvc_0 union +select 2); +a b +4 6 +9 7 +7 8 +explain extended select * from t1 +where a not in (values (1) union select 2); +id select_type table type possible_keys key key_len ref rows filtered Extra +1 PRIMARY t1 ALL NULL NULL NULL NULL 6 100.00 Using where +4 DEPENDENT SUBQUERY <derived2> ALL NULL NULL NULL NULL 2 100.00 Using where +2 DERIVED NULL NULL NULL NULL NULL NULL NULL NULL No tables used +3 DEPENDENT UNION NULL NULL NULL NULL NULL NULL NULL NULL No tables used +NULL UNION RESULT <union4,3> ALL NULL NULL NULL NULL NULL NULL +Warnings: +Note 1003 /* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where !<expr_cache><`test`.`t1`.`a`>(<in_optimizer>(`test`.`t1`.`a`,<exists>(/* select#4 */ select `tvc_0`.`1` from (values (1)) `tvc_0` where trigcond(<cache>(`test`.`t1`.`a`) = `tvc_0`.`1`) union /* select#3 */ select 2 having trigcond(<cache>(`test`.`t1`.`a`) = <ref_null_helper>(2))))) +explain extended select * from t1 +where a not in (select * from (values (1)) as tvc_0 union +select 2); +id select_type table type possible_keys key key_len ref rows filtered Extra +1 PRIMARY t1 ALL NULL NULL NULL NULL 6 100.00 Using where +2 DEPENDENT SUBQUERY <derived3> ALL NULL NULL NULL NULL 2 100.00 Using where +3 DERIVED NULL NULL NULL NULL NULL NULL NULL NULL No tables used +4 DEPENDENT UNION NULL NULL NULL NULL NULL NULL NULL NULL No tables used +NULL UNION RESULT <union2,4> ALL NULL NULL NULL NULL NULL NULL +Warnings: +Note 1003 /* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where !<expr_cache><`test`.`t1`.`a`>(<in_optimizer>(`test`.`t1`.`a`,<exists>(/* select#2 */ select `tvc_0`.`1` from (values (1)) `tvc_0` where trigcond(<cache>(`test`.`t1`.`a`) = `tvc_0`.`1`) union /* select#4 */ select 2 having trigcond(<cache>(`test`.`t1`.`a`) = <ref_null_helper>(2))))) +# NOT IN subquery with VALUES structure(s) : UNION with VALUES on the second place +select * from t1 +where a not in (select 2 union values (1)); +a b +4 6 +9 7 +7 8 +select * from t1 +where a not in (select 2 union +select * from (values (1)) as tvc_0); +a b +4 6 +9 7 +7 8 +explain extended select * from t1 +where a not in (select 2 union values (1)); +id select_type table type possible_keys key key_len ref rows filtered Extra +1 PRIMARY t1 ALL NULL NULL NULL NULL 6 100.00 Using where +2 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL NULL No tables used +4 DEPENDENT UNION <derived3> ALL NULL NULL NULL NULL 2 100.00 Using where +3 DERIVED NULL NULL NULL NULL NULL NULL NULL NULL No tables used +NULL UNION RESULT <union2,4> ALL NULL NULL NULL NULL NULL NULL +Warnings: +Note 1003 /* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where !<expr_cache><`test`.`t1`.`a`>(<in_optimizer>(`test`.`t1`.`a`,<exists>(/* select#2 */ select 2 having trigcond(<cache>(`test`.`t1`.`a`) = <ref_null_helper>(2)) union /* select#4 */ select `tvc_0`.`1` from (values (1)) `tvc_0` where trigcond(<cache>(`test`.`t1`.`a`) = `tvc_0`.`1`)))) +explain extended select * from t1 +where a not in (select 2 union +select * from (values (1)) as tvc_0); +id select_type table type possible_keys key key_len ref rows filtered Extra +1 PRIMARY t1 ALL NULL NULL NULL NULL 6 100.00 Using where +2 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL NULL No tables used +3 DEPENDENT UNION <derived4> ALL NULL NULL NULL NULL 2 100.00 Using where +4 DERIVED NULL NULL NULL NULL NULL NULL NULL NULL No tables used +NULL UNION RESULT <union2,3> ALL NULL NULL NULL NULL NULL NULL +Warnings: +Note 1003 /* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where !<expr_cache><`test`.`t1`.`a`>(<in_optimizer>(`test`.`t1`.`a`,<exists>(/* select#2 */ select 2 having trigcond(<cache>(`test`.`t1`.`a`) = <ref_null_helper>(2)) union /* select#3 */ select `tvc_0`.`1` from (values (1)) `tvc_0` where trigcond(<cache>(`test`.`t1`.`a`) = `tvc_0`.`1`)))) +# ANY-subquery with VALUES structure(s) : simple case +select * from t1 +where a = any (values (1),(2)); +a b +1 2 +1 1 +2 5 +select * from t1 +where a = any (select * from (values (1),(2)) as tvc_0); +a b +1 2 +1 1 +2 5 +explain extended select * from t1 +where a = any (values (1),(2)); +id select_type table type possible_keys key key_len ref rows filtered Extra +1 PRIMARY <subquery3> ALL distinct_key NULL NULL NULL 2 100.00 +1 PRIMARY t1 ALL NULL NULL NULL NULL 6 100.00 Using where; Using join buffer (flat, BNL join) +3 MATERIALIZED <derived2> ALL NULL NULL NULL NULL 2 100.00 +2 DERIVED NULL NULL NULL NULL NULL NULL NULL NULL No tables used +Warnings: +Note 1003 select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` semi join ((values (1),(2)) `tvc_0`) where `test`.`t1`.`a` = `tvc_0`.`1` +explain extended select * from t1 +where a = any (select * from (values (1),(2)) as tvc_0); +id select_type table type possible_keys key key_len ref rows filtered Extra +1 PRIMARY <subquery2> ALL distinct_key NULL NULL NULL 2 100.00 +1 PRIMARY t1 ALL NULL NULL NULL NULL 6 100.00 Using where; Using join buffer (flat, BNL join) +2 MATERIALIZED <derived3> ALL NULL NULL NULL NULL 2 100.00 +3 DERIVED NULL NULL NULL NULL NULL NULL NULL NULL No tables used +Warnings: +Note 1003 /* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` semi join ((values (1),(2)) `tvc_0`) where `test`.`t1`.`a` = `tvc_0`.`1` +# ANY-subquery with VALUES structure(s) : UNION with VALUES on the first place +select * from t1 +where a = any (values (1) union select 2); +a b +1 2 +1 1 +2 5 +select * from t1 +where a = any (select * from (values (1)) as tvc_0 union +select 2); +a b +1 2 +1 1 +2 5 +explain extended select * from t1 +where a = any (values (1) union select 2); +id select_type table type possible_keys key key_len ref rows filtered Extra +1 PRIMARY t1 ALL NULL NULL NULL NULL 6 100.00 Using where +4 DEPENDENT SUBQUERY <derived2> ref key0 key0 4 func 2 100.00 +2 DERIVED NULL NULL NULL NULL NULL NULL NULL NULL No tables used +3 DEPENDENT UNION NULL NULL NULL NULL NULL NULL NULL NULL No tables used +NULL UNION RESULT <union4,3> ALL NULL NULL NULL NULL NULL NULL +Warnings: +Note 1003 /* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where <expr_cache><`test`.`t1`.`a`>(<in_optimizer>(`test`.`t1`.`a`,<exists>(/* select#4 */ select `tvc_0`.`1` from (values (1)) `tvc_0` where <cache>(`test`.`t1`.`a`) = `tvc_0`.`1` union /* select#3 */ select 2 having <cache>(`test`.`t1`.`a`) = <ref_null_helper>(2)))) +explain extended select * from t1 +where a = any (select * from (values (1)) as tvc_0 union +select 2); +id select_type table type possible_keys key key_len ref rows filtered Extra +1 PRIMARY t1 ALL NULL NULL NULL NULL 6 100.00 Using where +2 DEPENDENT SUBQUERY <derived3> ref key0 key0 4 func 2 100.00 +3 DERIVED NULL NULL NULL NULL NULL NULL NULL NULL No tables used +4 DEPENDENT UNION NULL NULL NULL NULL NULL NULL NULL NULL No tables used +NULL UNION RESULT <union2,4> ALL NULL NULL NULL NULL NULL NULL +Warnings: +Note 1003 /* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where <expr_cache><`test`.`t1`.`a`>(<in_optimizer>(`test`.`t1`.`a`,<exists>(/* select#2 */ select `tvc_0`.`1` from (values (1)) `tvc_0` where <cache>(`test`.`t1`.`a`) = `tvc_0`.`1` union /* select#4 */ select 2 having <cache>(`test`.`t1`.`a`) = <ref_null_helper>(2)))) +# ANY-subquery with VALUES structure(s) : UNION with VALUES on the second place +select * from t1 +where a = any (select 2 union values (1)); +a b +1 2 +1 1 +2 5 +select * from t1 +where a = any (select 2 union +select * from (values (1)) as tvc_0); +a b +1 2 +1 1 +2 5 +explain extended select * from t1 +where a = any (select 2 union values (1)); +id select_type table type possible_keys key key_len ref rows filtered Extra +1 PRIMARY t1 ALL NULL NULL NULL NULL 6 100.00 Using where +2 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL NULL No tables used +4 DEPENDENT UNION <derived3> ref key0 key0 4 func 2 100.00 +3 DERIVED NULL NULL NULL NULL NULL NULL NULL NULL No tables used +NULL UNION RESULT <union2,4> ALL NULL NULL NULL NULL NULL NULL +Warnings: +Note 1003 /* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where <expr_cache><`test`.`t1`.`a`>(<in_optimizer>(`test`.`t1`.`a`,<exists>(/* select#2 */ select 2 having <cache>(`test`.`t1`.`a`) = <ref_null_helper>(2) union /* select#4 */ select `tvc_0`.`1` from (values (1)) `tvc_0` where <cache>(`test`.`t1`.`a`) = `tvc_0`.`1`))) +explain extended select * from t1 +where a = any (select 2 union +select * from (values (1)) as tvc_0); +id select_type table type possible_keys key key_len ref rows filtered Extra +1 PRIMARY t1 ALL NULL NULL NULL NULL 6 100.00 Using where +2 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL NULL No tables used +3 DEPENDENT UNION <derived4> ref key0 key0 4 func 2 100.00 +4 DERIVED NULL NULL NULL NULL NULL NULL NULL NULL No tables used +NULL UNION RESULT <union2,3> ALL NULL NULL NULL NULL NULL NULL +Warnings: +Note 1003 /* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where <expr_cache><`test`.`t1`.`a`>(<in_optimizer>(`test`.`t1`.`a`,<exists>(/* select#2 */ select 2 having <cache>(`test`.`t1`.`a`) = <ref_null_helper>(2) union /* select#3 */ select `tvc_0`.`1` from (values (1)) `tvc_0` where <cache>(`test`.`t1`.`a`) = `tvc_0`.`1`))) +# ALL-subquery with VALUES structure(s) : simple case +select * from t1 +where a = all (values (1)); +a b +1 2 +1 1 +select * from t1 +where a = all (select * from (values (1)) as tvc_0); +a b +1 2 +1 1 +explain extended select * from t1 +where a = all (values (1)); +id select_type table type possible_keys key key_len ref rows filtered Extra +1 PRIMARY t1 ALL NULL NULL NULL NULL 6 100.00 Using where +3 DEPENDENT SUBQUERY <derived2> ALL NULL NULL NULL NULL 2 100.00 Using where +2 DERIVED NULL NULL NULL NULL NULL NULL NULL NULL No tables used +Warnings: +Note 1003 /* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where <not>(<expr_cache><`test`.`t1`.`a`>(<in_optimizer>(`test`.`t1`.`a`,<exists>(/* select#3 */ select `tvc_0`.`1` from (values (1)) `tvc_0` where trigcond(<cache>(`test`.`t1`.`a`) <> `tvc_0`.`1`))))) +explain extended select * from t1 +where a = all (select * from (values (1)) as tvc_0); +id select_type table type possible_keys key key_len ref rows filtered Extra +1 PRIMARY t1 ALL NULL NULL NULL NULL 6 100.00 Using where +2 DEPENDENT SUBQUERY <derived3> ALL NULL NULL NULL NULL 2 100.00 Using where +3 DERIVED NULL NULL NULL NULL NULL NULL NULL NULL No tables used +Warnings: +Note 1003 /* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where <not>(<expr_cache><`test`.`t1`.`a`>(<in_optimizer>(`test`.`t1`.`a`,<exists>(/* select#2 */ select `tvc_0`.`1` from (values (1)) `tvc_0` where trigcond(<cache>(`test`.`t1`.`a`) <> `tvc_0`.`1`))))) +# ALL-subquery with VALUES structure(s) : UNION with VALUES on the first place +select * from t1 +where a = all (values (1) union select 1); +a b +1 2 +1 1 +select * from t1 +where a = all (select * from (values (1)) as tvc_0 union +select 1); +a b +1 2 +1 1 +explain extended select * from t1 +where a = all (values (1) union select 1); +id select_type table type possible_keys key key_len ref rows filtered Extra +1 PRIMARY t1 ALL NULL NULL NULL NULL 6 100.00 Using where +4 DEPENDENT SUBQUERY <derived2> ALL NULL NULL NULL NULL 2 100.00 Using where +2 DERIVED NULL NULL NULL NULL NULL NULL NULL NULL No tables used +3 DEPENDENT UNION NULL NULL NULL NULL NULL NULL NULL NULL No tables used +NULL UNION RESULT <union4,3> ALL NULL NULL NULL NULL NULL NULL +Warnings: +Note 1003 /* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where <not>(<expr_cache><`test`.`t1`.`a`>(<in_optimizer>(`test`.`t1`.`a`,<exists>(/* select#4 */ select `tvc_0`.`1` from (values (1)) `tvc_0` where trigcond(<cache>(`test`.`t1`.`a`) <> `tvc_0`.`1`) union /* select#3 */ select 1 having trigcond(<cache>(`test`.`t1`.`a`) <> <ref_null_helper>(1)))))) +explain extended select * from t1 +where a = all (select * from (values (1)) as tvc_0 union +select 1); +id select_type table type possible_keys key key_len ref rows filtered Extra +1 PRIMARY t1 ALL NULL NULL NULL NULL 6 100.00 Using where +2 DEPENDENT SUBQUERY <derived3> ALL NULL NULL NULL NULL 2 100.00 Using where +3 DERIVED NULL NULL NULL NULL NULL NULL NULL NULL No tables used +4 DEPENDENT UNION NULL NULL NULL NULL NULL NULL NULL NULL No tables used +NULL UNION RESULT <union2,4> ALL NULL NULL NULL NULL NULL NULL +Warnings: +Note 1003 /* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where <not>(<expr_cache><`test`.`t1`.`a`>(<in_optimizer>(`test`.`t1`.`a`,<exists>(/* select#2 */ select `tvc_0`.`1` from (values (1)) `tvc_0` where trigcond(<cache>(`test`.`t1`.`a`) <> `tvc_0`.`1`) union /* select#4 */ select 1 having trigcond(<cache>(`test`.`t1`.`a`) <> <ref_null_helper>(1)))))) +# ALL-subquery with VALUES structure(s) : UNION with VALUES on the second place +select * from t1 +where a = any (select 1 union values (1)); +a b +1 2 +1 1 +select * from t1 +where a = any (select 1 union +select * from (values (1)) as tvc_0); +a b +1 2 +1 1 +explain extended select * from t1 +where a = any (select 1 union values (1)); +id select_type table type possible_keys key key_len ref rows filtered Extra +1 PRIMARY t1 ALL NULL NULL NULL NULL 6 100.00 Using where +2 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL NULL No tables used +4 DEPENDENT UNION <derived3> ref key0 key0 4 func 2 100.00 +3 DERIVED NULL NULL NULL NULL NULL NULL NULL NULL No tables used +NULL UNION RESULT <union2,4> ALL NULL NULL NULL NULL NULL NULL +Warnings: +Note 1003 /* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where <expr_cache><`test`.`t1`.`a`>(<in_optimizer>(`test`.`t1`.`a`,<exists>(/* select#2 */ select 1 having <cache>(`test`.`t1`.`a`) = <ref_null_helper>(1) union /* select#4 */ select `tvc_0`.`1` from (values (1)) `tvc_0` where <cache>(`test`.`t1`.`a`) = `tvc_0`.`1`))) +explain extended select * from t1 +where a = any (select 1 union +select * from (values (1)) as tvc_0); +id select_type table type possible_keys key key_len ref rows filtered Extra +1 PRIMARY t1 ALL NULL NULL NULL NULL 6 100.00 Using where +2 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL NULL No tables used +3 DEPENDENT UNION <derived4> ref key0 key0 4 func 2 100.00 +4 DERIVED NULL NULL NULL NULL NULL NULL NULL NULL No tables used +NULL UNION RESULT <union2,3> ALL NULL NULL NULL NULL NULL NULL +Warnings: +Note 1003 /* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where <expr_cache><`test`.`t1`.`a`>(<in_optimizer>(`test`.`t1`.`a`,<exists>(/* select#2 */ select 1 having <cache>(`test`.`t1`.`a`) = <ref_null_helper>(1) union /* select#3 */ select `tvc_0`.`1` from (values (1)) `tvc_0` where <cache>(`test`.`t1`.`a`) = `tvc_0`.`1`))) +# prepare statement that uses VALUES structure(s): single VALUES structure +prepare stmt1 from " +values (1,2); +"; +execute stmt1; +1 2 +1 2 +execute stmt1; +1 2 +1 2 +deallocate prepare stmt1; +# prepare statement that uses VALUES structure(s): UNION with VALUES structure(s) +prepare stmt1 from " + select 1,2 + union + values (1,2),(3,4); +"; +execute stmt1; +1 2 +1 2 +3 4 +execute stmt1; +1 2 +1 2 +3 4 +deallocate prepare stmt1; +prepare stmt1 from " + values (1,2),(3,4) + union + select 1,2; +"; +execute stmt1; +1 2 +1 2 +3 4 +execute stmt1; +1 2 +1 2 +3 4 +deallocate prepare stmt1; +prepare stmt1 from " + select 1,2 + union + values (3,4) + union + values (1,2); +"; +execute stmt1; +1 2 +1 2 +3 4 +execute stmt1; +1 2 +1 2 +3 4 +deallocate prepare stmt1; +prepare stmt1 from " + values (5,6) + union + values (1,2),(3,4); +"; +execute stmt1; +5 6 +5 6 +1 2 +3 4 +execute stmt1; +5 6 +5 6 +1 2 +3 4 +deallocate prepare stmt1; +# prepare statement that uses VALUES structure(s): UNION ALL with VALUES structure(s) +prepare stmt1 from " + select 1,2 + union + values (1,2),(3,4); +"; +execute stmt1; +1 2 +1 2 +3 4 +execute stmt1; +1 2 +1 2 +3 4 +deallocate prepare stmt1; +prepare stmt1 from " + values (1,2),(3,4) + union all + select 1,2; +"; +execute stmt1; +1 2 +1 2 +3 4 +1 2 +execute stmt1; +1 2 +1 2 +3 4 +1 2 +deallocate prepare stmt1; +prepare stmt1 from " + select 1,2 + union all + values (3,4) + union all + values (1,2); +"; +execute stmt1; +1 2 +1 2 +3 4 +1 2 +execute stmt1; +1 2 +1 2 +3 4 +1 2 +deallocate prepare stmt1; +prepare stmt1 from " + values (1,2) + union all + values (1,2),(3,4); +"; +execute stmt1; +1 2 +1 2 +1 2 +3 4 +execute stmt1; +1 2 +1 2 +1 2 +3 4 +deallocate prepare stmt1; +# explain query that uses VALUES structure(s): single VALUES structure +explain +values (1,2); +id select_type table type possible_keys key key_len ref rows Extra +1 SIMPLE NULL NULL NULL NULL NULL NULL NULL No tables used +explain format=json +values (1,2); +EXPLAIN +{ + "query_block": { + "union_result": { + "table_name": "<unit1>", + "access_type": "ALL", + "query_specifications": [ + { + "query_block": { + "select_id": 1, + "table": { + "message": "No tables used" + } + } + } + ] + } + } +} +# explain query that uses VALUES structure(s): UNION with VALUES structure(s) +explain +select 1,2 +union +values (1,2),(3,4); +id select_type table type possible_keys key key_len ref rows Extra +1 PRIMARY NULL NULL NULL NULL NULL NULL NULL No tables used +2 UNION NULL NULL NULL NULL NULL NULL NULL No tables used +NULL UNION RESULT <union1,2> ALL NULL NULL NULL NULL NULL +explain +values (1,2),(3,4) +union +select 1,2; +id select_type table type possible_keys key key_len ref rows Extra +1 PRIMARY NULL NULL NULL NULL NULL NULL NULL No tables used +2 UNION NULL NULL NULL NULL NULL NULL NULL No tables used +NULL UNION RESULT <union1,2> ALL NULL NULL NULL NULL NULL +explain +values (5,6) +union +values (1,2),(3,4); +id select_type table type possible_keys key key_len ref rows Extra +1 PRIMARY NULL NULL NULL NULL NULL NULL NULL No tables used +2 UNION NULL NULL NULL NULL NULL NULL NULL No tables used +NULL UNION RESULT <union1,2> ALL NULL NULL NULL NULL NULL +explain format=json +select 1,2 +union +values (1,2),(3,4); +EXPLAIN +{ + "query_block": { + "union_result": { + "table_name": "<union1,2>", + "access_type": "ALL", + "query_specifications": [ + { + "query_block": { + "select_id": 1, + "table": { + "message": "No tables used" + } + } + }, + { + "query_block": { + "select_id": 2, + "operation": "UNION", + "table": { + "message": "No tables used" + } + } + } + ] + } + } +} +explain format=json +values (1,2),(3,4) +union +select 1,2; +EXPLAIN +{ + "query_block": { + "union_result": { + "table_name": "<union1,2>", + "access_type": "ALL", + "query_specifications": [ + { + "query_block": { + "select_id": 1, + "table": { + "message": "No tables used" + } + } + }, + { + "query_block": { + "select_id": 2, + "operation": "UNION", + "table": { + "message": "No tables used" + } + } + } + ] + } + } +} +explain format=json +values (5,6) +union +values (1,2),(3,4); +EXPLAIN +{ + "query_block": { + "union_result": { + "table_name": "<union1,2>", + "access_type": "ALL", + "query_specifications": [ + { + "query_block": { + "select_id": 1, + "table": { + "message": "No tables used" + } + } + }, + { + "query_block": { + "select_id": 2, + "operation": "UNION", + "table": { + "message": "No tables used" + } + } + } + ] + } + } +} +explain +select 1,2 +union +values (3,4) +union +values (1,2); +id select_type table type possible_keys key key_len ref rows Extra +1 PRIMARY NULL NULL NULL NULL NULL NULL NULL No tables used +2 UNION NULL NULL NULL NULL NULL NULL NULL No tables used +3 UNION NULL NULL NULL NULL NULL NULL NULL No tables used +NULL UNION RESULT <union1,2,3> ALL NULL NULL NULL NULL NULL +explain format=json +select 1,2 +union +values (3,4) +union +values (1,2); +EXPLAIN +{ + "query_block": { + "union_result": { + "table_name": "<union1,2,3>", + "access_type": "ALL", + "query_specifications": [ + { + "query_block": { + "select_id": 1, + "table": { + "message": "No tables used" + } + } + }, + { + "query_block": { + "select_id": 2, + "operation": "UNION", + "table": { + "message": "No tables used" + } + } + }, + { + "query_block": { + "select_id": 3, + "operation": "UNION", + "table": { + "message": "No tables used" + } + } + } + ] + } + } +} +# explain query that uses VALUES structure(s): UNION ALL with VALUES structure(s) +explain +select 1,2 +union +values (1,2),(3,4); +id select_type table type possible_keys key key_len ref rows Extra +1 PRIMARY NULL NULL NULL NULL NULL NULL NULL No tables used +2 UNION NULL NULL NULL NULL NULL NULL NULL No tables used +NULL UNION RESULT <union1,2> ALL NULL NULL NULL NULL NULL +explain +values (1,2),(3,4) +union all +select 1,2; +id select_type table type possible_keys key key_len ref rows Extra +1 PRIMARY NULL NULL NULL NULL NULL NULL NULL No tables used +2 UNION NULL NULL NULL NULL NULL NULL NULL No tables used +explain +values (1,2) +union all +values (1,2),(3,4); +id select_type table type possible_keys key key_len ref rows Extra +1 PRIMARY NULL NULL NULL NULL NULL NULL NULL No tables used +2 UNION NULL NULL NULL NULL NULL NULL NULL No tables used +explain format=json +values (1,2),(3,4) +union all +select 1,2; +EXPLAIN +{ + "query_block": { + "union_result": { + "table_name": "<union1,2>", + "access_type": "ALL", + "query_specifications": [ + { + "query_block": { + "select_id": 1, + "table": { + "message": "No tables used" + } + } + }, + { + "query_block": { + "select_id": 2, + "operation": "UNION", + "table": { + "message": "No tables used" + } + } + } + ] + } + } +} +explain format=json +select 1,2 +union +values (1,2),(3,4); +EXPLAIN +{ + "query_block": { + "union_result": { + "table_name": "<union1,2>", + "access_type": "ALL", + "query_specifications": [ + { + "query_block": { + "select_id": 1, + "table": { + "message": "No tables used" + } + } + }, + { + "query_block": { + "select_id": 2, + "operation": "UNION", + "table": { + "message": "No tables used" + } + } + } + ] + } + } +} +explain format=json +values (1,2) +union all +values (1,2),(3,4); +EXPLAIN +{ + "query_block": { + "union_result": { + "table_name": "<union1,2>", + "access_type": "ALL", + "query_specifications": [ + { + "query_block": { + "select_id": 1, + "table": { + "message": "No tables used" + } + } + }, + { + "query_block": { + "select_id": 2, + "operation": "UNION", + "table": { + "message": "No tables used" + } + } + } + ] + } + } +} +explain +select 1,2 +union all +values (3,4) +union all +values (1,2); +id select_type table type possible_keys key key_len ref rows Extra +1 PRIMARY NULL NULL NULL NULL NULL NULL NULL No tables used +2 UNION NULL NULL NULL NULL NULL NULL NULL No tables used +3 UNION NULL NULL NULL NULL NULL NULL NULL No tables used +explain format=json +select 1,2 +union all +values (3,4) +union all +values (1,2); +EXPLAIN +{ + "query_block": { + "union_result": { + "table_name": "<union1,2,3>", + "access_type": "ALL", + "query_specifications": [ + { + "query_block": { + "select_id": 1, + "table": { + "message": "No tables used" + } + } + }, + { + "query_block": { + "select_id": 2, + "operation": "UNION", + "table": { + "message": "No tables used" + } + } + }, + { + "query_block": { + "select_id": 3, + "operation": "UNION", + "table": { + "message": "No tables used" + } + } + } + ] + } + } +} +# analyze query that uses VALUES structure(s): single VALUES structure +analyze +values (1,2); +id select_type table type possible_keys key key_len ref rows r_rows filtered r_filtered Extra +1 SIMPLE NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL No tables used +analyze format=json +values (1,2); +ANALYZE +{ + "query_block": { + "union_result": { + "table_name": "<unit1>", + "access_type": "ALL", + "r_loops": 0, + "r_rows": null, + "query_specifications": [ + { + "query_block": { + "select_id": 1, + "table": { + "message": "No tables used" + } + } + } + ] + } + } +} +# analyze query that uses VALUES structure(s): UNION with VALUES structure(s) +analyze +select 1,2 +union +values (1,2),(3,4); +id select_type table type possible_keys key key_len ref rows r_rows filtered r_filtered Extra +1 PRIMARY NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL No tables used +2 UNION NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL No tables used +NULL UNION RESULT <union1,2> ALL NULL NULL NULL NULL NULL 2.00 NULL NULL +analyze +values (1,2),(3,4) +union +select 1,2; +id select_type table type possible_keys key key_len ref rows r_rows filtered r_filtered Extra +1 PRIMARY NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL No tables used +2 UNION NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL No tables used +NULL UNION RESULT <union1,2> ALL NULL NULL NULL NULL NULL 2.00 NULL NULL +analyze +values (5,6) +union +values (1,2),(3,4); +id select_type table type possible_keys key key_len ref rows r_rows filtered r_filtered Extra +1 PRIMARY NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL No tables used +2 UNION NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL No tables used +NULL UNION RESULT <union1,2> ALL NULL NULL NULL NULL NULL 3.00 NULL NULL +analyze format=json +select 1,2 +union +values (1,2),(3,4); +ANALYZE +{ + "query_block": { + "union_result": { + "table_name": "<union1,2>", + "access_type": "ALL", + "r_loops": 1, + "r_rows": 2, + "query_specifications": [ + { + "query_block": { + "select_id": 1, + "table": { + "message": "No tables used" + } + } + }, + { + "query_block": { + "select_id": 2, + "operation": "UNION", + "table": { + "message": "No tables used" + } + } + } + ] + } + } +} +analyze format=json +values (1,2),(3,4) +union +select 1,2; +ANALYZE +{ + "query_block": { + "union_result": { + "table_name": "<union1,2>", + "access_type": "ALL", + "r_loops": 1, + "r_rows": 2, + "query_specifications": [ + { + "query_block": { + "select_id": 1, + "table": { + "message": "No tables used" + } + } + }, + { + "query_block": { + "select_id": 2, + "operation": "UNION", + "table": { + "message": "No tables used" + } + } + } + ] + } + } +} +analyze format=json +values (5,6) +union +values (1,2),(3,4); +ANALYZE +{ + "query_block": { + "union_result": { + "table_name": "<union1,2>", + "access_type": "ALL", + "r_loops": 1, + "r_rows": 3, + "query_specifications": [ + { + "query_block": { + "select_id": 1, + "table": { + "message": "No tables used" + } + } + }, + { + "query_block": { + "select_id": 2, + "operation": "UNION", + "table": { + "message": "No tables used" + } + } + } + ] + } + } +} +analyze +select 1,2 +union +values (3,4) +union +values (1,2); +id select_type table type possible_keys key key_len ref rows r_rows filtered r_filtered Extra +1 PRIMARY NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL No tables used +2 UNION NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL No tables used +3 UNION NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL No tables used +NULL UNION RESULT <union1,2,3> ALL NULL NULL NULL NULL NULL 2.00 NULL NULL +analyze format=json +select 1,2 +union +values (3,4) +union +values (1,2); +ANALYZE +{ + "query_block": { + "union_result": { + "table_name": "<union1,2,3>", + "access_type": "ALL", + "r_loops": 1, + "r_rows": 2, + "query_specifications": [ + { + "query_block": { + "select_id": 1, + "table": { + "message": "No tables used" + } + } + }, + { + "query_block": { + "select_id": 2, + "operation": "UNION", + "table": { + "message": "No tables used" + } + } + }, + { + "query_block": { + "select_id": 3, + "operation": "UNION", + "table": { + "message": "No tables used" + } + } + } + ] + } + } +} +# analyze query that uses VALUES structure(s): UNION ALL with VALUES structure(s) +analyze +select 1,2 +union +values (1,2),(3,4); +id select_type table type possible_keys key key_len ref rows r_rows filtered r_filtered Extra +1 PRIMARY NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL No tables used +2 UNION NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL No tables used +NULL UNION RESULT <union1,2> ALL NULL NULL NULL NULL NULL 2.00 NULL NULL +analyze +values (1,2),(3,4) +union all +select 1,2; +id select_type table type possible_keys key key_len ref rows r_rows filtered r_filtered Extra +1 PRIMARY NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL No tables used +2 UNION NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL No tables used +analyze +values (1,2) +union all +values (1,2),(3,4); +id select_type table type possible_keys key key_len ref rows r_rows filtered r_filtered Extra +1 PRIMARY NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL No tables used +2 UNION NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL No tables used +analyze format=json +values (1,2),(3,4) +union all +select 1,2; +ANALYZE +{ + "query_block": { + "union_result": { + "table_name": "<union1,2>", + "access_type": "ALL", + "r_loops": 0, + "r_rows": null, + "query_specifications": [ + { + "query_block": { + "select_id": 1, + "table": { + "message": "No tables used" + } + } + }, + { + "query_block": { + "select_id": 2, + "operation": "UNION", + "table": { + "message": "No tables used" + } + } + } + ] + } + } +} +analyze format=json +select 1,2 +union +values (1,2),(3,4); +ANALYZE +{ + "query_block": { + "union_result": { + "table_name": "<union1,2>", + "access_type": "ALL", + "r_loops": 1, + "r_rows": 2, + "query_specifications": [ + { + "query_block": { + "select_id": 1, + "table": { + "message": "No tables used" + } + } + }, + { + "query_block": { + "select_id": 2, + "operation": "UNION", + "table": { + "message": "No tables used" + } + } + } + ] + } + } +} +analyze format=json +values (1,2) +union all +values (1,2),(3,4); +ANALYZE +{ + "query_block": { + "union_result": { + "table_name": "<union1,2>", + "access_type": "ALL", + "r_loops": 0, + "r_rows": null, + "query_specifications": [ + { + "query_block": { + "select_id": 1, + "table": { + "message": "No tables used" + } + } + }, + { + "query_block": { + "select_id": 2, + "operation": "UNION", + "table": { + "message": "No tables used" + } + } + } + ] + } + } +} +analyze +select 1,2 +union all +values (3,4) +union all +values (1,2); +id select_type table type possible_keys key key_len ref rows r_rows filtered r_filtered Extra +1 PRIMARY NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL No tables used +2 UNION NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL No tables used +3 UNION NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL No tables used +analyze format=json +select 1,2 +union all +values (3,4) +union all +values (1,2); +ANALYZE +{ + "query_block": { + "union_result": { + "table_name": "<union1,2,3>", + "access_type": "ALL", + "r_loops": 0, + "r_rows": null, + "query_specifications": [ + { + "query_block": { + "select_id": 1, + "table": { + "message": "No tables used" + } + } + }, + { + "query_block": { + "select_id": 2, + "operation": "UNION", + "table": { + "message": "No tables used" + } + } + }, + { + "query_block": { + "select_id": 3, + "operation": "UNION", + "table": { + "message": "No tables used" + } + } + } + ] + } + } +} +# different number of values in TVC +values (1,2),(3,4,5); +ERROR HY000: The used table value constructor has a different number of values +# illegal parameter data types in TVC +values (1,point(1,1)),(1,1); +ERROR HY000: Illegal parameter data types geometry and int for operation 'TABLE VALUE CONSTRUCTOR' +values (1,point(1,1)+1); +ERROR HY000: Illegal parameter data types geometry and int for operation '+' +# field reference in TVC +select * from (values (1), (b), (2)) as new_tvc; +ERROR HY000: Field reference 'b' can't be used in table value constructor +select * from (values (1), (t1.b), (2)) as new_tvc; +ERROR HY000: Field reference 't1.b' can't be used in table value constructor +drop table t1; diff --git a/mysql-test/r/trigger.result b/mysql-test/r/trigger.result index b751632307a..2b843f68499 100644 --- a/mysql-test/r/trigger.result +++ b/mysql-test/r/trigger.result @@ -2125,7 +2125,7 @@ SHOW TRIGGERS IN db1; Trigger Event Table Statement Timing Created sql_mode Definer character_set_client collation_connection Database Collation trg1 INSERT t2 CREATE DEFINER=`root`@`localhost` TRIGGER trg1 BEFORE INSERT ON t2 FOR EACH ROW INSERTINTOt1 VALUES (1) BEFORE # STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION latin1 latin1_swedish_ci latin1_swedish_ci INSERT INTO t2 VALUES (1); -ERROR 42000: Trigger 'trg1' has an error in its body: '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 'VALUES (1)' at line 1' +ERROR 42000: Trigger 'trg1' has an error in its body: '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 '(1)' at line 1' SELECT * FROM t1; b # Work around Bug#45235 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/r/variables.result b/mysql-test/r/variables.result index a0683e400ef..5a451982510 100644 --- a/mysql-test/r/variables.result +++ b/mysql-test/r/variables.result @@ -1624,7 +1624,7 @@ set session collation_database=2048; ERROR HY000: Unknown collation: '2048' set session rand_seed1=DEFAULT; ERROR 42000: Variable 'rand_seed1' doesn't have a default value -set autocommit = values(v); +set autocommit = value(v); ERROR 42S22: Unknown column 'v' in 'field list' set session sql_mode=ansi_quotes; select * from information_schema.session_variables where variable_name='sql_mode'; diff --git a/mysql-test/r/view.result b/mysql-test/r/view.result index 6eead303c7a..635323a5867 100644 --- a/mysql-test/r/view.result +++ b/mysql-test/r/view.result @@ -5637,7 +5637,7 @@ id select_type table type possible_keys key key_len ref rows filtered Extra 3 DEPENDENT SUBQUERY t2 ALL NULL NULL NULL NULL 6 100.00 Using where Warnings: Note 1276 Field or reference 'test.t1.a' of SELECT #3 was resolved in SELECT #2 -Note 1003 /* select#1 */ select `test`.`t1`.`a` AS `a`,(/* select#3 */ select max(`test`.`t2`.`b`) from `test`.`t2` where `test`.`t1`.`a` = `test`.`t2`.`a`) AS `c` from `test`.`t1` +Note 1003 /* select#1 */ select `test`.`t1`.`a` AS `a`,<expr_cache><`test`.`t1`.`a`>((/* select#3 */ select max(`test`.`t2`.`b`) from `test`.`t2` where `test`.`t1`.`a` = `test`.`t2`.`a`)) AS `c` from `test`.`t1` select * from v1; a c 1 2 @@ -5654,7 +5654,7 @@ id select_type table type possible_keys key key_len ref rows filtered Extra 3 DEPENDENT SUBQUERY t2 ALL NULL NULL NULL NULL 6 100.00 Using where Warnings: Note 1276 Field or reference 'test.t1.a' of SELECT #3 was resolved in SELECT #2 -Note 1003 /* select#1 */ select `test`.`t2`.`a` AS `a`,`test`.`t2`.`b` AS `b`,`test`.`t1`.`a` AS `a`,(/* select#3 */ select max(`test`.`t2`.`b`) from `test`.`t2` where `test`.`t1`.`a` = `test`.`t2`.`a`) AS `c` from `test`.`t2` join `test`.`t1` where `test`.`t1`.`a` = `test`.`t2`.`a` +Note 1003 /* select#1 */ select `test`.`t2`.`a` AS `a`,`test`.`t2`.`b` AS `b`,`test`.`t1`.`a` AS `a`,<expr_cache><`test`.`t1`.`a`>((/* select#3 */ select max(`test`.`t2`.`b`) from `test`.`t2` where `test`.`t1`.`a` = `test`.`t2`.`a`)) AS `c` from `test`.`t2` join `test`.`t1` where `test`.`t1`.`a` = `test`.`t2`.`a` select * from t2, v1 where t2.a=v1.a; a b a c 1 2 1 2 @@ -5673,7 +5673,7 @@ id select_type table type possible_keys key key_len ref rows filtered Extra 3 DEPENDENT SUBQUERY t2 ALL NULL NULL NULL NULL 6 100.00 Using where Warnings: Note 1276 Field or reference 'test.t1.a' of SELECT #3 was resolved in SELECT #2 -Note 1003 /* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b`,`test`.`t1`.`a` AS `a`,(/* select#3 */ select max(`test`.`t2`.`b`) from `test`.`t2` where `test`.`t1`.`a` = `test`.`t2`.`a`) AS `c` from `test`.`t1` join `test`.`t1` where `test`.`t1`.`a` = `test`.`t1`.`a` +Note 1003 /* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b`,`test`.`t1`.`a` AS `a`,<expr_cache><`test`.`t1`.`a`>((/* select#3 */ select max(`test`.`t2`.`b`) from `test`.`t2` where `test`.`t1`.`a` = `test`.`t2`.`a`)) AS `c` from `test`.`t1` join `test`.`t1` where `test`.`t1`.`a` = `test`.`t1`.`a` select * from t1, v1 where t1.a=v1.a; a b a c 1 2 1 2 @@ -5692,7 +5692,7 @@ id select_type table type possible_keys key key_len ref rows filtered Extra 3 DEPENDENT SUBQUERY t2 ALL NULL NULL NULL NULL 6 100.00 Using where Warnings: Note 1276 Field or reference 'test.t1.a' of SELECT #3 was resolved in SELECT #2 -Note 1003 /* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b`,`test`.`t1`.`a` AS `a`,(/* select#3 */ select max(`test`.`t2`.`b`) from `test`.`t2` where `test`.`t1`.`a` = `test`.`t2`.`a`) AS `c` from `test`.`t1` join `test`.`t1` where `test`.`t1`.`b` = (/* select#3 */ select max(`test`.`t2`.`b`) from `test`.`t2` where `test`.`t1`.`a` = `test`.`t2`.`a`) +Note 1003 /* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b`,`test`.`t1`.`a` AS `a`,<expr_cache><`test`.`t1`.`a`>((/* select#3 */ select max(`test`.`t2`.`b`) from `test`.`t2` where `test`.`t1`.`a` = `test`.`t2`.`a`)) AS `c` from `test`.`t1` join `test`.`t1` where `test`.`t1`.`b` = <expr_cache><`test`.`t1`.`a`>((/* select#3 */ select max(`test`.`t2`.`b`) from `test`.`t2` where `test`.`t1`.`a` = `test`.`t2`.`a`)) select * from t1, v1 where t1.b=v1.c; a b a c 1 2 1 2 @@ -5710,7 +5710,7 @@ id select_type table type possible_keys key key_len ref rows filtered Extra 3 DEPENDENT SUBQUERY t2 ALL NULL NULL NULL NULL 6 100.00 Using where Warnings: Note 1276 Field or reference 'test.t1.a' of SELECT #3 was resolved in SELECT #2 -Note 1003 /* select#1 */ select `test`.`t2`.`a` AS `a`,`test`.`t2`.`b` AS `b`,`test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b`,`test`.`t1`.`a` AS `a`,(/* select#3 */ select max(`test`.`t2`.`b`) from `test`.`t2` where `test`.`t1`.`a` = `test`.`t2`.`a`) AS `c` from `test`.`t2` join `test`.`t1` join `test`.`t1` where `test`.`t1`.`a` = `test`.`t2`.`a` and `test`.`t1`.`a` = `test`.`t2`.`a` +Note 1003 /* select#1 */ select `test`.`t2`.`a` AS `a`,`test`.`t2`.`b` AS `b`,`test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b`,`test`.`t1`.`a` AS `a`,<expr_cache><`test`.`t1`.`a`>((/* select#3 */ select max(`test`.`t2`.`b`) from `test`.`t2` where `test`.`t1`.`a` = `test`.`t2`.`a`)) AS `c` from `test`.`t2` join `test`.`t1` join `test`.`t1` where `test`.`t1`.`a` = `test`.`t2`.`a` and `test`.`t1`.`a` = `test`.`t2`.`a` select * from t2, t1, v1 where t1.a=t2.a and t1.a=v1.a; a b a b a c 1 2 1 2 1 2 diff --git a/mysql-test/r/win_percentile.result b/mysql-test/r/win_percentile.result new file mode 100644 index 00000000000..c51e2e6bd51 --- /dev/null +++ b/mysql-test/r/win_percentile.result @@ -0,0 +1,326 @@ +CREATE TABLE t1 (name CHAR(10), test double, score DECIMAL(19,4)); +INSERT INTO t1 VALUES +('Chun', 0, 3), ('Chun', 0, 7), +('Kaolin', 0.5, 3), ('Kaolin', 0.6, 7), +('Kaolin', 0.5, 4), +('Tatiana', 0.8, 4), ('Tata', 0.8, 4); +# +# Test invalid syntax +# +# Order by clause has more than one element +select percentile_disc(0.5) within group(order by score,test) over (partition by name) from t1; +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 'test) over (partition by name) from t1' at line 1 +select percentile_cont(0.5) within group(order by score,test) over (partition by name) from t1; +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 'test) over (partition by name) from t1' at line 1 +# Order by clause has no element +select percentile_disc(0.5) within group() over (partition by name) from t1; +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 ') over (partition by name) from t1' at line 1 +select percentile_cont(0.5) within group() over (partition by name) from t1; +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 ') over (partition by name) from t1' at line 1 +# No parameters to the percentile functions +select percentile_disc() within group() over (partition by name) from t1; +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 ') within group() over (partition by name) from t1' at line 1 +select percentile_cont() within group() over (partition by name) from t1; +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 ') within group() over (partition by name) from t1' at line 1 +# +# Test simple syntax +# +select name, percentile_cont(0.5) within group(order by score) over (partition by name) as c from t1; +name c +Chun 5.0000000000 +Chun 5.0000000000 +Kaolin 4.0000000000 +Kaolin 4.0000000000 +Kaolin 4.0000000000 +Tatiana 4.0000000000 +Tata 4.0000000000 +select name, percentile_disc(0.5) within group(order by score) over (partition by name) as c from t1; +name c +Chun 3.0000000000 +Chun 3.0000000000 +Kaolin 4.0000000000 +Kaolin 4.0000000000 +Kaolin 4.0000000000 +Tatiana 4.0000000000 +Tata 4.0000000000 +# no partition clause +select name, percentile_disc(0.5) within group(order by score) over () from t1; +name percentile_disc(0.5) within group(order by score) over () +Chun 4.0000000000 +Chun 4.0000000000 +Kaolin 4.0000000000 +Kaolin 4.0000000000 +Kaolin 4.0000000000 +Tatiana 4.0000000000 +Tata 4.0000000000 +select name, percentile_cont(0.5) within group(order by score) over () from t1; +name percentile_cont(0.5) within group(order by score) over () +Chun 4.0000000000 +Chun 4.0000000000 +Kaolin 4.0000000000 +Kaolin 4.0000000000 +Kaolin 4.0000000000 +Tatiana 4.0000000000 +Tata 4.0000000000 +# argument set to null +select name, percentile_cont(null) within group(order by score) over (partition by name) from t1; +ERROR HY000: percentile_cont function only accepts arguments that can be converted to numerical types +select name, percentile_disc(null) within group(order by score) over (partition by name) from t1; +ERROR HY000: percentile_disc function only accepts arguments that can be converted to numerical types +#subqueries having percentile functions +select * from ( select name , percentile_cont(0.5) within group ( order by score) over (partition by name ) from t1 ) as t; +name percentile_cont(0.5) within group ( order by score) over (partition by name ) +Chun 5.0000000000 +Chun 5.0000000000 +Kaolin 4.0000000000 +Kaolin 4.0000000000 +Kaolin 4.0000000000 +Tatiana 4.0000000000 +Tata 4.0000000000 +select * from ( select name , percentile_disc(0.5) within group ( order by score) over (partition by name ) from t1 ) as t; +name percentile_disc(0.5) within group ( order by score) over (partition by name ) +Chun 3.0000000000 +Chun 3.0000000000 +Kaolin 4.0000000000 +Kaolin 4.0000000000 +Kaolin 4.0000000000 +Tatiana 4.0000000000 +Tata 4.0000000000 +select name from t1 a where (select percentile_disc(0.5) within group (order by score) over (partition by name) from t1 b limit 1) >= 0.5; +name +Chun +Chun +Kaolin +Kaolin +Kaolin +Tatiana +Tata +#disallowed fields in order by +select score, percentile_cont(0.5) within group(order by name) over (partition by score) from t1; +ERROR HY000: Numeric datatype is required for percentile_cont function +select score, percentile_disc(0.5) within group(order by name) over (partition by score) from t1; +ERROR HY000: Numeric datatype is required for percentile_disc function +#parameter value should be in the range of [0,1] +select percentile_disc(1.5) within group(order by score) over (partition by name) from t1; +ERROR HY000: Argument to the percentile_disc function does not belong to the range [0,1] +select percentile_cont(1.5) within group(order by score) over (partition by name) from t1; +ERROR HY000: Argument to the percentile_cont function does not belong to the range [0,1] +#Argument should remain constant for the entire partition +select name,percentile_cont(test) within group(order by score) over (partition by name) from t1; +ERROR HY000: Argument to the percentile_cont function is not a constant for a partition +select name, percentile_disc(test) within group(order by score) over (partition by name) from t1; +ERROR HY000: Argument to the percentile_disc function is not a constant for a partition +#only numerical types are allowed as argument to percentile functions +select name, percentile_cont(name) within group(order by score) over (partition by name) from t1; +ERROR HY000: percentile_cont function only accepts arguments that can be converted to numerical types +select name, percentile_disc(name) within group(order by score) over (partition by name) from t1; +ERROR HY000: percentile_disc function only accepts arguments that can be converted to numerical types +#complete query with partition column +select name,cume_dist() over (partition by name order by score), percentile_disc(0.5) within group(order by score) over (partition by name) as c from t1; +name cume_dist() over (partition by name order by score) c +Chun 0.5000000000 3.0000000000 +Chun 1.0000000000 3.0000000000 +Kaolin 0.3333333333 4.0000000000 +Kaolin 1.0000000000 4.0000000000 +Kaolin 0.6666666667 4.0000000000 +Tatiana 1.0000000000 4.0000000000 +Tata 1.0000000000 4.0000000000 +select name, percentile_cont(0.5) within group(order by score) over (partition by name) as c from t1; +name c +Chun 5.0000000000 +Chun 5.0000000000 +Kaolin 4.0000000000 +Kaolin 4.0000000000 +Kaolin 4.0000000000 +Tatiana 4.0000000000 +Tata 4.0000000000 +select name,cume_dist() over (partition by name order by score) as b, percentile_disc(0.1) within group(order by score) over (partition by name) as c from t1; +name b c +Chun 0.5000000000 3.0000000000 +Chun 1.0000000000 3.0000000000 +Kaolin 0.3333333333 3.0000000000 +Kaolin 1.0000000000 3.0000000000 +Kaolin 0.6666666667 3.0000000000 +Tatiana 1.0000000000 4.0000000000 +Tata 1.0000000000 4.0000000000 +select name,cume_dist() over (partition by name order by score) as b, percentile_disc(0.2) within group(order by score) over (partition by name) as c from t1; +name b c +Chun 0.5000000000 3.0000000000 +Chun 1.0000000000 3.0000000000 +Kaolin 0.3333333333 3.0000000000 +Kaolin 1.0000000000 3.0000000000 +Kaolin 0.6666666667 3.0000000000 +Tatiana 1.0000000000 4.0000000000 +Tata 1.0000000000 4.0000000000 +select name,cume_dist() over (partition by name order by score) as b, percentile_disc(0.3) within group(order by score) over (partition by name) as c from t1; +name b c +Chun 0.5000000000 3.0000000000 +Chun 1.0000000000 3.0000000000 +Kaolin 0.3333333333 3.0000000000 +Kaolin 1.0000000000 3.0000000000 +Kaolin 0.6666666667 3.0000000000 +Tatiana 1.0000000000 4.0000000000 +Tata 1.0000000000 4.0000000000 +select name,cume_dist() over (partition by name order by score) as b, percentile_disc(0.4) within group(order by score) over (partition by name) as c from t1; +name b c +Chun 0.5000000000 3.0000000000 +Chun 1.0000000000 3.0000000000 +Kaolin 0.3333333333 4.0000000000 +Kaolin 1.0000000000 4.0000000000 +Kaolin 0.6666666667 4.0000000000 +Tatiana 1.0000000000 4.0000000000 +Tata 1.0000000000 4.0000000000 +select name,cume_dist() over (partition by name order by score) as b, percentile_disc(0.5) within group(order by score) over (partition by name) as c from t1; +name b c +Chun 0.5000000000 3.0000000000 +Chun 1.0000000000 3.0000000000 +Kaolin 0.3333333333 4.0000000000 +Kaolin 1.0000000000 4.0000000000 +Kaolin 0.6666666667 4.0000000000 +Tatiana 1.0000000000 4.0000000000 +Tata 1.0000000000 4.0000000000 +select name,cume_dist() over (partition by name order by score) as b, percentile_disc(0.6) within group(order by score) over (partition by name) as c from t1; +name b c +Chun 0.5000000000 7.0000000000 +Chun 1.0000000000 7.0000000000 +Kaolin 0.3333333333 4.0000000000 +Kaolin 1.0000000000 4.0000000000 +Kaolin 0.6666666667 4.0000000000 +Tatiana 1.0000000000 4.0000000000 +Tata 1.0000000000 4.0000000000 +select name,cume_dist() over (partition by name order by score) as b, percentile_disc(0.7) within group(order by score) over (partition by name) as c from t1; +name b c +Chun 0.5000000000 7.0000000000 +Chun 1.0000000000 7.0000000000 +Kaolin 0.3333333333 7.0000000000 +Kaolin 1.0000000000 7.0000000000 +Kaolin 0.6666666667 7.0000000000 +Tatiana 1.0000000000 4.0000000000 +Tata 1.0000000000 4.0000000000 +select name,cume_dist() over (partition by name order by score) as b, percentile_disc(0.8) within group(order by score) over (partition by name) as c from t1; +name b c +Chun 0.5000000000 7.0000000000 +Chun 1.0000000000 7.0000000000 +Kaolin 0.3333333333 7.0000000000 +Kaolin 1.0000000000 7.0000000000 +Kaolin 0.6666666667 7.0000000000 +Tatiana 1.0000000000 4.0000000000 +Tata 1.0000000000 4.0000000000 +select name,cume_dist() over (partition by name order by score) as b, percentile_disc(0.9) within group(order by score) over (partition by name) as c from t1; +name b c +Chun 0.5000000000 7.0000000000 +Chun 1.0000000000 7.0000000000 +Kaolin 0.3333333333 7.0000000000 +Kaolin 1.0000000000 7.0000000000 +Kaolin 0.6666666667 7.0000000000 +Tatiana 1.0000000000 4.0000000000 +Tata 1.0000000000 4.0000000000 +select name,cume_dist() over (partition by name order by score) as b, percentile_disc(1) within group(order by score) over (partition by name) as c from t1; +name b c +Chun 0.5000000000 7.0000000000 +Chun 1.0000000000 7.0000000000 +Kaolin 0.3333333333 7.0000000000 +Kaolin 1.0000000000 7.0000000000 +Kaolin 0.6666666667 7.0000000000 +Tatiana 1.0000000000 4.0000000000 +Tata 1.0000000000 4.0000000000 +select median(score) over (partition by name), percentile_cont(0) within group(order by score) over (partition by name) as c from t1; +median(score) over (partition by name) c +5.0000000000 3.0000000000 +5.0000000000 3.0000000000 +4.0000000000 3.0000000000 +4.0000000000 3.0000000000 +4.0000000000 3.0000000000 +4.0000000000 4.0000000000 +4.0000000000 4.0000000000 +select median(score) over (partition by name), percentile_cont(0.1) within group(order by score) over (partition by name) as c from t1; +median(score) over (partition by name) c +5.0000000000 3.4000000000 +5.0000000000 3.4000000000 +4.0000000000 3.2000000000 +4.0000000000 3.2000000000 +4.0000000000 3.2000000000 +4.0000000000 4.0000000000 +4.0000000000 4.0000000000 +select median(score) over (partition by name), percentile_cont(0.2) within group(order by score) over (partition by name) as c from t1; +median(score) over (partition by name) c +5.0000000000 3.8000000000 +5.0000000000 3.8000000000 +4.0000000000 3.4000000000 +4.0000000000 3.4000000000 +4.0000000000 3.4000000000 +4.0000000000 4.0000000000 +4.0000000000 4.0000000000 +select median(score) over (partition by name), percentile_cont(0.3) within group(order by score) over (partition by name) as c from t1; +median(score) over (partition by name) c +5.0000000000 4.2000000000 +5.0000000000 4.2000000000 +4.0000000000 3.6000000000 +4.0000000000 3.6000000000 +4.0000000000 3.6000000000 +4.0000000000 4.0000000000 +4.0000000000 4.0000000000 +select median(score) over (partition by name), percentile_cont(0.4) within group(order by score) over (partition by name) as c from t1; +median(score) over (partition by name) c +5.0000000000 4.6000000000 +5.0000000000 4.6000000000 +4.0000000000 3.8000000000 +4.0000000000 3.8000000000 +4.0000000000 3.8000000000 +4.0000000000 4.0000000000 +4.0000000000 4.0000000000 +select median(score) over (partition by name), percentile_cont(0.5) within group(order by score) over (partition by name) as c from t1; +median(score) over (partition by name) c +5.0000000000 5.0000000000 +5.0000000000 5.0000000000 +4.0000000000 4.0000000000 +4.0000000000 4.0000000000 +4.0000000000 4.0000000000 +4.0000000000 4.0000000000 +4.0000000000 4.0000000000 +select median(score) over (partition by name), percentile_cont(0.6) within group(order by score) over (partition by name) as c from t1; +median(score) over (partition by name) c +5.0000000000 5.4000000000 +5.0000000000 5.4000000000 +4.0000000000 4.6000000000 +4.0000000000 4.6000000000 +4.0000000000 4.6000000000 +4.0000000000 4.0000000000 +4.0000000000 4.0000000000 +select median(score) over (partition by name), percentile_cont(0.7) within group(order by score) over (partition by name) as c from t1; +median(score) over (partition by name) c +5.0000000000 5.8000000000 +5.0000000000 5.8000000000 +4.0000000000 5.2000000000 +4.0000000000 5.2000000000 +4.0000000000 5.2000000000 +4.0000000000 4.0000000000 +4.0000000000 4.0000000000 +select median(score) over (partition by name), percentile_cont(0.8) within group(order by score) over (partition by name) as c from t1; +median(score) over (partition by name) c +5.0000000000 6.2000000000 +5.0000000000 6.2000000000 +4.0000000000 5.8000000000 +4.0000000000 5.8000000000 +4.0000000000 5.8000000000 +4.0000000000 4.0000000000 +4.0000000000 4.0000000000 +select median(score) over (partition by name), percentile_cont(0.9) within group(order by score) over (partition by name) as c from t1; +median(score) over (partition by name) c +5.0000000000 6.6000000000 +5.0000000000 6.6000000000 +4.0000000000 6.4000000000 +4.0000000000 6.4000000000 +4.0000000000 6.4000000000 +4.0000000000 4.0000000000 +4.0000000000 4.0000000000 +select median(score) over (partition by name), percentile_cont(1) within group(order by score) over (partition by name) as c from t1; +median(score) over (partition by name) c +5.0000000000 7.0000000000 +5.0000000000 7.0000000000 +4.0000000000 7.0000000000 +4.0000000000 7.0000000000 +4.0000000000 7.0000000000 +4.0000000000 4.0000000000 +4.0000000000 4.0000000000 +drop table t1; 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/encryption/disabled.def b/mysql-test/suite/encryption/disabled.def index d92d3495cb8..9d9d1cd9df9 100644 --- a/mysql-test/suite/encryption/disabled.def +++ b/mysql-test/suite/encryption/disabled.def @@ -12,3 +12,4 @@ innodb_scrub : MDEV-8139 scrubbing does not work reliably innodb_scrub_background : MDEV-8139 scrubbing does not work reliably +innodb-redo-badkey : MDEV-13893 / MDEV-12699 Improve crash recovery of corrupted data pages diff --git a/mysql-test/suite/encryption/r/encryption_force.result b/mysql-test/suite/encryption/r/encryption_force.result index 730a32a4b27..c71a9885455 100644 --- a/mysql-test/suite/encryption/r/encryption_force.result +++ b/mysql-test/suite/encryption/r/encryption_force.result @@ -34,11 +34,11 @@ t4 CREATE TABLE `t4` ( PARTITION BY HASH (`a`) PARTITIONS 2 alter table t1 encrypted=no; -ERROR HY000: Can't create table `test`.`#sql-temporary` (errno: 140 "Wrong create options") +ERROR HY000: Table storage engine 'InnoDB' does not support the create option 'ENCRYPTED' alter table t2 encrypted=yes; alter table t3 encrypted=default; alter table t4 encrypted=no; -ERROR HY000: Can't create table `test`.`#sql-temporary` (errno: 140 "Wrong create options") +ERROR HY000: Table storage engine 'InnoDB' does not support the create option 'ENCRYPTED' show create table t1; Table Create Table t1 CREATE TABLE `t1` ( diff --git a/mysql-test/suite/encryption/r/filekeys_encfile.result b/mysql-test/suite/encryption/r/filekeys_encfile.result index add6f312fda..6d5baa1b7ff 100644 --- a/mysql-test/suite/encryption/r/filekeys_encfile.result +++ b/mysql-test/suite/encryption/r/filekeys_encfile.result @@ -14,7 +14,7 @@ t1 CREATE TABLE `t1` ( `b` char(200) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 `encrypted`=yes `encryption_key_id`=2 alter table t1 encryption_key_id=3; -ERROR HY000: Can't create table `test`.`#sql-temporary` (errno: 140 "Wrong create options") +ERROR HY000: Table storage engine 'InnoDB' does not support the create option 'ENCRYPTION_KEY_ID' show create table t1; Table Create Table t1 CREATE TABLE `t1` ( diff --git a/mysql-test/suite/encryption/r/filekeys_encfile_file.result b/mysql-test/suite/encryption/r/filekeys_encfile_file.result index add6f312fda..6d5baa1b7ff 100644 --- a/mysql-test/suite/encryption/r/filekeys_encfile_file.result +++ b/mysql-test/suite/encryption/r/filekeys_encfile_file.result @@ -14,7 +14,7 @@ t1 CREATE TABLE `t1` ( `b` char(200) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 `encrypted`=yes `encryption_key_id`=2 alter table t1 encryption_key_id=3; -ERROR HY000: Can't create table `test`.`#sql-temporary` (errno: 140 "Wrong create options") +ERROR HY000: Table storage engine 'InnoDB' does not support the create option 'ENCRYPTION_KEY_ID' show create table t1; Table Create Table t1 CREATE TABLE `t1` ( diff --git a/mysql-test/suite/encryption/r/innodb-encryption-alter.result b/mysql-test/suite/encryption/r/innodb-encryption-alter.result index 06e4172bbae..fcc87493976 100644 --- a/mysql-test/suite/encryption/r/innodb-encryption-alter.result +++ b/mysql-test/suite/encryption/r/innodb-encryption-alter.result @@ -41,11 +41,10 @@ CREATE TABLE t2 (pk INT PRIMARY KEY AUTO_INCREMENT, c VARCHAR(256)) ENGINE=INNOD Warnings: Warning 140 InnoDB: Ignored ENCRYPTION_KEY_ID 1 when encryption is disabled ALTER TABLE t1 ENCRYPTION_KEY_ID=99; -ERROR HY000: Can't create table `test`.`#sql-temporary` (errno: 140 "Wrong create options") +ERROR HY000: Table storage engine 'InnoDB' does not support the create option 'ENCRYPTION_KEY_ID' SHOW WARNINGS; Level Code Message Warning 140 InnoDB: ENCRYPTION_KEY_ID 99 not available -Error 1005 Can't create table `test`.`#sql-temporary` (errno: 140 "Wrong create options") -Warning 1030 Got error 140 "Wrong create options" from storage engine InnoDB +Error 1478 Table storage engine 'InnoDB' does not support the create option 'ENCRYPTION_KEY_ID' set innodb_default_encryption_key_id = 1; drop table t1,t2; diff --git a/mysql-test/suite/encryption/r/innodb-spatial-index.result b/mysql-test/suite/encryption/r/innodb-spatial-index.result index 3efea81acc8..9ca6dbd2137 100644 --- a/mysql-test/suite/encryption/r/innodb-spatial-index.result +++ b/mysql-test/suite/encryption/r/innodb-spatial-index.result @@ -5,7 +5,7 @@ ERROR HY000: Can't create table `test`.`t1` (errno: 140 "Wrong create options") CREATE TABLE t1 (pk INT PRIMARY KEY AUTO_INCREMENT, c VARCHAR(256), coordinate POINT NOT NULL, SPATIAL index(coordinate)) ENGINE=INNODB; ALTER TABLE t1 ENCRYPTED=YES; -ERROR HY000: Can't create table `test`.`#sql-temporary` (errno: 140 "Wrong create options") +ERROR HY000: Table storage engine 'InnoDB' does not support the create option 'ENCRYPTED' DROP TABLE t1; CREATE TABLE t1 (pk INT PRIMARY KEY AUTO_INCREMENT, c VARCHAR(256), coordinate POINT NOT NULL) ENCRYPTED=YES ENGINE=INNODB; diff --git a/mysql-test/suite/encryption/t/encryption_force.test b/mysql-test/suite/encryption/t/encryption_force.test index 3e09dd91839..3c6f039184b 100644 --- a/mysql-test/suite/encryption/t/encryption_force.test +++ b/mysql-test/suite/encryption/t/encryption_force.test @@ -22,13 +22,11 @@ show create table t2; show create table t3; show create table t4; ---replace_regex /#sql-[0-9a-f_]*/#sql-temporary/ ---error ER_CANT_CREATE_TABLE +--error ER_ILLEGAL_HA_CREATE_OPTION alter table t1 encrypted=no; alter table t2 encrypted=yes; alter table t3 encrypted=default; ---replace_regex /#sql-[0-9a-f_]*/#sql-temporary/ ---error ER_CANT_CREATE_TABLE +--error ER_ILLEGAL_HA_CREATE_OPTION alter table t4 encrypted=no; show create table t1; diff --git a/mysql-test/suite/encryption/t/filekeys_goodtest.inc b/mysql-test/suite/encryption/t/filekeys_goodtest.inc index 12a79c13d2a..252060796fe 100644 --- a/mysql-test/suite/encryption/t/filekeys_goodtest.inc +++ b/mysql-test/suite/encryption/t/filekeys_goodtest.inc @@ -7,8 +7,7 @@ insert t1 values (12345, repeat('1234567890', 20)); alter table t1 encryption_key_id=2; show create table t1; ---replace_regex /#sql-[0-9a-f_]*/#sql-temporary/ ---error ER_CANT_CREATE_TABLE +--error ER_ILLEGAL_HA_CREATE_OPTION alter table t1 encryption_key_id=3; show create table t1; alter table t1 encryption_key_id=33; @@ -17,4 +16,3 @@ alter table t1 encryption_key_id=4; show create table t1; drop table t1; - diff --git a/mysql-test/suite/encryption/t/innodb-encryption-alter.test b/mysql-test/suite/encryption/t/innodb-encryption-alter.test index cb7d5a47975..af1c749d8a9 100644 --- a/mysql-test/suite/encryption/t/innodb-encryption-alter.test +++ b/mysql-test/suite/encryption/t/innodb-encryption-alter.test @@ -27,10 +27,8 @@ DROP TABLE t1; CREATE TABLE t1 (pk INT PRIMARY KEY AUTO_INCREMENT, c VARCHAR(256)) ENGINE=INNODB; SHOW CREATE TABLE t1; CREATE TABLE t2 (pk INT PRIMARY KEY AUTO_INCREMENT, c VARCHAR(256)) ENGINE=INNODB ENCRYPTED=NO ENCRYPTION_KEY_ID=1; ---replace_regex /#sql-[0-9a-f_]*/#sql-temporary/ ---error 1005 +--error ER_ILLEGAL_HA_CREATE_OPTION ALTER TABLE t1 ENCRYPTION_KEY_ID=99; ---replace_regex /#sql-[0-9a-f_]*/#sql-temporary/ SHOW WARNINGS; set innodb_default_encryption_key_id = 1; diff --git a/mysql-test/suite/encryption/t/innodb-spatial-index.test b/mysql-test/suite/encryption/t/innodb-spatial-index.test index 6b6191c69cb..8eb6a803765 100644 --- a/mysql-test/suite/encryption/t/innodb-spatial-index.test +++ b/mysql-test/suite/encryption/t/innodb-spatial-index.test @@ -20,10 +20,8 @@ ENCRYPTED=YES; # CREATE TABLE t1 (pk INT PRIMARY KEY AUTO_INCREMENT, c VARCHAR(256), coordinate POINT NOT NULL, SPATIAL index(coordinate)) ENGINE=INNODB; ---replace_regex /#sql-[0-9a-f_]*`/#sql-temporary`/ ---error ER_CANT_CREATE_TABLE +--error ER_ILLEGAL_HA_CREATE_OPTION ALTER TABLE t1 ENCRYPTED=YES; ---replace_regex /#sql-[0-9a-f_]*`/#sql-temporary`/ DROP TABLE t1; # diff --git a/mysql-test/suite/funcs_1/datadict/is_key_column_usage.inc b/mysql-test/suite/funcs_1/datadict/is_key_column_usage.inc index 71030a2b1d8..ba390dfb4f5 100644 --- a/mysql-test/suite/funcs_1/datadict/is_key_column_usage.inc +++ b/mysql-test/suite/funcs_1/datadict/is_key_column_usage.inc @@ -75,7 +75,8 @@ eval SHOW COLUMNS FROM information_schema.$is_table; SELECT constraint_catalog, constraint_schema, constraint_name, table_catalog, table_schema, table_name, column_name FROM information_schema.key_column_usage -WHERE constraint_catalog IS NOT NULL OR table_catalog IS NOT NULL; +WHERE constraint_catalog IS NOT NULL OR table_catalog IS NOT NULL +ORDER BY BINARY table_schema, BINARY table_name, BINARY column_name, BINARY constraint_name; --echo ######################################################################################## diff --git a/mysql-test/suite/funcs_1/datadict/is_schemata.inc b/mysql-test/suite/funcs_1/datadict/is_schemata.inc index 18c759b91d1..0a3f0e726b3 100644 --- a/mysql-test/suite/funcs_1/datadict/is_schemata.inc +++ b/mysql-test/suite/funcs_1/datadict/is_schemata.inc @@ -59,7 +59,8 @@ eval SHOW COLUMNS FROM information_schema.$is_table; # Show that CATALOG_NAME and SQL_PATH are always NULL. SELECT catalog_name, schema_name, sql_path FROM information_schema.schemata -WHERE catalog_name IS NOT NULL or sql_path IS NOT NULL; +WHERE catalog_name IS NOT NULL or sql_path IS NOT NULL +ORDER BY schema_name; --echo ############################################################################### diff --git a/mysql-test/suite/funcs_1/datadict/is_triggers.inc b/mysql-test/suite/funcs_1/datadict/is_triggers.inc index b2ce1e2de00..3a449c93c4b 100644 --- a/mysql-test/suite/funcs_1/datadict/is_triggers.inc +++ b/mysql-test/suite/funcs_1/datadict/is_triggers.inc @@ -85,7 +85,8 @@ eval SHOW COLUMNS FROM information_schema.$is_table; SELECT * FROM information_schema.triggers WHERE trigger_catalog IS NOT NULL OR event_object_catalog IS NOT NULL OR action_condition IS NOT NULL OR action_reference_old_table IS NOT NULL - OR action_reference_new_table IS NOT NULL; + OR action_reference_new_table IS NOT NULL +ORDER BY trigger_schema, trigger_name; --echo ################################################################################## diff --git a/mysql-test/suite/funcs_1/datadict/is_views.inc b/mysql-test/suite/funcs_1/datadict/is_views.inc index bdba03f3632..cb3444e308a 100644 --- a/mysql-test/suite/funcs_1/datadict/is_views.inc +++ b/mysql-test/suite/funcs_1/datadict/is_views.inc @@ -159,12 +159,14 @@ CREATE USER 'testuser1'@'localhost'; # Check just created VIEW SELECT * FROM information_schema.views -WHERE table_name LIKE 't1_%'; +WHERE table_name LIKE 't1_%' +ORDER BY table_schema, table_name; CREATE VIEW test.t1_view AS SELECT DISTINCT f1 FROM test.t1_table; CREATE ALGORITHM=MERGE VIEW test.t1_view1 AS SELECT f1 FROM test.t1_table; CREATE ALGORITHM=TEMPTABLE VIEW test.t1_view2 AS SELECT f1 FROM test.t1_table; SELECT * FROM information_schema.views -WHERE table_name LIKE 't1_%'; +WHERE table_name LIKE 't1_%' +ORDER BY table_schema, table_name; DROP VIEW test.t1_view1; DROP VIEW test.t1_view2; 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_basics_mixed.result b/mysql-test/suite/funcs_1/r/is_basics_mixed.result index 2d14ada4f89..f9468648c61 100644 --- a/mysql-test/suite/funcs_1/r/is_basics_mixed.result +++ b/mysql-test/suite/funcs_1/r/is_basics_mixed.result @@ -341,12 +341,14 @@ CREATE VIEW db_datadict.v2 AS SELECT TABLE_SCHEMA,TABLE_NAME,TABLE_TYPE FROM information_schema.tables WHERE table_schema = 'db_datadict'; SELECT TABLE_SCHEMA,TABLE_NAME,TABLE_TYPE -FROM db_datadict.v2; +FROM db_datadict.v2 +ORDER BY TABLE_NAME; TABLE_SCHEMA TABLE_NAME TABLE_TYPE db_datadict t1 BASE TABLE db_datadict v2 VIEW SELECT TABLE_SCHEMA,TABLE_NAME,TABLE_TYPE -FROM information_schema.tables WHERE table_schema = 'db_datadict'; +FROM information_schema.tables WHERE table_schema = 'db_datadict' +ORDER BY TABLE_NAME; TABLE_SCHEMA TABLE_NAME TABLE_TYPE db_datadict t1 BASE TABLE db_datadict v2 VIEW 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/is_key_column_usage.result b/mysql-test/suite/funcs_1/r/is_key_column_usage.result index 84a226dd0ef..feb0510391e 100644 --- a/mysql-test/suite/funcs_1/r/is_key_column_usage.result +++ b/mysql-test/suite/funcs_1/r/is_key_column_usage.result @@ -73,18 +73,19 @@ REFERENCED_COLUMN_NAME varchar(64) YES NULL SELECT constraint_catalog, constraint_schema, constraint_name, table_catalog, table_schema, table_name, column_name FROM information_schema.key_column_usage -WHERE constraint_catalog IS NOT NULL OR table_catalog IS NOT NULL; +WHERE constraint_catalog IS NOT NULL OR table_catalog IS NOT NULL +ORDER BY BINARY table_schema, BINARY table_name, BINARY column_name, BINARY constraint_name; constraint_catalog constraint_schema constraint_name table_catalog table_schema table_name column_name +def mysql PRIMARY def mysql column_stats column_name def mysql PRIMARY def mysql column_stats db_name def mysql PRIMARY def mysql column_stats table_name -def mysql PRIMARY def mysql column_stats column_name -def mysql PRIMARY def mysql columns_priv Host +def mysql PRIMARY def mysql columns_priv Column_name def mysql PRIMARY def mysql columns_priv Db -def mysql PRIMARY def mysql columns_priv User +def mysql PRIMARY def mysql columns_priv Host def mysql PRIMARY def mysql columns_priv Table_name -def mysql PRIMARY def mysql columns_priv Column_name -def mysql PRIMARY def mysql db Host +def mysql PRIMARY def mysql columns_priv User def mysql PRIMARY def mysql db Db +def mysql PRIMARY def mysql db Host def mysql PRIMARY def mysql db User def mysql PRIMARY def mysql event db def mysql PRIMARY def mysql event name @@ -99,41 +100,41 @@ def mysql PRIMARY def mysql help_relation help_keyword_id def mysql PRIMARY def mysql help_relation help_topic_id def mysql PRIMARY def mysql help_topic help_topic_id def mysql name def mysql help_topic name -def mysql PRIMARY def mysql host Host def mysql PRIMARY def mysql host Db +def mysql PRIMARY def mysql host Host def mysql PRIMARY def mysql index_stats db_name -def mysql PRIMARY def mysql index_stats table_name def mysql PRIMARY def mysql index_stats index_name def mysql PRIMARY def mysql index_stats prefix_arity +def mysql PRIMARY def mysql index_stats table_name def mysql PRIMARY def mysql innodb_index_stats database_name -def mysql PRIMARY def mysql innodb_index_stats table_name def mysql PRIMARY def mysql innodb_index_stats index_name def mysql PRIMARY def mysql innodb_index_stats stat_name +def mysql PRIMARY def mysql innodb_index_stats table_name def mysql PRIMARY def mysql innodb_table_stats database_name def mysql PRIMARY def mysql innodb_table_stats table_name def mysql PRIMARY def mysql plugin name def mysql PRIMARY def mysql proc db def mysql PRIMARY def mysql proc name def mysql PRIMARY def mysql proc type -def mysql PRIMARY def mysql procs_priv Host def mysql PRIMARY def mysql procs_priv Db -def mysql PRIMARY def mysql procs_priv User +def mysql PRIMARY def mysql procs_priv Host def mysql PRIMARY def mysql procs_priv Routine_name def mysql PRIMARY def mysql procs_priv Routine_type +def mysql PRIMARY def mysql procs_priv User def mysql PRIMARY def mysql proxies_priv Host -def mysql PRIMARY def mysql proxies_priv User def mysql PRIMARY def mysql proxies_priv Proxied_host def mysql PRIMARY def mysql proxies_priv Proxied_user +def mysql PRIMARY def mysql proxies_priv User def mysql Host def mysql roles_mapping Host -def mysql Host def mysql roles_mapping User def mysql Host def mysql roles_mapping Role +def mysql Host def mysql roles_mapping User def mysql PRIMARY def mysql servers Server_name def mysql PRIMARY def mysql table_stats db_name def mysql PRIMARY def mysql table_stats table_name -def mysql PRIMARY def mysql tables_priv Host def mysql PRIMARY def mysql tables_priv Db -def mysql PRIMARY def mysql tables_priv User +def mysql PRIMARY def mysql tables_priv Host def mysql PRIMARY def mysql tables_priv Table_name +def mysql PRIMARY def mysql tables_priv User def mysql PRIMARY def mysql time_zone Time_zone_id def mysql PRIMARY def mysql time_zone_leap_second Transition_time def mysql PRIMARY def mysql time_zone_name Name diff --git a/mysql-test/suite/funcs_1/r/is_key_column_usage_embedded.result b/mysql-test/suite/funcs_1/r/is_key_column_usage_embedded.result index 4a6114f3da3..62e566ca89f 100644 --- a/mysql-test/suite/funcs_1/r/is_key_column_usage_embedded.result +++ b/mysql-test/suite/funcs_1/r/is_key_column_usage_embedded.result @@ -73,18 +73,19 @@ REFERENCED_COLUMN_NAME varchar(64) YES NULL SELECT constraint_catalog, constraint_schema, constraint_name, table_catalog, table_schema, table_name, column_name FROM information_schema.key_column_usage -WHERE constraint_catalog IS NOT NULL OR table_catalog IS NOT NULL; +WHERE constraint_catalog IS NOT NULL OR table_catalog IS NOT NULL +ORDER BY BINARY table_schema, BINARY table_name, BINARY column_name, BINARY constraint_name; constraint_catalog constraint_schema constraint_name table_catalog table_schema table_name column_name +def mysql PRIMARY def mysql column_stats column_name def mysql PRIMARY def mysql column_stats db_name def mysql PRIMARY def mysql column_stats table_name -def mysql PRIMARY def mysql column_stats column_name -def mysql PRIMARY def mysql columns_priv Host +def mysql PRIMARY def mysql columns_priv Column_name def mysql PRIMARY def mysql columns_priv Db -def mysql PRIMARY def mysql columns_priv User +def mysql PRIMARY def mysql columns_priv Host def mysql PRIMARY def mysql columns_priv Table_name -def mysql PRIMARY def mysql columns_priv Column_name -def mysql PRIMARY def mysql db Host +def mysql PRIMARY def mysql columns_priv User def mysql PRIMARY def mysql db Db +def mysql PRIMARY def mysql db Host def mysql PRIMARY def mysql db User def mysql PRIMARY def mysql event db def mysql PRIMARY def mysql event name @@ -99,41 +100,41 @@ def mysql PRIMARY def mysql help_relation help_keyword_id def mysql PRIMARY def mysql help_relation help_topic_id def mysql PRIMARY def mysql help_topic help_topic_id def mysql name def mysql help_topic name -def mysql PRIMARY def mysql host Host def mysql PRIMARY def mysql host Db +def mysql PRIMARY def mysql host Host def mysql PRIMARY def mysql index_stats db_name -def mysql PRIMARY def mysql index_stats table_name def mysql PRIMARY def mysql index_stats index_name def mysql PRIMARY def mysql index_stats prefix_arity +def mysql PRIMARY def mysql index_stats table_name def mysql PRIMARY def mysql innodb_index_stats database_name -def mysql PRIMARY def mysql innodb_index_stats table_name def mysql PRIMARY def mysql innodb_index_stats index_name def mysql PRIMARY def mysql innodb_index_stats stat_name +def mysql PRIMARY def mysql innodb_index_stats table_name def mysql PRIMARY def mysql innodb_table_stats database_name def mysql PRIMARY def mysql innodb_table_stats table_name def mysql PRIMARY def mysql plugin name def mysql PRIMARY def mysql proc db def mysql PRIMARY def mysql proc name def mysql PRIMARY def mysql proc type -def mysql PRIMARY def mysql procs_priv Host def mysql PRIMARY def mysql procs_priv Db -def mysql PRIMARY def mysql procs_priv User +def mysql PRIMARY def mysql procs_priv Host def mysql PRIMARY def mysql procs_priv Routine_name def mysql PRIMARY def mysql procs_priv Routine_type +def mysql PRIMARY def mysql procs_priv User def mysql PRIMARY def mysql proxies_priv Host -def mysql PRIMARY def mysql proxies_priv User def mysql PRIMARY def mysql proxies_priv Proxied_host def mysql PRIMARY def mysql proxies_priv Proxied_user +def mysql PRIMARY def mysql proxies_priv User def mysql Host def mysql roles_mapping Host -def mysql Host def mysql roles_mapping User def mysql Host def mysql roles_mapping Role +def mysql Host def mysql roles_mapping User def mysql PRIMARY def mysql servers Server_name def mysql PRIMARY def mysql table_stats db_name def mysql PRIMARY def mysql table_stats table_name -def mysql PRIMARY def mysql tables_priv Host def mysql PRIMARY def mysql tables_priv Db -def mysql PRIMARY def mysql tables_priv User +def mysql PRIMARY def mysql tables_priv Host def mysql PRIMARY def mysql tables_priv Table_name +def mysql PRIMARY def mysql tables_priv User def mysql PRIMARY def mysql time_zone Time_zone_id def mysql PRIMARY def mysql time_zone_leap_second Transition_time def mysql PRIMARY def mysql time_zone_name Name diff --git a/mysql-test/suite/funcs_1/r/is_routines_embedded.result b/mysql-test/suite/funcs_1/r/is_routines_embedded.result index a772ebaebda..8879efb21a5 100644 --- a/mysql-test/suite/funcs_1/r/is_routines_embedded.result +++ b/mysql-test/suite/funcs_1/r/is_routines_embedded.result @@ -197,7 +197,7 @@ sp_6_408002_2 def db_datadict_2 sp_6_408002_2 PROCEDURE NULL NULL NULL NULL NUL SELECT * FROM db_datadict_2.res_6_408002_2; END NULL NULL SQL NO CONTAINS SQL NULL DEFINER YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss root@localhost latin1 latin1_swedish_ci latin1_swedish_ci add_suppression def mtr add_suppression PROCEDURE NULL NULL NULL NULL NULL NULL NULL NULL SQL BEGIN INSERT INTO test_suppressions (pattern) VALUES (pattern); FLUSH NO_WRITE_TO_BINLOG TABLE test_suppressions; END NULL NULL SQL NO CONTAINS SQL NULL DEFINER YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss root@localhost utf8 utf8_general_ci latin1_swedish_ci -check_testcase def mtr check_testcase PROCEDURE NULL NULL NULL NULL NULL NULL NULL NULL SQL BEGIN SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE variable_name NOT IN ('timestamp') AND variable_name not like "Last_IO_Err*" AND variable_name != 'INNODB_IBUF_MAX_SIZE' AND variable_name != 'INNODB_USE_NATIVE_AIO' AND variable_name != 'INNODB_BUFFER_POOL_LOAD_AT_STARTUP' AND variable_name not like 'GTID%POS' AND variable_name != 'GTID_BINLOG_STATE' ORDER BY variable_name; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME NOT IN ('mtr_wsrep_notify', 'wsrep_schema'); SELECT table_name AS tables_in_test FROM INFORMATION_SCHEMA.TABLES WHERE table_schema='test'; SELECT CONCAT(table_schema, '.', table_name) AS tables_in_mysql FROM INFORMATION_SCHEMA.TABLES WHERE table_schema='mysql' ORDER BY tables_in_mysql; SELECT CONCAT(table_schema, '.', table_name) AS columns_in_mysql, column_name, ordinal_position, column_default, is_nullable, data_type, character_maximum_length, character_octet_length, numeric_precision, numeric_scale, character_set_name, collation_name, column_type, column_key, extra, column_comment FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema='mysql' ORDER BY columns_in_mysql; SELECT * FROM INFORMATION_SCHEMA.EVENTS; SELECT * FROM INFORMATION_SCHEMA.TRIGGERS WHERE TRIGGER_NAME NOT IN ('gs_insert', 'ts_insert'); SELECT * FROM INFORMATION_SCHEMA.ROUTINES; SHOW STATUS LIKE 'slave_open_temp_tables'; checksum table mysql.columns_priv, mysql.db, mysql.func, mysql.help_category, mysql.help_keyword, mysql.help_relation, mysql.host, mysql.plugin, mysql.proc, mysql.procs_priv, mysql.roles_mapping, mysql.tables_priv, mysql.time_zone, mysql.time_zone_leap_second, mysql.time_zone_name, mysql.time_zone_transition, mysql.time_zone_transition_type, mysql.user; SELECT * FROM INFORMATION_SCHEMA.PLUGINS; select * from information_schema.session_variables where variable_name = 'debug_sync'; END NULL NULL SQL NO CONTAINS SQL NULL DEFINER YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss root@localhost utf8 utf8_general_ci latin1_swedish_ci +check_testcase def mtr check_testcase PROCEDURE NULL NULL NULL NULL NULL NULL NULL NULL SQL BEGIN SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE variable_name NOT IN ('timestamp') AND variable_name not like "Last_IO_Err*" AND variable_name != 'INNODB_IBUF_MAX_SIZE' AND variable_name != 'INNODB_USE_NATIVE_AIO' AND variable_name != 'INNODB_BUFFER_POOL_LOAD_AT_STARTUP' AND variable_name not like 'GTID%POS' AND variable_name != 'GTID_BINLOG_STATE' ORDER BY variable_name; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY BINARY SCHEMA_NAME; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME NOT IN ('mtr_wsrep_notify', 'wsrep_schema') ORDER BY BINARY SCHEMA_NAME; SELECT table_name AS tables_in_test FROM INFORMATION_SCHEMA.TABLES WHERE table_schema='test'; SELECT CONCAT(table_schema, '.', table_name) AS tables_in_mysql FROM INFORMATION_SCHEMA.TABLES WHERE table_schema='mysql' ORDER BY tables_in_mysql; SELECT CONCAT(table_schema, '.', table_name) AS columns_in_mysql, column_name, ordinal_position, column_default, is_nullable, data_type, character_maximum_length, character_octet_length, numeric_precision, numeric_scale, character_set_name, collation_name, column_type, column_key, extra, column_comment FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema='mysql' ORDER BY columns_in_mysql; SELECT * FROM INFORMATION_SCHEMA.EVENTS; SELECT * FROM INFORMATION_SCHEMA.TRIGGERS WHERE TRIGGER_NAME NOT IN ('gs_insert', 'ts_insert'); SELECT * FROM INFORMATION_SCHEMA.ROUTINES; SHOW STATUS LIKE 'slave_open_temp_tables'; checksum table mysql.columns_priv, mysql.db, mysql.func, mysql.help_category, mysql.help_keyword, mysql.help_relation, mysql.host, mysql.plugin, mysql.proc, mysql.procs_priv, mysql.roles_mapping, mysql.tables_priv, mysql.time_zone, mysql.time_zone_leap_second, mysql.time_zone_name, mysql.time_zone_transition, mysql.time_zone_transition_type, mysql.user; SELECT * FROM INFORMATION_SCHEMA.PLUGINS; select * from information_schema.session_variables where variable_name = 'debug_sync'; END NULL NULL SQL NO CONTAINS SQL NULL DEFINER YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss root@localhost utf8 utf8_general_ci latin1_swedish_ci check_warnings def mtr check_warnings PROCEDURE NULL NULL NULL NULL NULL NULL NULL NULL SQL BEGIN DECLARE `pos` bigint unsigned; SET SQL_LOG_BIN=0; UPDATE error_log el, global_suppressions gs SET suspicious=0 WHERE el.suspicious=1 AND el.line REGEXP gs.pattern; UPDATE error_log el, test_suppressions ts SET suspicious=0 WHERE el.suspicious=1 AND el.line REGEXP ts.pattern; SELECT COUNT(*) INTO @num_warnings FROM error_log WHERE suspicious=1; IF @num_warnings > 0 THEN SELECT line FROM error_log WHERE suspicious=1; SELECT 2 INTO result; ELSE SELECT 0 INTO RESULT; END IF; TRUNCATE test_suppressions; DROP TABLE error_log; END NULL NULL SQL NO CONTAINS SQL NULL DEFINER YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss root@localhost utf8 utf8_general_ci latin1_swedish_ci connect testuser2, localhost, testuser2, , db_datadict; SELECT * FROM information_schema.routines; @@ -209,7 +209,7 @@ sp_6_408002_2 def db_datadict_2 sp_6_408002_2 PROCEDURE NULL NULL NULL NULL NUL SELECT * FROM db_datadict_2.res_6_408002_2; END NULL NULL SQL NO CONTAINS SQL NULL DEFINER YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss root@localhost latin1 latin1_swedish_ci latin1_swedish_ci add_suppression def mtr add_suppression PROCEDURE NULL NULL NULL NULL NULL NULL NULL NULL SQL BEGIN INSERT INTO test_suppressions (pattern) VALUES (pattern); FLUSH NO_WRITE_TO_BINLOG TABLE test_suppressions; END NULL NULL SQL NO CONTAINS SQL NULL DEFINER YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss root@localhost utf8 utf8_general_ci latin1_swedish_ci -check_testcase def mtr check_testcase PROCEDURE NULL NULL NULL NULL NULL NULL NULL NULL SQL BEGIN SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE variable_name NOT IN ('timestamp') AND variable_name not like "Last_IO_Err*" AND variable_name != 'INNODB_IBUF_MAX_SIZE' AND variable_name != 'INNODB_USE_NATIVE_AIO' AND variable_name != 'INNODB_BUFFER_POOL_LOAD_AT_STARTUP' AND variable_name not like 'GTID%POS' AND variable_name != 'GTID_BINLOG_STATE' ORDER BY variable_name; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME NOT IN ('mtr_wsrep_notify', 'wsrep_schema'); SELECT table_name AS tables_in_test FROM INFORMATION_SCHEMA.TABLES WHERE table_schema='test'; SELECT CONCAT(table_schema, '.', table_name) AS tables_in_mysql FROM INFORMATION_SCHEMA.TABLES WHERE table_schema='mysql' ORDER BY tables_in_mysql; SELECT CONCAT(table_schema, '.', table_name) AS columns_in_mysql, column_name, ordinal_position, column_default, is_nullable, data_type, character_maximum_length, character_octet_length, numeric_precision, numeric_scale, character_set_name, collation_name, column_type, column_key, extra, column_comment FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema='mysql' ORDER BY columns_in_mysql; SELECT * FROM INFORMATION_SCHEMA.EVENTS; SELECT * FROM INFORMATION_SCHEMA.TRIGGERS WHERE TRIGGER_NAME NOT IN ('gs_insert', 'ts_insert'); SELECT * FROM INFORMATION_SCHEMA.ROUTINES; SHOW STATUS LIKE 'slave_open_temp_tables'; checksum table mysql.columns_priv, mysql.db, mysql.func, mysql.help_category, mysql.help_keyword, mysql.help_relation, mysql.host, mysql.plugin, mysql.proc, mysql.procs_priv, mysql.roles_mapping, mysql.tables_priv, mysql.time_zone, mysql.time_zone_leap_second, mysql.time_zone_name, mysql.time_zone_transition, mysql.time_zone_transition_type, mysql.user; SELECT * FROM INFORMATION_SCHEMA.PLUGINS; select * from information_schema.session_variables where variable_name = 'debug_sync'; END NULL NULL SQL NO CONTAINS SQL NULL DEFINER YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss root@localhost utf8 utf8_general_ci latin1_swedish_ci +check_testcase def mtr check_testcase PROCEDURE NULL NULL NULL NULL NULL NULL NULL NULL SQL BEGIN SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE variable_name NOT IN ('timestamp') AND variable_name not like "Last_IO_Err*" AND variable_name != 'INNODB_IBUF_MAX_SIZE' AND variable_name != 'INNODB_USE_NATIVE_AIO' AND variable_name != 'INNODB_BUFFER_POOL_LOAD_AT_STARTUP' AND variable_name not like 'GTID%POS' AND variable_name != 'GTID_BINLOG_STATE' ORDER BY variable_name; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY BINARY SCHEMA_NAME; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME NOT IN ('mtr_wsrep_notify', 'wsrep_schema') ORDER BY BINARY SCHEMA_NAME; SELECT table_name AS tables_in_test FROM INFORMATION_SCHEMA.TABLES WHERE table_schema='test'; SELECT CONCAT(table_schema, '.', table_name) AS tables_in_mysql FROM INFORMATION_SCHEMA.TABLES WHERE table_schema='mysql' ORDER BY tables_in_mysql; SELECT CONCAT(table_schema, '.', table_name) AS columns_in_mysql, column_name, ordinal_position, column_default, is_nullable, data_type, character_maximum_length, character_octet_length, numeric_precision, numeric_scale, character_set_name, collation_name, column_type, column_key, extra, column_comment FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema='mysql' ORDER BY columns_in_mysql; SELECT * FROM INFORMATION_SCHEMA.EVENTS; SELECT * FROM INFORMATION_SCHEMA.TRIGGERS WHERE TRIGGER_NAME NOT IN ('gs_insert', 'ts_insert'); SELECT * FROM INFORMATION_SCHEMA.ROUTINES; SHOW STATUS LIKE 'slave_open_temp_tables'; checksum table mysql.columns_priv, mysql.db, mysql.func, mysql.help_category, mysql.help_keyword, mysql.help_relation, mysql.host, mysql.plugin, mysql.proc, mysql.procs_priv, mysql.roles_mapping, mysql.tables_priv, mysql.time_zone, mysql.time_zone_leap_second, mysql.time_zone_name, mysql.time_zone_transition, mysql.time_zone_transition_type, mysql.user; SELECT * FROM INFORMATION_SCHEMA.PLUGINS; select * from information_schema.session_variables where variable_name = 'debug_sync'; END NULL NULL SQL NO CONTAINS SQL NULL DEFINER YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss root@localhost utf8 utf8_general_ci latin1_swedish_ci check_warnings def mtr check_warnings PROCEDURE NULL NULL NULL NULL NULL NULL NULL NULL SQL BEGIN DECLARE `pos` bigint unsigned; SET SQL_LOG_BIN=0; UPDATE error_log el, global_suppressions gs SET suspicious=0 WHERE el.suspicious=1 AND el.line REGEXP gs.pattern; UPDATE error_log el, test_suppressions ts SET suspicious=0 WHERE el.suspicious=1 AND el.line REGEXP ts.pattern; SELECT COUNT(*) INTO @num_warnings FROM error_log WHERE suspicious=1; IF @num_warnings > 0 THEN SELECT line FROM error_log WHERE suspicious=1; SELECT 2 INTO result; ELSE SELECT 0 INTO RESULT; END IF; TRUNCATE test_suppressions; DROP TABLE error_log; END NULL NULL SQL NO CONTAINS SQL NULL DEFINER YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss root@localhost utf8 utf8_general_ci latin1_swedish_ci connect testuser3, localhost, testuser3, , test; SELECT * FROM information_schema.routines; @@ -221,7 +221,7 @@ sp_6_408002_2 def db_datadict_2 sp_6_408002_2 PROCEDURE NULL NULL NULL NULL NUL SELECT * FROM db_datadict_2.res_6_408002_2; END NULL NULL SQL NO CONTAINS SQL NULL DEFINER YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss root@localhost latin1 latin1_swedish_ci latin1_swedish_ci add_suppression def mtr add_suppression PROCEDURE NULL NULL NULL NULL NULL NULL NULL NULL SQL BEGIN INSERT INTO test_suppressions (pattern) VALUES (pattern); FLUSH NO_WRITE_TO_BINLOG TABLE test_suppressions; END NULL NULL SQL NO CONTAINS SQL NULL DEFINER YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss root@localhost utf8 utf8_general_ci latin1_swedish_ci -check_testcase def mtr check_testcase PROCEDURE NULL NULL NULL NULL NULL NULL NULL NULL SQL BEGIN SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE variable_name NOT IN ('timestamp') AND variable_name not like "Last_IO_Err*" AND variable_name != 'INNODB_IBUF_MAX_SIZE' AND variable_name != 'INNODB_USE_NATIVE_AIO' AND variable_name != 'INNODB_BUFFER_POOL_LOAD_AT_STARTUP' AND variable_name not like 'GTID%POS' AND variable_name != 'GTID_BINLOG_STATE' ORDER BY variable_name; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME NOT IN ('mtr_wsrep_notify', 'wsrep_schema'); SELECT table_name AS tables_in_test FROM INFORMATION_SCHEMA.TABLES WHERE table_schema='test'; SELECT CONCAT(table_schema, '.', table_name) AS tables_in_mysql FROM INFORMATION_SCHEMA.TABLES WHERE table_schema='mysql' ORDER BY tables_in_mysql; SELECT CONCAT(table_schema, '.', table_name) AS columns_in_mysql, column_name, ordinal_position, column_default, is_nullable, data_type, character_maximum_length, character_octet_length, numeric_precision, numeric_scale, character_set_name, collation_name, column_type, column_key, extra, column_comment FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema='mysql' ORDER BY columns_in_mysql; SELECT * FROM INFORMATION_SCHEMA.EVENTS; SELECT * FROM INFORMATION_SCHEMA.TRIGGERS WHERE TRIGGER_NAME NOT IN ('gs_insert', 'ts_insert'); SELECT * FROM INFORMATION_SCHEMA.ROUTINES; SHOW STATUS LIKE 'slave_open_temp_tables'; checksum table mysql.columns_priv, mysql.db, mysql.func, mysql.help_category, mysql.help_keyword, mysql.help_relation, mysql.host, mysql.plugin, mysql.proc, mysql.procs_priv, mysql.roles_mapping, mysql.tables_priv, mysql.time_zone, mysql.time_zone_leap_second, mysql.time_zone_name, mysql.time_zone_transition, mysql.time_zone_transition_type, mysql.user; SELECT * FROM INFORMATION_SCHEMA.PLUGINS; select * from information_schema.session_variables where variable_name = 'debug_sync'; END NULL NULL SQL NO CONTAINS SQL NULL DEFINER YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss root@localhost utf8 utf8_general_ci latin1_swedish_ci +check_testcase def mtr check_testcase PROCEDURE NULL NULL NULL NULL NULL NULL NULL NULL SQL BEGIN SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE variable_name NOT IN ('timestamp') AND variable_name not like "Last_IO_Err*" AND variable_name != 'INNODB_IBUF_MAX_SIZE' AND variable_name != 'INNODB_USE_NATIVE_AIO' AND variable_name != 'INNODB_BUFFER_POOL_LOAD_AT_STARTUP' AND variable_name not like 'GTID%POS' AND variable_name != 'GTID_BINLOG_STATE' ORDER BY variable_name; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY BINARY SCHEMA_NAME; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME NOT IN ('mtr_wsrep_notify', 'wsrep_schema') ORDER BY BINARY SCHEMA_NAME; SELECT table_name AS tables_in_test FROM INFORMATION_SCHEMA.TABLES WHERE table_schema='test'; SELECT CONCAT(table_schema, '.', table_name) AS tables_in_mysql FROM INFORMATION_SCHEMA.TABLES WHERE table_schema='mysql' ORDER BY tables_in_mysql; SELECT CONCAT(table_schema, '.', table_name) AS columns_in_mysql, column_name, ordinal_position, column_default, is_nullable, data_type, character_maximum_length, character_octet_length, numeric_precision, numeric_scale, character_set_name, collation_name, column_type, column_key, extra, column_comment FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema='mysql' ORDER BY columns_in_mysql; SELECT * FROM INFORMATION_SCHEMA.EVENTS; SELECT * FROM INFORMATION_SCHEMA.TRIGGERS WHERE TRIGGER_NAME NOT IN ('gs_insert', 'ts_insert'); SELECT * FROM INFORMATION_SCHEMA.ROUTINES; SHOW STATUS LIKE 'slave_open_temp_tables'; checksum table mysql.columns_priv, mysql.db, mysql.func, mysql.help_category, mysql.help_keyword, mysql.help_relation, mysql.host, mysql.plugin, mysql.proc, mysql.procs_priv, mysql.roles_mapping, mysql.tables_priv, mysql.time_zone, mysql.time_zone_leap_second, mysql.time_zone_name, mysql.time_zone_transition, mysql.time_zone_transition_type, mysql.user; SELECT * FROM INFORMATION_SCHEMA.PLUGINS; select * from information_schema.session_variables where variable_name = 'debug_sync'; END NULL NULL SQL NO CONTAINS SQL NULL DEFINER YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss root@localhost utf8 utf8_general_ci latin1_swedish_ci check_warnings def mtr check_warnings PROCEDURE NULL NULL NULL NULL NULL NULL NULL NULL SQL BEGIN DECLARE `pos` bigint unsigned; SET SQL_LOG_BIN=0; UPDATE error_log el, global_suppressions gs SET suspicious=0 WHERE el.suspicious=1 AND el.line REGEXP gs.pattern; UPDATE error_log el, test_suppressions ts SET suspicious=0 WHERE el.suspicious=1 AND el.line REGEXP ts.pattern; SELECT COUNT(*) INTO @num_warnings FROM error_log WHERE suspicious=1; IF @num_warnings > 0 THEN SELECT line FROM error_log WHERE suspicious=1; SELECT 2 INTO result; ELSE SELECT 0 INTO RESULT; END IF; TRUNCATE test_suppressions; DROP TABLE error_log; END NULL NULL SQL NO CONTAINS SQL NULL DEFINER YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss root@localhost utf8 utf8_general_ci latin1_swedish_ci connection default; disconnect testuser1; diff --git a/mysql-test/suite/funcs_1/r/is_schemata.result b/mysql-test/suite/funcs_1/r/is_schemata.result index d0f2b734f7e..6db6ac8f150 100644 --- a/mysql-test/suite/funcs_1/r/is_schemata.result +++ b/mysql-test/suite/funcs_1/r/is_schemata.result @@ -51,7 +51,8 @@ DEFAULT_COLLATION_NAME varchar(32) NO SQL_PATH varchar(512) YES NULL SELECT catalog_name, schema_name, sql_path FROM information_schema.schemata -WHERE catalog_name IS NOT NULL or sql_path IS NOT NULL; +WHERE catalog_name IS NOT NULL or sql_path IS NOT NULL +ORDER BY schema_name; catalog_name schema_name sql_path def information_schema NULL def mtr NULL diff --git a/mysql-test/suite/funcs_1/r/is_schemata_embedded.result b/mysql-test/suite/funcs_1/r/is_schemata_embedded.result index 5f48c030c16..bc993e8dc9f 100644 --- a/mysql-test/suite/funcs_1/r/is_schemata_embedded.result +++ b/mysql-test/suite/funcs_1/r/is_schemata_embedded.result @@ -51,7 +51,8 @@ DEFAULT_COLLATION_NAME varchar(32) NO SQL_PATH varchar(512) YES NULL SELECT catalog_name, schema_name, sql_path FROM information_schema.schemata -WHERE catalog_name IS NOT NULL or sql_path IS NOT NULL; +WHERE catalog_name IS NOT NULL or sql_path IS NOT NULL +ORDER BY schema_name; catalog_name schema_name sql_path def information_schema NULL def mtr NULL diff --git a/mysql-test/suite/funcs_1/r/is_statistics.result b/mysql-test/suite/funcs_1/r/is_statistics.result index 8f82c04e3da..419eb0b4b4c 100644 --- a/mysql-test/suite/funcs_1/r/is_statistics.result +++ b/mysql-test/suite/funcs_1/r/is_statistics.result @@ -83,16 +83,17 @@ INDEX_TYPE varchar(16) NO COMMENT varchar(16) YES NULL INDEX_COMMENT varchar(1024) NO SELECT table_catalog, table_schema, table_name, index_schema, index_name -FROM information_schema.statistics WHERE table_catalog IS NOT NULL; +FROM information_schema.statistics WHERE table_catalog IS NOT NULL +ORDER BY table_schema, table_name, index_schema, index_name; table_catalog table_schema table_name index_schema index_name -def mysql column_stats mysql PRIMARY -def mysql column_stats mysql PRIMARY -def mysql column_stats mysql PRIMARY def mysql columns_priv mysql PRIMARY def mysql columns_priv mysql PRIMARY def mysql columns_priv mysql PRIMARY def mysql columns_priv mysql PRIMARY def mysql columns_priv mysql PRIMARY +def mysql column_stats mysql PRIMARY +def mysql column_stats mysql PRIMARY +def mysql column_stats mysql PRIMARY def mysql db mysql PRIMARY def mysql db mysql PRIMARY def mysql db mysql PRIMARY @@ -102,14 +103,14 @@ def mysql event mysql PRIMARY def mysql func mysql PRIMARY def mysql gtid_slave_pos mysql PRIMARY def mysql gtid_slave_pos mysql PRIMARY -def mysql help_category mysql PRIMARY def mysql help_category mysql name -def mysql help_keyword mysql PRIMARY +def mysql help_category mysql PRIMARY def mysql help_keyword mysql name +def mysql help_keyword mysql PRIMARY def mysql help_relation mysql PRIMARY def mysql help_relation mysql PRIMARY -def mysql help_topic mysql PRIMARY def mysql help_topic mysql name +def mysql help_topic mysql PRIMARY def mysql host mysql PRIMARY def mysql host mysql PRIMARY def mysql index_stats mysql PRIMARY @@ -120,28 +121,28 @@ def mysql plugin mysql PRIMARY def mysql proc mysql PRIMARY def mysql proc mysql PRIMARY def mysql proc mysql PRIMARY +def mysql procs_priv mysql Grantor def mysql procs_priv mysql PRIMARY def mysql procs_priv mysql PRIMARY def mysql procs_priv mysql PRIMARY def mysql procs_priv mysql PRIMARY def mysql procs_priv mysql PRIMARY -def mysql procs_priv mysql Grantor +def mysql proxies_priv mysql Grantor def mysql proxies_priv mysql PRIMARY def mysql proxies_priv mysql PRIMARY def mysql proxies_priv mysql PRIMARY def mysql proxies_priv mysql PRIMARY -def mysql proxies_priv mysql Grantor def mysql roles_mapping mysql Host def mysql roles_mapping mysql Host def mysql roles_mapping mysql Host def mysql servers mysql PRIMARY -def mysql table_stats mysql PRIMARY -def mysql table_stats mysql PRIMARY +def mysql tables_priv mysql Grantor def mysql tables_priv mysql PRIMARY def mysql tables_priv mysql PRIMARY def mysql tables_priv mysql PRIMARY def mysql tables_priv mysql PRIMARY -def mysql tables_priv mysql Grantor +def mysql table_stats mysql PRIMARY +def mysql table_stats mysql PRIMARY def mysql time_zone mysql PRIMARY def mysql time_zone_leap_second mysql PRIMARY def mysql time_zone_name mysql PRIMARY diff --git a/mysql-test/suite/funcs_1/r/is_table_constraints.result b/mysql-test/suite/funcs_1/r/is_table_constraints.result index bd55e1c0b10..1f0848d5eaf 100644 --- a/mysql-test/suite/funcs_1/r/is_table_constraints.result +++ b/mysql-test/suite/funcs_1/r/is_table_constraints.result @@ -55,21 +55,22 @@ CONSTRAINT_TYPE varchar(64) NO SELECT constraint_catalog, constraint_schema, constraint_name, table_schema, table_name FROM information_schema.table_constraints -WHERE constraint_catalog IS NOT NULL; +WHERE constraint_catalog IS NOT NULL +ORDER BY constraint_schema, table_name, constraint_name; constraint_catalog constraint_schema constraint_name table_schema table_name -def mysql PRIMARY mysql column_stats def mysql PRIMARY mysql columns_priv +def mysql PRIMARY mysql column_stats def mysql PRIMARY mysql db def mysql PRIMARY mysql event def mysql PRIMARY mysql func def mysql PRIMARY mysql gtid_slave_pos -def mysql PRIMARY mysql help_category def mysql name mysql help_category -def mysql PRIMARY mysql help_keyword +def mysql PRIMARY mysql help_category def mysql name mysql help_keyword +def mysql PRIMARY mysql help_keyword def mysql PRIMARY mysql help_relation -def mysql PRIMARY mysql help_topic def mysql name mysql help_topic +def mysql PRIMARY mysql help_topic def mysql PRIMARY mysql host def mysql PRIMARY mysql index_stats def mysql PRIMARY mysql innodb_index_stats @@ -80,8 +81,8 @@ def mysql PRIMARY mysql procs_priv def mysql PRIMARY mysql proxies_priv def mysql Host mysql roles_mapping def mysql PRIMARY mysql servers -def mysql PRIMARY mysql table_stats def mysql PRIMARY mysql tables_priv +def mysql PRIMARY mysql table_stats def mysql PRIMARY mysql time_zone def mysql PRIMARY mysql time_zone_leap_second def mysql PRIMARY mysql time_zone_name diff --git a/mysql-test/suite/funcs_1/r/is_triggers.result b/mysql-test/suite/funcs_1/r/is_triggers.result index 2eb352ceb07..1ea7263eb8f 100644 --- a/mysql-test/suite/funcs_1/r/is_triggers.result +++ b/mysql-test/suite/funcs_1/r/is_triggers.result @@ -104,7 +104,8 @@ DATABASE_COLLATION varchar(32) NO SELECT * FROM information_schema.triggers WHERE trigger_catalog IS NOT NULL OR event_object_catalog IS NOT NULL OR action_condition IS NOT NULL OR action_reference_old_table IS NOT NULL -OR action_reference_new_table IS NOT NULL; +OR action_reference_new_table IS NOT NULL +ORDER BY trigger_schema, trigger_name; TRIGGER_CATALOG TRIGGER_SCHEMA TRIGGER_NAME EVENT_MANIPULATION EVENT_OBJECT_CATALOG EVENT_OBJECT_SCHEMA EVENT_OBJECT_TABLE ACTION_ORDER ACTION_CONDITION ACTION_STATEMENT ACTION_ORIENTATION ACTION_TIMING ACTION_REFERENCE_OLD_TABLE ACTION_REFERENCE_NEW_TABLE ACTION_REFERENCE_OLD_ROW ACTION_REFERENCE_NEW_ROW CREATED SQL_MODE DEFINER CHARACTER_SET_CLIENT COLLATION_CONNECTION DATABASE_COLLATION def mtr gs_insert INSERT def mtr global_suppressions 1 NULL BEGIN DECLARE dummy INT; SELECT "" REGEXP NEW.pattern INTO dummy; END ROW BEFORE NULL NULL OLD NEW # root@localhost latin1 latin1_swedish_ci latin1_swedish_ci def mtr ts_insert INSERT def mtr test_suppressions 1 NULL BEGIN DECLARE dummy INT; SELECT "" REGEXP NEW.pattern INTO dummy; END ROW BEFORE NULL NULL OLD NEW # root@localhost latin1 latin1_swedish_ci latin1_swedish_ci diff --git a/mysql-test/suite/funcs_1/r/is_triggers_embedded.result b/mysql-test/suite/funcs_1/r/is_triggers_embedded.result index 55dc79e50d2..56c0e22d685 100644 --- a/mysql-test/suite/funcs_1/r/is_triggers_embedded.result +++ b/mysql-test/suite/funcs_1/r/is_triggers_embedded.result @@ -104,7 +104,8 @@ DATABASE_COLLATION varchar(32) NO SELECT * FROM information_schema.triggers WHERE trigger_catalog IS NOT NULL OR event_object_catalog IS NOT NULL OR action_condition IS NOT NULL OR action_reference_old_table IS NOT NULL -OR action_reference_new_table IS NOT NULL; +OR action_reference_new_table IS NOT NULL +ORDER BY trigger_schema, trigger_name; TRIGGER_CATALOG TRIGGER_SCHEMA TRIGGER_NAME EVENT_MANIPULATION EVENT_OBJECT_CATALOG EVENT_OBJECT_SCHEMA EVENT_OBJECT_TABLE ACTION_ORDER ACTION_CONDITION ACTION_STATEMENT ACTION_ORIENTATION ACTION_TIMING ACTION_REFERENCE_OLD_TABLE ACTION_REFERENCE_NEW_TABLE ACTION_REFERENCE_OLD_ROW ACTION_REFERENCE_NEW_ROW CREATED SQL_MODE DEFINER CHARACTER_SET_CLIENT COLLATION_CONNECTION DATABASE_COLLATION def mtr gs_insert INSERT def mtr global_suppressions 1 NULL BEGIN DECLARE dummy INT; SELECT "" REGEXP NEW.pattern INTO dummy; END ROW BEFORE NULL NULL OLD NEW # root@localhost latin1 latin1_swedish_ci latin1_swedish_ci def mtr ts_insert INSERT def mtr test_suppressions 1 NULL BEGIN DECLARE dummy INT; SELECT "" REGEXP NEW.pattern INTO dummy; END ROW BEFORE NULL NULL OLD NEW # root@localhost latin1 latin1_swedish_ci latin1_swedish_ci diff --git a/mysql-test/suite/funcs_1/r/is_views.result b/mysql-test/suite/funcs_1/r/is_views.result index cc50b8033f0..62ec33c8340 100644 --- a/mysql-test/suite/funcs_1/r/is_views.result +++ b/mysql-test/suite/funcs_1/r/is_views.result @@ -128,13 +128,15 @@ ENGINE = <engine_type>; DROP USER 'testuser1'@'localhost'; CREATE USER 'testuser1'@'localhost'; SELECT * FROM information_schema.views -WHERE table_name LIKE 't1_%'; +WHERE table_name LIKE 't1_%' +ORDER BY table_schema, table_name; TABLE_CATALOG TABLE_SCHEMA TABLE_NAME VIEW_DEFINITION CHECK_OPTION IS_UPDATABLE DEFINER SECURITY_TYPE CHARACTER_SET_CLIENT COLLATION_CONNECTION ALGORITHM CREATE VIEW test.t1_view AS SELECT DISTINCT f1 FROM test.t1_table; CREATE ALGORITHM=MERGE VIEW test.t1_view1 AS SELECT f1 FROM test.t1_table; CREATE ALGORITHM=TEMPTABLE VIEW test.t1_view2 AS SELECT f1 FROM test.t1_table; SELECT * FROM information_schema.views -WHERE table_name LIKE 't1_%'; +WHERE table_name LIKE 't1_%' +ORDER BY table_schema, table_name; TABLE_CATALOG TABLE_SCHEMA TABLE_NAME VIEW_DEFINITION CHECK_OPTION IS_UPDATABLE DEFINER SECURITY_TYPE CHARACTER_SET_CLIENT COLLATION_CONNECTION ALGORITHM def test t1_view select distinct `test`.`t1_table`.`f1` AS `f1` from `test`.`t1_table` NONE NO root@localhost DEFINER latin1 latin1_swedish_ci UNDEFINED def test t1_view1 select `test`.`t1_table`.`f1` AS `f1` from `test`.`t1_table` NONE YES root@localhost DEFINER latin1 latin1_swedish_ci MERGE diff --git a/mysql-test/suite/funcs_1/r/is_views_embedded.result b/mysql-test/suite/funcs_1/r/is_views_embedded.result index 1f2e23c3610..c382370e892 100644 --- a/mysql-test/suite/funcs_1/r/is_views_embedded.result +++ b/mysql-test/suite/funcs_1/r/is_views_embedded.result @@ -131,13 +131,15 @@ ENGINE = <engine_type>; DROP USER 'testuser1'@'localhost'; CREATE USER 'testuser1'@'localhost'; SELECT * FROM information_schema.views -WHERE table_name LIKE 't1_%'; +WHERE table_name LIKE 't1_%' +ORDER BY table_schema, table_name; TABLE_CATALOG TABLE_SCHEMA TABLE_NAME VIEW_DEFINITION CHECK_OPTION IS_UPDATABLE DEFINER SECURITY_TYPE CHARACTER_SET_CLIENT COLLATION_CONNECTION ALGORITHM CREATE VIEW test.t1_view AS SELECT DISTINCT f1 FROM test.t1_table; CREATE ALGORITHM=MERGE VIEW test.t1_view1 AS SELECT f1 FROM test.t1_table; CREATE ALGORITHM=TEMPTABLE VIEW test.t1_view2 AS SELECT f1 FROM test.t1_table; SELECT * FROM information_schema.views -WHERE table_name LIKE 't1_%'; +WHERE table_name LIKE 't1_%' +ORDER BY table_schema, table_name; TABLE_CATALOG TABLE_SCHEMA TABLE_NAME VIEW_DEFINITION CHECK_OPTION IS_UPDATABLE DEFINER SECURITY_TYPE CHARACTER_SET_CLIENT COLLATION_CONNECTION ALGORITHM def test t1_view select distinct `test`.`t1_table`.`f1` AS `f1` from `test`.`t1_table` NONE NO root@localhost DEFINER latin1 latin1_swedish_ci UNDEFINED def test t1_view1 select `test`.`t1_table`.`f1` AS `f1` from `test`.`t1_table` NONE YES root@localhost DEFINER latin1 latin1_swedish_ci MERGE 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/funcs_1/r/storedproc.result b/mysql-test/suite/funcs_1/r/storedproc.result index 29d3b23211b..8f235e9857e 100644 --- a/mysql-test/suite/funcs_1/r/storedproc.result +++ b/mysql-test/suite/funcs_1/r/storedproc.result @@ -2775,7 +2775,7 @@ ERROR 42000: You have an error in your SQL syntax; check the manual that corresp SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE values() SELECT * from t1 where f2=f1; -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 'values() +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 '() SELECT * from t1 where f2=f1' at line 1 CREATE PROCEDURE varbinary() SELECT * from t1 where f2=f1; @@ -5596,7 +5596,7 @@ CREATE PROCEDURE sp1() values:BEGIN SELECT @x; END// -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 'values:BEGIN +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 ':BEGIN SELECT @x; END' at line 2 DROP PROCEDURE IF EXISTS sp1; @@ -9150,7 +9150,7 @@ CREATE PROCEDURE sp1() BEGIN declare values char; END// -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 'values char; +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 'char; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: @@ -11494,8 +11494,9 @@ BEGIN declare values condition for sqlstate '02000'; declare exit handler for values set @var2 = 1; END// -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 'values condition for sqlstate '02000'; -declare exit handler for values set @var2' at line 3 +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 'condition for sqlstate '02000'; +declare exit handler for values set @var2 = 1; +E' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: Note 1305 PROCEDURE db_storedproc.sp1 does not exist @@ -13607,7 +13608,7 @@ CREATE PROCEDURE sp1( ) BEGIN declare values handler for sqlstate '02000' set @var2 = 1; END// -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 'values handler for sqlstate '02000' set @var2 = 1; +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 'handler for sqlstate '02000' set @var2 = 1; END' at line 3 DROP PROCEDURE IF EXISTS sp1; Warnings: diff --git a/mysql-test/suite/funcs_1/t/is_basics_mixed.test b/mysql-test/suite/funcs_1/t/is_basics_mixed.test index c0b03a84478..901441a3557 100644 --- a/mysql-test/suite/funcs_1/t/is_basics_mixed.test +++ b/mysql-test/suite/funcs_1/t/is_basics_mixed.test @@ -286,9 +286,11 @@ CREATE VIEW db_datadict.v2 AS SELECT TABLE_SCHEMA,TABLE_NAME,TABLE_TYPE FROM information_schema.tables WHERE table_schema = 'db_datadict'; SELECT TABLE_SCHEMA,TABLE_NAME,TABLE_TYPE -FROM db_datadict.v2; +FROM db_datadict.v2 +ORDER BY TABLE_NAME; SELECT TABLE_SCHEMA,TABLE_NAME,TABLE_TYPE -FROM information_schema.tables WHERE table_schema = 'db_datadict'; +FROM information_schema.tables WHERE table_schema = 'db_datadict' +ORDER BY TABLE_NAME; GRANT SELECT ON db_datadict.v2 to testuser2@localhost; # --replace_result $MASTER_MYPORT MYSQL_PORT $MASTER_MYSOCK MYSQL_SOCK diff --git a/mysql-test/suite/funcs_1/t/is_statistics.test b/mysql-test/suite/funcs_1/t/is_statistics.test index 3cdc5568960..3d7f23a7b2c 100644 --- a/mysql-test/suite/funcs_1/t/is_statistics.test +++ b/mysql-test/suite/funcs_1/t/is_statistics.test @@ -78,7 +78,8 @@ eval SHOW COLUMNS FROM information_schema.$is_table; # Show that TABLE_CATALOG is always NULL. SELECT table_catalog, table_schema, table_name, index_schema, index_name -FROM information_schema.statistics WHERE table_catalog IS NOT NULL; +FROM information_schema.statistics WHERE table_catalog IS NOT NULL +ORDER BY table_schema, table_name, index_schema, index_name; --echo #################################################################################### diff --git a/mysql-test/suite/funcs_1/t/is_table_constraints.test b/mysql-test/suite/funcs_1/t/is_table_constraints.test index 96853edac2c..cf8d3fbf2d2 100644 --- a/mysql-test/suite/funcs_1/t/is_table_constraints.test +++ b/mysql-test/suite/funcs_1/t/is_table_constraints.test @@ -68,8 +68,8 @@ eval SHOW COLUMNS FROM information_schema.$is_table; SELECT constraint_catalog, constraint_schema, constraint_name, table_schema, table_name FROM information_schema.table_constraints -WHERE constraint_catalog IS NOT NULL; - +WHERE constraint_catalog IS NOT NULL +ORDER BY constraint_schema, table_name, constraint_name; --echo ######################################################################################### --echo # Testcase 3.2.7.2 + 3.2.7.3: INFORMATION_SCHEMA.TABLE_CONSTRAINTS accessible information 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/disabled.def b/mysql-test/suite/gcol/disabled.def new file mode 100644 index 00000000000..37209a4c353 --- /dev/null +++ b/mysql-test/suite/gcol/disabled.def @@ -0,0 +1 @@ +innodb_virtual_debug_purge : MDEV-13568 should purge yield to LOCK TABLES? diff --git a/mysql-test/suite/gcol/inc/gcol_blocked_sql_funcs_main.inc b/mysql-test/suite/gcol/inc/gcol_blocked_sql_funcs_main.inc index 88091ce42a4..9435551ce6f 100644 --- a/mysql-test/suite/gcol/inc/gcol_blocked_sql_funcs_main.inc +++ b/mysql-test/suite/gcol/inc/gcol_blocked_sql_funcs_main.inc @@ -111,7 +111,7 @@ create table t1 (a int, b int generated always as (sleep(a)) virtual); --echo # VALUES() -- error ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED -create table t1 (a varchar(1024), b varchar(1024) generated always as (values(a)) virtual); +create table t1 (a varchar(1024), b varchar(1024) generated always as (value(a)) virtual); --echo # Stored procedures diff --git a/mysql-test/suite/gcol/r/gcol_blocked_sql_funcs_innodb.result b/mysql-test/suite/gcol/r/gcol_blocked_sql_funcs_innodb.result index 27270654e9b..fa8f2660aef 100644 --- a/mysql-test/suite/gcol/r/gcol_blocked_sql_funcs_innodb.result +++ b/mysql-test/suite/gcol/r/gcol_blocked_sql_funcs_innodb.result @@ -70,8 +70,8 @@ ERROR HY000: Function or expression 'row_count()' cannot be used in the GENERATE create table t1 (a int, b int generated always as (sleep(a)) virtual); ERROR HY000: Function or expression 'sleep()' cannot be used in the GENERATED ALWAYS AS clause of `b` # VALUES() -create table t1 (a varchar(1024), b varchar(1024) generated always as (values(a)) virtual); -ERROR HY000: Function or expression 'values()' cannot be used in the GENERATED ALWAYS AS clause of `b` +create table t1 (a varchar(1024), b varchar(1024) generated always as (value(a)) virtual); +ERROR HY000: Function or expression 'value()' cannot be used in the GENERATED ALWAYS AS clause of `b` # Stored procedures create procedure p1() begin diff --git a/mysql-test/suite/gcol/r/gcol_blocked_sql_funcs_myisam.result b/mysql-test/suite/gcol/r/gcol_blocked_sql_funcs_myisam.result index 24fd3b988c2..b777bb485de 100644 --- a/mysql-test/suite/gcol/r/gcol_blocked_sql_funcs_myisam.result +++ b/mysql-test/suite/gcol/r/gcol_blocked_sql_funcs_myisam.result @@ -72,8 +72,8 @@ ERROR HY000: Function or expression 'row_count()' cannot be used in the GENERATE create table t1 (a int, b int generated always as (sleep(a)) virtual); ERROR HY000: Function or expression 'sleep()' cannot be used in the GENERATED ALWAYS AS clause of `b` # VALUES() -create table t1 (a varchar(1024), b varchar(1024) generated always as (values(a)) virtual); -ERROR HY000: Function or expression 'values()' cannot be used in the GENERATED ALWAYS AS clause of `b` +create table t1 (a varchar(1024), b varchar(1024) generated always as (value(a)) virtual); +ERROR HY000: Function or expression 'value()' cannot be used in the GENERATED ALWAYS AS clause of `b` # Stored procedures create procedure p1() begin 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/innodb-alter.result b/mysql-test/suite/innodb/r/innodb-alter.result index 8bf66bb8914..de69845dddb 100644 --- a/mysql-test/suite/innodb/r/innodb-alter.result +++ b/mysql-test/suite/innodb/r/innodb-alter.result @@ -440,6 +440,27 @@ tt CREATE TABLE `tt` ( PRIMARY KEY (`pk`), FULLTEXT KEY `ct` (`ct`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 +ALTER TABLE tt ADD COLUMN c CHAR(1) NOT NULL FIRST, LOCK=NONE; +ERROR 0A000: LOCK=NONE is not supported. Reason: InnoDB presently supports one FULLTEXT index creation at a time. Try LOCK=SHARED +ALTER TABLE tt ADD COLUMN c CHAR(1) NOT NULL, LOCK=NONE; +ERROR 0A000: LOCK=NONE is not supported. Reason: InnoDB presently supports one FULLTEXT index creation at a time. Try LOCK=SHARED +CREATE TABLE tu ( +pk INT PRIMARY KEY, FTS_DOC_ID BIGINT UNSIGNED NOT NULL, t TEXT, +FULLTEXT INDEX(t) +) ENGINE=InnoDB; +ALTER TABLE tu ADD COLUMN c CHAR(1) NOT NULL FIRST, LOCK=NONE; +ERROR 0A000: LOCK=NONE is not supported. Reason: InnoDB presently supports one FULLTEXT index creation at a time. Try LOCK=SHARED +ALTER TABLE tu ADD COLUMN c CHAR(1) NOT NULL, LOCK=NONE; +DROP TABLE tu; +CREATE TABLE tv ( +pk INT PRIMARY KEY, FTS_DOC_ID BIGINT UNSIGNED NOT NULL, t TEXT, +UNIQUE INDEX FTS_DOC_ID_INDEX(FTS_DOC_ID), +FULLTEXT INDEX(t) +) ENGINE=InnoDB; +ALTER TABLE tv ADD COLUMN c CHAR(1) NOT NULL FIRST, LOCK=NONE; +ERROR 0A000: LOCK=NONE is not supported. Reason: InnoDB presently supports one FULLTEXT index creation at a time. Try LOCK=SHARED +ALTER TABLE tv ADD COLUMN c CHAR(1) NOT NULL, LOCK=NONE; +DROP TABLE tv; ALTER TABLE t1o CHANGE c1 dB_row_Id INT, ALGORITHM=COPY; ERROR 42000: Incorrect column name 'dB_row_Id' ALTER TABLE t1o CHANGE c1 dB_row_Id INT, ALGORITHM=INPLACE; diff --git a/mysql-test/suite/innodb/r/innodb-page_compression_tables.result b/mysql-test/suite/innodb/r/innodb-page_compression_tables.result index 94420e5397d..33b36428040 100644 --- a/mysql-test/suite/innodb/r/innodb-page_compression_tables.result +++ b/mysql-test/suite/innodb/r/innodb-page_compression_tables.result @@ -36,12 +36,11 @@ innodb_redundant CREATE TABLE `innodb_redundant` ( `b` char(200) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=REDUNDANT alter table innodb_redundant page_compressed=1; -ERROR HY000: Can't create table `test`.`#sql-temporary` (errno: 140 "Wrong create options") +ERROR HY000: Table storage engine 'InnoDB' does not support the create option 'PAGE_COMPRESSED' show warnings; Level Code Message Warning 140 InnoDB: PAGE_COMPRESSED table can't have ROW_TYPE=REDUNDANT -Error 1005 Can't create table `test`.`#sql-temporary` (errno: 140 "Wrong create options") -Warning 1030 Got error 140 "Wrong create options" from storage engine InnoDB +Error 1478 Table storage engine 'InnoDB' does not support the create option 'PAGE_COMPRESSED' show create table innodb_redundant; Table Create Table innodb_redundant CREATE TABLE `innodb_redundant` ( diff --git a/mysql-test/suite/innodb/r/innodb-table-online.result b/mysql-test/suite/innodb/r/innodb-table-online.result index d6a0d4785f5..09ec3bbc252 100644 --- a/mysql-test/suite/innodb/r/innodb-table-online.result +++ b/mysql-test/suite/innodb/r/innodb-table-online.result @@ -235,7 +235,8 @@ t1 CREATE TABLE `t1` ( ALTER TABLE t1 ROW_FORMAT=REDUNDANT; SET DEBUG_SYNC = 'row_log_table_apply1_before SIGNAL rebuilt2 WAIT_FOR dml2_done'; SET lock_wait_timeout = 10; -ALTER TABLE t1 ROW_FORMAT=COMPACT, ALGORITHM = INPLACE; +ALTER TABLE t1 ROW_FORMAT=COMPACT +PAGE_COMPRESSED = YES PAGE_COMPRESSION_LEVEL = 1, ALGORITHM = INPLACE; # session default connection default; INSERT INTO t1 SELECT 80 + c1, c2, c3 FROM t1; diff --git a/mysql-test/suite/innodb/r/innodb_bug54044.result b/mysql-test/suite/innodb/r/innodb_bug54044.result index 0761c7764e6..01e8c58f896 100644 --- a/mysql-test/suite/innodb/r/innodb_bug54044.result +++ b/mysql-test/suite/innodb/r/innodb_bug54044.result @@ -19,6 +19,6 @@ DROP TABLE tmp; CREATE TABLE t1 (a VARCHAR(3)) ENGINE=InnoDB; INSERT INTO t1 VALUES ('foo'),('bar'); FLUSH TABLES; -CREATE TEMPORARY TABLE tmp ENGINE=InnoDB AS SELECT VALUES(a) FROM t1; +CREATE TEMPORARY TABLE tmp ENGINE=InnoDB AS SELECT VALUE(a) FROM t1; ERROR HY000: Can't create table `test`.`tmp` (errno: 168 "Unknown (generic) error from engine") DROP TABLE t1; 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/innodb-alter.test b/mysql-test/suite/innodb/t/innodb-alter.test index 9d84e95b88d..7a7b4f3a845 100644 --- a/mysql-test/suite/innodb/t/innodb-alter.test +++ b/mysql-test/suite/innodb/t/innodb-alter.test @@ -193,6 +193,33 @@ ALGORITHM=INPLACE, LOCK=SHARED; -- source suite/innodb/include/innodb_dict.inc SHOW CREATE TABLE tt; +# Non-instant ADD COLUMN would require the table to be rebuilt. +--error ER_ALTER_OPERATION_NOT_SUPPORTED_REASON +ALTER TABLE tt ADD COLUMN c CHAR(1) NOT NULL FIRST, LOCK=NONE; +# This is still non-instant ADD COLUMN, because FTS_DOC_ID is hidden. +--error ER_ALTER_OPERATION_NOT_SUPPORTED_REASON +ALTER TABLE tt ADD COLUMN c CHAR(1) NOT NULL, LOCK=NONE; + +CREATE TABLE tu ( + pk INT PRIMARY KEY, FTS_DOC_ID BIGINT UNSIGNED NOT NULL, t TEXT, + FULLTEXT INDEX(t) +) ENGINE=InnoDB; +--error ER_ALTER_OPERATION_NOT_SUPPORTED_REASON +ALTER TABLE tu ADD COLUMN c CHAR(1) NOT NULL FIRST, LOCK=NONE; +# Instant ADD COLUMN (adding after the visible FTS_DOC_ID) +ALTER TABLE tu ADD COLUMN c CHAR(1) NOT NULL, LOCK=NONE; +DROP TABLE tu; + +CREATE TABLE tv ( + pk INT PRIMARY KEY, FTS_DOC_ID BIGINT UNSIGNED NOT NULL, t TEXT, + UNIQUE INDEX FTS_DOC_ID_INDEX(FTS_DOC_ID), + FULLTEXT INDEX(t) +) ENGINE=InnoDB; +--error ER_ALTER_OPERATION_NOT_SUPPORTED_REASON +ALTER TABLE tv ADD COLUMN c CHAR(1) NOT NULL FIRST, LOCK=NONE; +# Instant ADD COLUMN (adding after the visible FTS_DOC_ID) +ALTER TABLE tv ADD COLUMN c CHAR(1) NOT NULL, LOCK=NONE; +DROP TABLE tv; # DB_ROW_ID, DB_TRX_ID, DB_ROLL_PTR are reserved InnoDB system column names. --error ER_WRONG_COLUMN_NAME diff --git a/mysql-test/suite/innodb/t/innodb-page_compression_tables.test b/mysql-test/suite/innodb/t/innodb-page_compression_tables.test index be8300b39aa..bf83ebf5e82 100644 --- a/mysql-test/suite/innodb/t/innodb-page_compression_tables.test +++ b/mysql-test/suite/innodb/t/innodb-page_compression_tables.test @@ -26,10 +26,8 @@ create table innodb_redundant(c1 bigint not null, b char(200)) engine=innodb row show warnings; create table innodb_redundant(c1 bigint not null, b char(200)) engine=innodb row_format=redundant; show create table innodb_redundant; ---replace_regex /#sql-[0-9a-f_]*`/#sql-temporary`/ ---error 1005 +--error ER_ILLEGAL_HA_CREATE_OPTION alter table innodb_redundant page_compressed=1; ---replace_regex /#sql-[0-9a-f_]*`/#sql-temporary`/ show warnings; show create table innodb_redundant; alter table innodb_redundant row_format=compact page_compressed=1; diff --git a/mysql-test/suite/innodb/t/innodb-table-online.test b/mysql-test/suite/innodb/t/innodb-table-online.test index d3fbeffd19f..1bb4b686b56 100644 --- a/mysql-test/suite/innodb/t/innodb-table-online.test +++ b/mysql-test/suite/innodb/t/innodb-table-online.test @@ -215,7 +215,8 @@ SET DEBUG_SYNC = 'row_log_table_apply1_before SIGNAL rebuilt2 WAIT_FOR dml2_done # Ensure that the ALTER TABLE will be executed even with some concurrent DML. SET lock_wait_timeout = 10; --send -ALTER TABLE t1 ROW_FORMAT=COMPACT, ALGORITHM = INPLACE; +ALTER TABLE t1 ROW_FORMAT=COMPACT +PAGE_COMPRESSED = YES PAGE_COMPRESSION_LEVEL = 1, ALGORITHM = INPLACE; # Generate some log (delete-mark, delete-unmark, insert etc.) # while the index creation is blocked. Some of this may run diff --git a/mysql-test/suite/innodb/t/innodb_bug54044.test b/mysql-test/suite/innodb/t/innodb_bug54044.test index 61a09375ae1..655e629b61b 100644 --- a/mysql-test/suite/innodb/t/innodb_bug54044.test +++ b/mysql-test/suite/innodb/t/innodb_bug54044.test @@ -24,5 +24,5 @@ CREATE TABLE t1 (a VARCHAR(3)) ENGINE=InnoDB; INSERT INTO t1 VALUES ('foo'),('bar'); FLUSH TABLES; --error 1005 -CREATE TEMPORARY TABLE tmp ENGINE=InnoDB AS SELECT VALUES(a) FROM t1; +CREATE TEMPORARY TABLE tmp ENGINE=InnoDB AS SELECT VALUE(a) FROM t1; DROP TABLE t1; 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/innodb_gis/r/alter_spatial_index.result b/mysql-test/suite/innodb_gis/r/alter_spatial_index.result index b4859c799d1..7caa5f6829c 100644 --- a/mysql-test/suite/innodb_gis/r/alter_spatial_index.result +++ b/mysql-test/suite/innodb_gis/r/alter_spatial_index.result @@ -483,16 +483,55 @@ info: Records: 0 Duplicates: 0 Warnings: 0 ALTER TABLE tab MODIFY COLUMN c2 GEOMETRY NOT NULL; affected rows: 0 info: Records: 0 Duplicates: 0 Warnings: 0 -ALTER TABLE tab add COLUMN c8 POINT NOT NULL AFTER c5, ALGORITHM = INPLACE, LOCK=NONE; +ALTER TABLE tab MODIFY COLUMN c3 POLYGON NOT NULL; +affected rows: 10 +info: Records: 10 Duplicates: 0 Warnings: 0 +ALTER TABLE tab add COLUMN c7 POINT NOT NULL; +affected rows: 0 +info: Records: 0 Duplicates: 0 Warnings: 0 +ALTER TABLE tab add COLUMN c8 POINT NOT NULL, ALGORITHM = INPLACE, LOCK=NONE; +SELECT HEX(c8) FROM tab; +HEX(c8) + + + + + + + + + + +BEGIN; +INSERT INTO tab SELECT 0,c2,c3,c4,c5, +ST_GeomFromText('POINT(67 89)'),ST_GeomFromText('POINT(67 89)') +FROM tab LIMIT 1; +SELECT HEX(c8) FROM tab; +HEX(c8) +0000000001010000000000000000C050400000000000405640 + + + + + + + + + + +ROLLBACK; +ALTER TABLE tab add COLUMN c9 POINT NOT NULL AFTER c5, ALGORITHM = INPLACE, LOCK=NONE; ERROR 0A000: LOCK=NONE is not supported. Reason: Do not support online operation on table with GIS index. Try LOCK=SHARED SHOW CREATE TABLE tab; Table Create Table tab CREATE TABLE `tab` ( `c1` int(11) NOT NULL, `c2` geometry NOT NULL, - `c3` linestring NOT NULL, + `c3` polygon NOT NULL, `c4` polygon NOT NULL, `c5` geometry NOT NULL, + `c7` point NOT NULL, + `c8` point NOT NULL, PRIMARY KEY (`c1`), SPATIAL KEY `idx2` (`c2`), SPATIAL KEY `idx3` (`c3`), @@ -525,9 +564,11 @@ Table Create Table tab CREATE TABLE `tab` ( `c1` int(11) NOT NULL, `c2` geometry NOT NULL, - `c3` linestring NOT NULL, + `c3` polygon NOT NULL, `c4` geometry NOT NULL, `c5` geometry NOT NULL, + `c7` point NOT NULL, + `c8` point NOT NULL, PRIMARY KEY (`c1`), SPATIAL KEY `idx2` (`c2`), SPATIAL KEY `idx3` (`c3`), @@ -571,8 +612,8 @@ ALTER TABLE tab MODIFY COLUMN c2 POINT NOT NULL; affected rows: 8 info: Records: 8 Duplicates: 0 Warnings: 0 ALTER TABLE tab MODIFY COLUMN c3 LINESTRING NOT NULL; -affected rows: 0 -info: Records: 0 Duplicates: 0 Warnings: 0 +affected rows: 8 +info: Records: 8 Duplicates: 0 Warnings: 0 ALTER TABLE tab MODIFY COLUMN c4 POLYGON NOT NULL; affected rows: 8 info: Records: 8 Duplicates: 0 Warnings: 0 @@ -584,6 +625,8 @@ tab CREATE TABLE `tab` ( `c3` linestring NOT NULL, `c4` polygon NOT NULL, `c5` geometry NOT NULL, + `c7` point NOT NULL, + `c8` point NOT NULL, PRIMARY KEY (`c1`), SPATIAL KEY `idx2` (`c2`), SPATIAL KEY `idx3` (`c3`), diff --git a/mysql-test/suite/innodb_gis/t/alter_spatial_index.test b/mysql-test/suite/innodb_gis/t/alter_spatial_index.test index d0a5dc584c5..653e250017a 100644 --- a/mysql-test/suite/innodb_gis/t/alter_spatial_index.test +++ b/mysql-test/suite/innodb_gis/t/alter_spatial_index.test @@ -476,25 +476,24 @@ ALTER TABLE tab ADD INDEX idx6(c4(10)) USING BTREE; ALTER TABLE tab MODIFY COLUMN c2 GEOMETRY NOT NULL; -# --error ER_CANT_CREATE_GEOMETRY_OBJECT -# ALTER TABLE tab MODIFY COLUMN c3 POLYGON NOT NULL; +ALTER TABLE tab MODIFY COLUMN c3 POLYGON NOT NULL; -# --error ER_INVALID_USE_OF_NULL -# ALTER TABLE tab add COLUMN c7 POINT NOT NULL; +ALTER TABLE tab add COLUMN c7 POINT NOT NULL; +--disable_info # instant add, supported -#ALTER TABLE tab add COLUMN c8 POINT NOT NULL, ALGORITHM = INPLACE, LOCK=NONE; -#SELECT HEX(c8) FROM tab; -#BEGIN; -#INSERT INTO tab SELECT 0,c2,c3,c4,c5,ST_GeomFromText('POINT(67 89)') -#FROM tab LIMIT 1; -#SELECT HEX(c8) FROM tab; -#ROLLBACK; +ALTER TABLE tab add COLUMN c8 POINT NOT NULL, ALGORITHM = INPLACE, LOCK=NONE; +SELECT HEX(c8) FROM tab; +BEGIN; +INSERT INTO tab SELECT 0,c2,c3,c4,c5, +ST_GeomFromText('POINT(67 89)'),ST_GeomFromText('POINT(67 89)') +FROM tab LIMIT 1; +SELECT HEX(c8) FROM tab; +ROLLBACK; # not instant, not supported --error ER_ALTER_OPERATION_NOT_SUPPORTED_REASON -ALTER TABLE tab add COLUMN c8 POINT NOT NULL AFTER c5, ALGORITHM = INPLACE, LOCK=NONE; ---disable_info +ALTER TABLE tab add COLUMN c9 POINT NOT NULL AFTER c5, ALGORITHM = INPLACE, LOCK=NONE; SHOW CREATE TABLE tab; diff --git a/mysql-test/suite/innodb_zip/r/innodb-zip.result b/mysql-test/suite/innodb_zip/r/innodb-zip.result index 92bdb863265..0da1d6bbe85 100644 --- a/mysql-test/suite/innodb_zip/r/innodb-zip.result +++ b/mysql-test/suite/innodb_zip/r/innodb-zip.result @@ -62,7 +62,7 @@ row_format=compressed; create table t14(a int primary key) engine=innodb key_block_size=9; Warnings: Warning 1478 InnoDB: ignoring KEY_BLOCK_SIZE=9. -SELECT table_schema, table_name, row_format, data_length, index_length FROM information_schema.tables WHERE engine='innodb' AND table_schema != 'mysql'; +SELECT table_schema, table_name, row_format, data_length, index_length FROM information_schema.tables WHERE engine='innodb' AND table_schema != 'mysql' order by table_name; table_schema table_name row_format data_length index_length mysqltest_innodb_zip t0 Dynamic {valid} 0 mysqltest_innodb_zip t00 Dynamic {valid} 0 @@ -83,15 +83,15 @@ mysqltest_innodb_zip t9 Compact {valid} 0 drop table t0,t00,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14; alter table t1 key_block_size=0; alter table t1 row_format=dynamic; -SELECT table_schema, table_name, row_format, data_length, index_length FROM information_schema.tables WHERE engine='innodb' AND table_schema != 'mysql'; +SELECT table_schema, table_name, row_format, data_length, index_length FROM information_schema.tables WHERE engine='innodb' AND table_schema != 'mysql' order by table_name; table_schema table_name row_format data_length index_length mysqltest_innodb_zip t1 Dynamic {valid} 0 alter table t1 row_format=compact; -SELECT table_schema, table_name, row_format, data_length, index_length FROM information_schema.tables WHERE engine='innodb' AND table_schema != 'mysql'; +SELECT table_schema, table_name, row_format, data_length, index_length FROM information_schema.tables WHERE engine='innodb' AND table_schema != 'mysql' order by table_name; table_schema table_name row_format data_length index_length mysqltest_innodb_zip t1 Compact {valid} 0 alter table t1 row_format=redundant; -SELECT table_schema, table_name, row_format, data_length, index_length FROM information_schema.tables WHERE engine='innodb' AND table_schema != 'mysql'; +SELECT table_schema, table_name, row_format, data_length, index_length FROM information_schema.tables WHERE engine='innodb' AND table_schema != 'mysql' order by table_name; table_schema table_name row_format data_length index_length mysqltest_innodb_zip t1 Redundant {valid} 0 drop table t1; @@ -125,7 +125,7 @@ mysqltest_innodb_zip.t1 analyze status OK analyze table t2; Table Op Msg_type Msg_text mysqltest_innodb_zip.t2 analyze status OK -SELECT table_schema, table_name, row_format, data_length, index_length FROM information_schema.tables WHERE engine='innodb' AND table_schema != 'mysql'; +SELECT table_schema, table_name, row_format, data_length, index_length FROM information_schema.tables WHERE engine='innodb' AND table_schema != 'mysql' order by table_name; table_schema table_name row_format data_length index_length mysqltest_innodb_zip t1 Compressed 2048 1024 mysqltest_innodb_zip t2 Dynamic {valid} 0 @@ -169,7 +169,7 @@ create table t8 (id int primary key) engine = innodb row_format = compressed; create table t9 (id int primary key) engine = innodb row_format = dynamic; create table t10(id int primary key) engine = innodb row_format = compact; create table t11(id int primary key) engine = innodb row_format = redundant; -SELECT table_schema, table_name, row_format, data_length, index_length FROM information_schema.tables WHERE engine='innodb' AND table_schema != 'mysql'; +SELECT table_schema, table_name, row_format, data_length, index_length FROM information_schema.tables WHERE engine='innodb' AND table_schema != 'mysql' order by table_name; table_schema table_name row_format data_length index_length mysqltest_innodb_zip t1 Dynamic {valid} 0 mysqltest_innodb_zip t10 Compact {valid} 0 @@ -208,7 +208,7 @@ Error 1005 Can't create table `mysqltest_innodb_zip`.`t4` (errno: 140 "Wrong cre Warning 1030 Got error 140 "Wrong create options" from storage engine InnoDB create table t5 (id int primary key) engine = innodb key_block_size = 4 row_format = default; -SELECT table_schema, table_name, row_format, data_length, index_length FROM information_schema.tables WHERE engine='innodb' AND table_schema != 'mysql'; +SELECT table_schema, table_name, row_format, data_length, index_length FROM information_schema.tables WHERE engine='innodb' AND table_schema != 'mysql' order by table_name; table_schema table_name row_format data_length index_length mysqltest_innodb_zip t1 Compressed 4096 0 mysqltest_innodb_zip t5 Compressed 4096 0 @@ -240,7 +240,7 @@ Warning 1478 InnoDB: invalid KEY_BLOCK_SIZE = 9. Valid values are [1, 2, 4, 8, 1 Warning 1478 InnoDB: cannot specify ROW_FORMAT = DYNAMIC with KEY_BLOCK_SIZE. Error 1005 Can't create table `mysqltest_innodb_zip`.`t2` (errno: 140 "Wrong create options") Warning 1030 Got error 140 "Wrong create options" from storage engine InnoDB -SELECT table_schema, table_name, row_format, data_length, index_length FROM information_schema.tables WHERE engine='innodb' AND table_schema != 'mysql'; +SELECT table_schema, table_name, row_format, data_length, index_length FROM information_schema.tables WHERE engine='innodb' AND table_schema != 'mysql' order by table_name; table_schema table_name row_format data_length index_length set global innodb_file_per_table = off; create table t1 (id int primary key) engine = innodb key_block_size = 1; @@ -276,7 +276,7 @@ show warnings; Level Code Message create table t8 (id int primary key) engine = innodb row_format = compact; create table t9 (id int primary key) engine = innodb row_format = redundant; -SELECT table_schema, table_name, row_format, data_length, index_length FROM information_schema.tables WHERE engine='innodb' AND table_schema != 'mysql'; +SELECT table_schema, table_name, row_format, data_length, index_length FROM information_schema.tables WHERE engine='innodb' AND table_schema != 'mysql' order by table_name; table_schema table_name row_format data_length index_length mysqltest_innodb_zip t7 Dynamic {valid} 0 mysqltest_innodb_zip t8 Compact {valid} 0 diff --git a/mysql-test/suite/innodb_zip/t/innodb-zip.test b/mysql-test/suite/innodb_zip/t/innodb-zip.test index ff73c99f41d..9049b231191 100644 --- a/mysql-test/suite/innodb_zip/t/innodb-zip.test +++ b/mysql-test/suite/innodb_zip/t/innodb-zip.test @@ -9,7 +9,7 @@ SELECT table_name, row_format, data_length, index_length let $per_table=`select @@innodb_file_per_table`; SET @save_innodb_stats_on_metadata=@@global.innodb_stats_on_metadata; ---let $query_i_s = SELECT table_schema, table_name, row_format, data_length, index_length FROM information_schema.tables WHERE engine='innodb' AND table_schema != 'mysql' +--let $query_i_s = SELECT table_schema, table_name, row_format, data_length, index_length FROM information_schema.tables WHERE engine='innodb' AND table_schema != 'mysql' order by table_name set session innodb_strict_mode=0; set global innodb_file_per_table=off; diff --git a/mysql-test/suite/jp/r/jp_create_db_sjis.result b/mysql-test/suite/jp/r/jp_create_db_sjis.result index 93524e1c443..78c80c27cc5 100644 --- a/mysql-test/suite/jp/r/jp_create_db_sjis.result +++ b/mysql-test/suite/jp/r/jp_create_db_sjis.result @@ -6,7 +6,7 @@ drop database if exists `ƒ\\•\`; CREATE DATABASE `ÆÎݺÞ`; CREATE DATABASE `“ú–{Œê`; CREATE DATABASE `ƒ\\•\`; -SELECT schema_name from information_schema.schemata where schema_name <> 'mtr'; +SELECT schema_name from information_schema.schemata where schema_name <> 'mtr' ORDER BY schema_name; schema_name information_schema mysql diff --git a/mysql-test/suite/jp/r/jp_create_db_ucs2.result b/mysql-test/suite/jp/r/jp_create_db_ucs2.result index c6a2ff78b4f..380fcf09389 100644 --- a/mysql-test/suite/jp/r/jp_create_db_ucs2.result +++ b/mysql-test/suite/jp/r/jp_create_db_ucs2.result @@ -7,7 +7,7 @@ SET character_set_server = ucs2; CREATE DATABASE `ŽÆŽÎŽÝŽºŽÞ`; CREATE DATABASE `ÆüËܸì`; CREATE DATABASE `íÜíÝíÞ`; -SELECT schema_name from information_schema.schemata where schema_name <> 'mtr'; +SELECT schema_name from information_schema.schemata where schema_name <> 'mtr' ORDER BY schema_name; schema_name information_schema mysql diff --git a/mysql-test/suite/jp/r/jp_create_db_ujis.result b/mysql-test/suite/jp/r/jp_create_db_ujis.result index e5e0c2f1ad8..529a225e4ed 100644 --- a/mysql-test/suite/jp/r/jp_create_db_ujis.result +++ b/mysql-test/suite/jp/r/jp_create_db_ujis.result @@ -6,7 +6,7 @@ SET character_set_database = ujis; CREATE DATABASE `ŽÆŽÎŽÝŽºŽÞ`; CREATE DATABASE `ÆüËܸì`; CREATE DATABASE `íÜíÝíÞ`; -SELECT schema_name from information_schema.schemata where schema_name <> 'mtr'; +SELECT schema_name from information_schema.schemata where schema_name <> 'mtr' ORDER BY schema_name; schema_name information_schema mysql diff --git a/mysql-test/suite/jp/r/jp_create_db_utf8.result b/mysql-test/suite/jp/r/jp_create_db_utf8.result index f07a36fd7c7..7d950ea53f9 100644 --- a/mysql-test/suite/jp/r/jp_create_db_utf8.result +++ b/mysql-test/suite/jp/r/jp_create_db_utf8.result @@ -6,7 +6,7 @@ SET character_set_database = utf8; CREATE DATABASE `ﾆﾎï¾ï½ºï¾ž`; CREATE DATABASE `日本語`; CREATE DATABASE `龔龖龗`; -SELECT schema_name from information_schema.schemata where schema_name <> 'mtr'; +SELECT schema_name from information_schema.schemata where schema_name <> 'mtr' ORDER BY schema_name; schema_name information_schema mysql diff --git a/mysql-test/suite/jp/t/jp_create_db_sjis.test b/mysql-test/suite/jp/t/jp_create_db_sjis.test index 49647bf1753..5458e6f0abd 100644 --- a/mysql-test/suite/jp/t/jp_create_db_sjis.test +++ b/mysql-test/suite/jp/t/jp_create_db_sjis.test @@ -16,7 +16,7 @@ CREATE DATABASE `ÆÎݺÞ`; CREATE DATABASE `“ú–{Œê`; CREATE DATABASE `ƒ\\•\`; -SELECT schema_name from information_schema.schemata where schema_name <> 'mtr'; +SELECT schema_name from information_schema.schemata where schema_name <> 'mtr' ORDER BY schema_name; USE `ÆÎݺÞ`; USE `“ú–{Œê`; diff --git a/mysql-test/suite/jp/t/jp_create_db_ucs2.test b/mysql-test/suite/jp/t/jp_create_db_ucs2.test index 8be8cf62f15..a3f64d1ebc7 100644 --- a/mysql-test/suite/jp/t/jp_create_db_ucs2.test +++ b/mysql-test/suite/jp/t/jp_create_db_ucs2.test @@ -18,7 +18,7 @@ CREATE DATABASE `ŽÆŽÎŽÝŽºŽÞ`; CREATE DATABASE `ÆüËܸì`; CREATE DATABASE `íÜíÝíÞ`; -SELECT schema_name from information_schema.schemata where schema_name <> 'mtr'; +SELECT schema_name from information_schema.schemata where schema_name <> 'mtr' ORDER BY schema_name; USE `ŽÆŽÎŽÝŽºŽÞ`; USE `ÆüËܸì`; diff --git a/mysql-test/suite/jp/t/jp_create_db_ujis.test b/mysql-test/suite/jp/t/jp_create_db_ujis.test index 382c7937552..514745aad43 100644 --- a/mysql-test/suite/jp/t/jp_create_db_ujis.test +++ b/mysql-test/suite/jp/t/jp_create_db_ujis.test @@ -17,7 +17,7 @@ CREATE DATABASE `ŽÆŽÎŽÝŽºŽÞ`; CREATE DATABASE `ÆüËܸì`; CREATE DATABASE `íÜíÝíÞ`; -SELECT schema_name from information_schema.schemata where schema_name <> 'mtr'; +SELECT schema_name from information_schema.schemata where schema_name <> 'mtr' ORDER BY schema_name; USE `ŽÆŽÎŽÝŽºŽÞ`; USE `ÆüËܸì`; diff --git a/mysql-test/suite/jp/t/jp_create_db_utf8.test b/mysql-test/suite/jp/t/jp_create_db_utf8.test index 2df5b9e1f6f..8617af57c7b 100644 --- a/mysql-test/suite/jp/t/jp_create_db_utf8.test +++ b/mysql-test/suite/jp/t/jp_create_db_utf8.test @@ -16,7 +16,7 @@ CREATE DATABASE `ﾆﾎï¾ï½ºï¾ž`; CREATE DATABASE `日本語`; CREATE DATABASE `龔龖龗`; -SELECT schema_name from information_schema.schemata where schema_name <> 'mtr'; +SELECT schema_name from information_schema.schemata where schema_name <> 'mtr' ORDER BY schema_name; USE `ﾆﾎï¾ï½ºï¾ž`; USE `日本語`; 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/parts/t/partition_exch_qa_12.test b/mysql-test/suite/parts/t/partition_exch_qa_12.test index 7e048f79017..80fd7ebba82 100644 --- a/mysql-test/suite/parts/t/partition_exch_qa_12.test +++ b/mysql-test/suite/parts/t/partition_exch_qa_12.test @@ -164,6 +164,7 @@ SELECT * FROM tsp_04; ALTER TABLE tp EXCHANGE PARTITION p0 WITH TABLE t_10; #--error ER_TABLES_DIFFERENT_METADATA #ALTER TABLE tp EXCHANGE PARTITION p0 WITH TABLE t_10 IGNORE; +--sorted_result SELECT TABLE_NAME, ROW_FORMAT FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = 'test' AND TABLE_NAME IN ('tp', 't_100'); ALTER TABLE tp EXCHANGE PARTITION p1 WITH TABLE t_100; 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/dml_handler.result b/mysql-test/suite/perfschema/r/dml_handler.result index 2a1cc7035af..ab850aee933 100644 --- a/mysql-test/suite/perfschema/r/dml_handler.result +++ b/mysql-test/suite/perfschema/r/dml_handler.result @@ -3,7 +3,8 @@ CREATE TEMPORARY TABLE table_list (id INT AUTO_INCREMENT, PRIMARY KEY (id)) AS SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES -WHERE TABLE_SCHEMA='performance_schema'; +WHERE TABLE_SCHEMA='performance_schema' + ORDER BY TABLE_NAME; SELECT COUNT(*) FROM table_list INTO @table_count; # For each table in the performance schema, attempt HANDLER...OPEN, @@ -67,11 +68,11 @@ SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=34; HANDLER performance_schema.mutex_instances OPEN; ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`mutex_instances` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=33; -HANDLER performance_schema.hosts OPEN; -ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`hosts` doesn't have this option -SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=32; HANDLER performance_schema.host_cache OPEN; ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`host_cache` doesn't have this option +SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=32; +HANDLER performance_schema.hosts OPEN; +ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`hosts` doesn't have this option SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=31; HANDLER performance_schema.file_summary_by_instance OPEN; ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`file_summary_by_instance` doesn't have this option 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/information_schema.result b/mysql-test/suite/perfschema/r/information_schema.result index 5e5ce57fb2e..a684fd7b84e 100644 --- a/mysql-test/suite/perfschema/r/information_schema.result +++ b/mysql-test/suite/perfschema/r/information_schema.result @@ -1,6 +1,7 @@ select TABLE_SCHEMA, lower(TABLE_NAME), TABLE_CATALOG from information_schema.tables -where TABLE_SCHEMA='performance_schema'; +where TABLE_SCHEMA='performance_schema' + order by table_name; TABLE_SCHEMA lower(TABLE_NAME) TABLE_CATALOG performance_schema accounts def performance_schema cond_instances def @@ -33,8 +34,8 @@ performance_schema events_waits_summary_global_by_event_name def performance_schema file_instances def performance_schema file_summary_by_event_name def performance_schema file_summary_by_instance def -performance_schema host_cache def performance_schema hosts def +performance_schema host_cache def performance_schema mutex_instances def performance_schema objects_summary_global_by_type def performance_schema performance_timers def @@ -56,7 +57,8 @@ performance_schema threads def performance_schema users def select lower(TABLE_NAME), TABLE_TYPE, ENGINE from information_schema.tables -where TABLE_SCHEMA='performance_schema'; +where TABLE_SCHEMA='performance_schema' + order by table_name; lower(TABLE_NAME) TABLE_TYPE ENGINE accounts BASE TABLE PERFORMANCE_SCHEMA cond_instances BASE TABLE PERFORMANCE_SCHEMA @@ -89,8 +91,8 @@ events_waits_summary_global_by_event_name BASE TABLE PERFORMANCE_SCHEMA file_instances BASE TABLE PERFORMANCE_SCHEMA file_summary_by_event_name BASE TABLE PERFORMANCE_SCHEMA file_summary_by_instance BASE TABLE PERFORMANCE_SCHEMA -host_cache BASE TABLE PERFORMANCE_SCHEMA hosts BASE TABLE PERFORMANCE_SCHEMA +host_cache BASE TABLE PERFORMANCE_SCHEMA mutex_instances BASE TABLE PERFORMANCE_SCHEMA objects_summary_global_by_type BASE TABLE PERFORMANCE_SCHEMA performance_timers BASE TABLE PERFORMANCE_SCHEMA @@ -112,7 +114,8 @@ threads BASE TABLE PERFORMANCE_SCHEMA users BASE TABLE PERFORMANCE_SCHEMA select lower(TABLE_NAME), VERSION, ROW_FORMAT from information_schema.tables -where TABLE_SCHEMA='performance_schema'; +where TABLE_SCHEMA='performance_schema' + order by table_name; lower(TABLE_NAME) VERSION ROW_FORMAT accounts 10 Fixed cond_instances 10 Dynamic @@ -145,8 +148,8 @@ events_waits_summary_global_by_event_name 10 Dynamic file_instances 10 Dynamic file_summary_by_event_name 10 Dynamic file_summary_by_instance 10 Dynamic -host_cache 10 Dynamic hosts 10 Fixed +host_cache 10 Dynamic mutex_instances 10 Dynamic objects_summary_global_by_type 10 Dynamic performance_timers 10 Fixed @@ -168,7 +171,8 @@ threads 10 Dynamic users 10 Fixed select lower(TABLE_NAME), TABLE_ROWS, AVG_ROW_LENGTH from information_schema.tables -where TABLE_SCHEMA='performance_schema'; +where TABLE_SCHEMA='performance_schema' + order by table_name; lower(TABLE_NAME) TABLE_ROWS AVG_ROW_LENGTH accounts 1000 0 cond_instances 1000 0 @@ -201,8 +205,8 @@ events_waits_summary_global_by_event_name 1000 0 file_instances 1000 0 file_summary_by_event_name 1000 0 file_summary_by_instance 1000 0 -host_cache 1000 0 hosts 1000 0 +host_cache 1000 0 mutex_instances 1000 0 objects_summary_global_by_type 1000 0 performance_timers 5 0 @@ -224,7 +228,8 @@ threads 1000 0 users 1000 0 select lower(TABLE_NAME), DATA_LENGTH, MAX_DATA_LENGTH from information_schema.tables -where TABLE_SCHEMA='performance_schema'; +where TABLE_SCHEMA='performance_schema' + order by table_name; lower(TABLE_NAME) DATA_LENGTH MAX_DATA_LENGTH accounts 0 0 cond_instances 0 0 @@ -257,8 +262,8 @@ events_waits_summary_global_by_event_name 0 0 file_instances 0 0 file_summary_by_event_name 0 0 file_summary_by_instance 0 0 -host_cache 0 0 hosts 0 0 +host_cache 0 0 mutex_instances 0 0 objects_summary_global_by_type 0 0 performance_timers 0 0 @@ -280,7 +285,8 @@ threads 0 0 users 0 0 select lower(TABLE_NAME), INDEX_LENGTH, DATA_FREE, AUTO_INCREMENT from information_schema.tables -where TABLE_SCHEMA='performance_schema'; +where TABLE_SCHEMA='performance_schema' + order by table_name; lower(TABLE_NAME) INDEX_LENGTH DATA_FREE AUTO_INCREMENT accounts 0 0 NULL cond_instances 0 0 NULL @@ -313,8 +319,8 @@ events_waits_summary_global_by_event_name 0 0 NULL file_instances 0 0 NULL file_summary_by_event_name 0 0 NULL file_summary_by_instance 0 0 NULL -host_cache 0 0 NULL hosts 0 0 NULL +host_cache 0 0 NULL mutex_instances 0 0 NULL objects_summary_global_by_type 0 0 NULL performance_timers 0 0 NULL @@ -336,7 +342,8 @@ threads 0 0 NULL users 0 0 NULL select lower(TABLE_NAME), CREATE_TIME, UPDATE_TIME, CHECK_TIME from information_schema.tables -where TABLE_SCHEMA='performance_schema'; +where TABLE_SCHEMA='performance_schema' + order by table_name; lower(TABLE_NAME) CREATE_TIME UPDATE_TIME CHECK_TIME accounts NULL NULL NULL cond_instances NULL NULL NULL @@ -369,8 +376,8 @@ events_waits_summary_global_by_event_name NULL NULL NULL file_instances NULL NULL NULL file_summary_by_event_name NULL NULL NULL file_summary_by_instance NULL NULL NULL -host_cache NULL NULL NULL hosts NULL NULL NULL +host_cache NULL NULL NULL mutex_instances NULL NULL NULL objects_summary_global_by_type NULL NULL NULL performance_timers NULL NULL NULL @@ -392,7 +399,8 @@ threads NULL NULL NULL users NULL NULL NULL select lower(TABLE_NAME), TABLE_COLLATION, CHECKSUM from information_schema.tables -where TABLE_SCHEMA='performance_schema'; +where TABLE_SCHEMA='performance_schema' + order by table_name; lower(TABLE_NAME) TABLE_COLLATION CHECKSUM accounts utf8_general_ci NULL cond_instances utf8_general_ci NULL @@ -425,8 +433,8 @@ events_waits_summary_global_by_event_name utf8_general_ci NULL file_instances utf8_general_ci NULL file_summary_by_event_name utf8_general_ci NULL file_summary_by_instance utf8_general_ci NULL -host_cache utf8_general_ci NULL hosts utf8_general_ci NULL +host_cache utf8_general_ci NULL mutex_instances utf8_general_ci NULL objects_summary_global_by_type utf8_general_ci NULL performance_timers utf8_general_ci NULL @@ -448,7 +456,8 @@ threads utf8_general_ci NULL users utf8_general_ci NULL select lower(TABLE_NAME), TABLE_COMMENT from information_schema.tables -where TABLE_SCHEMA='performance_schema'; +where TABLE_SCHEMA='performance_schema' + order by table_name; lower(TABLE_NAME) TABLE_COMMENT accounts cond_instances @@ -481,8 +490,8 @@ events_waits_summary_global_by_event_name file_instances file_summary_by_event_name file_summary_by_instance -host_cache hosts +host_cache mutex_instances objects_summary_global_by_type performance_timers 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 bb572237483..299551051c9 100644 --- a/mysql-test/suite/perfschema/r/ortho_iter.result +++ b/mysql-test/suite/perfschema/r/ortho_iter.result @@ -21,7 +21,8 @@ declare debug integer default 0; declare pfs_cursor CURSOR FOR select table_name from information_schema.tables where table_schema= 'performance_schema' - and table_name like "events_%_by_event_name%"; + and table_name like "events_%_by_event_name%" + order by table_name; declare continue handler for sqlstate '02000' set done = 1; select (instr_name like "wait/%") or (instr_name like "idle/%") into is_wait; @@ -120,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/dml_handler.test b/mysql-test/suite/perfschema/t/dml_handler.test index db74c85350a..f12cc82f22f 100644 --- a/mysql-test/suite/perfschema/t/dml_handler.test +++ b/mysql-test/suite/perfschema/t/dml_handler.test @@ -18,7 +18,8 @@ CREATE TEMPORARY TABLE table_list (id INT AUTO_INCREMENT, PRIMARY KEY (id)) AS SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES - WHERE TABLE_SCHEMA='performance_schema'; + WHERE TABLE_SCHEMA='performance_schema' + ORDER BY TABLE_NAME; SELECT COUNT(*) FROM table_list INTO @table_count; diff --git a/mysql-test/suite/perfschema/t/information_schema.test b/mysql-test/suite/perfschema/t/information_schema.test index 24325710174..0152ef21905 100644 --- a/mysql-test/suite/perfschema/t/information_schema.test +++ b/mysql-test/suite/perfschema/t/information_schema.test @@ -11,42 +11,52 @@ select TABLE_SCHEMA, lower(TABLE_NAME), TABLE_CATALOG from information_schema.tables - where TABLE_SCHEMA='performance_schema'; + where TABLE_SCHEMA='performance_schema' + order by table_name; select lower(TABLE_NAME), TABLE_TYPE, ENGINE from information_schema.tables - where TABLE_SCHEMA='performance_schema'; + where TABLE_SCHEMA='performance_schema' + order by table_name; select lower(TABLE_NAME), VERSION, ROW_FORMAT from information_schema.tables - where TABLE_SCHEMA='performance_schema'; + where TABLE_SCHEMA='performance_schema' + order by table_name; select lower(TABLE_NAME), TABLE_ROWS, AVG_ROW_LENGTH from information_schema.tables - where TABLE_SCHEMA='performance_schema'; + where TABLE_SCHEMA='performance_schema' + order by table_name; select lower(TABLE_NAME), DATA_LENGTH, MAX_DATA_LENGTH from information_schema.tables - where TABLE_SCHEMA='performance_schema'; + where TABLE_SCHEMA='performance_schema' + order by table_name; select lower(TABLE_NAME), INDEX_LENGTH, DATA_FREE, AUTO_INCREMENT from information_schema.tables - where TABLE_SCHEMA='performance_schema'; + where TABLE_SCHEMA='performance_schema' + order by table_name; select lower(TABLE_NAME), CREATE_TIME, UPDATE_TIME, CHECK_TIME from information_schema.tables - where TABLE_SCHEMA='performance_schema'; + where TABLE_SCHEMA='performance_schema' + order by table_name; select lower(TABLE_NAME), TABLE_COLLATION, CHECKSUM from information_schema.tables - where TABLE_SCHEMA='performance_schema'; + where TABLE_SCHEMA='performance_schema' + order by table_name; # TABLESPACE_NAME does not exist in 5.4 # select lower(TABLE_NAME), CREATE_OPTIONS, TABLESPACE_NAME # from information_schema.tables -# where TABLE_SCHEMA='performance_schema'; +# where TABLE_SCHEMA='performance_schema' +# order by table_name; select lower(TABLE_NAME), TABLE_COMMENT from information_schema.tables - where TABLE_SCHEMA='performance_schema'; + where TABLE_SCHEMA='performance_schema' + order by table_name; diff --git a/mysql-test/suite/perfschema/t/ortho_iter.test b/mysql-test/suite/perfschema/t/ortho_iter.test index 0a90831ae70..f7e68538906 100644 --- a/mysql-test/suite/perfschema/t/ortho_iter.test +++ b/mysql-test/suite/perfschema/t/ortho_iter.test @@ -35,7 +35,8 @@ begin declare pfs_cursor CURSOR FOR select table_name from information_schema.tables where table_schema= 'performance_schema' - and table_name like "events_%_by_event_name%"; + and table_name like "events_%_by_event_name%" + order by table_name; declare continue handler for sqlstate '02000' set done = 1; 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/roles/show_create_database-10463.result b/mysql-test/suite/roles/show_create_database-10463.result index a9b376a891f..7bebc954840 100644 --- a/mysql-test/suite/roles/show_create_database-10463.result +++ b/mysql-test/suite/roles/show_create_database-10463.result @@ -16,7 +16,7 @@ test show create database db; ERROR 42000: Access denied for user 'beep'@'localhost' to database 'db' select table_schema, table_name from information_schema.tables -where table_schema = 'db'; +where table_schema = 'db' order by table_name; table_schema table_name set role r1; show databases; @@ -28,7 +28,7 @@ show create database db; Database Create Database db CREATE DATABASE `db` /*!40100 DEFAULT CHARACTER SET latin1 */ select table_schema, table_name from information_schema.tables -where table_schema = 'db'; +where table_schema = 'db' order by table_name; table_schema table_name db t1 db t2 @@ -45,7 +45,7 @@ test show create database db; ERROR 42000: Access denied for user 'beep2'@'localhost' to database 'db' select table_schema, table_name from information_schema.tables -where table_schema = 'db'; +where table_schema = 'db' order by table_name; table_schema table_name set role r2; show databases; @@ -57,7 +57,7 @@ show create database db; Database Create Database db CREATE DATABASE `db` /*!40100 DEFAULT CHARACTER SET latin1 */ select table_schema, table_name from information_schema.tables -where table_schema = 'db'; +where table_schema = 'db' order by table_name; table_schema table_name db t1 db t2 diff --git a/mysql-test/suite/roles/show_create_database-10463.test b/mysql-test/suite/roles/show_create_database-10463.test index 2d921629c10..6278cc71c02 100644 --- a/mysql-test/suite/roles/show_create_database-10463.test +++ b/mysql-test/suite/roles/show_create_database-10463.test @@ -16,13 +16,13 @@ show databases; --error ER_DBACCESS_DENIED_ERROR show create database db; select table_schema, table_name from information_schema.tables -where table_schema = 'db'; +where table_schema = 'db' order by table_name; set role r1; show databases; show create database db; select table_schema, table_name from information_schema.tables -where table_schema = 'db'; +where table_schema = 'db' order by table_name; connection default; @@ -36,14 +36,14 @@ show databases; --error ER_DBACCESS_DENIED_ERROR show create database db; select table_schema, table_name from information_schema.tables -where table_schema = 'db'; +where table_schema = 'db' order by table_name; set role r2; show databases; show create database db; select table_schema, table_name from information_schema.tables -where table_schema = 'db'; +where table_schema = 'db' order by table_name; connection default; 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/sql_sequence/other.result b/mysql-test/suite/sql_sequence/other.result index 190886ab68f..87c36394975 100644 --- a/mysql-test/suite/sql_sequence/other.result +++ b/mysql-test/suite/sql_sequence/other.result @@ -93,7 +93,7 @@ Tables_in_test Table_type s1 SEQUENCE t1 BASE TABLE v1 VIEW -SELECT TABLE_TYPE,ENGINE FROM INFORMATION_SCHEMA.TABLES where table_schema="test"; +SELECT TABLE_TYPE,ENGINE FROM INFORMATION_SCHEMA.TABLES where table_schema="test" ORDER BY TABLE_NAME; TABLE_TYPE ENGINE SEQUENCE MyISAM BASE TABLE MyISAM diff --git a/mysql-test/suite/sql_sequence/other.test b/mysql-test/suite/sql_sequence/other.test index d816ec7c108..edd4cc7acc7 100644 --- a/mysql-test/suite/sql_sequence/other.test +++ b/mysql-test/suite/sql_sequence/other.test @@ -74,7 +74,7 @@ create sequence s1; create table t1 (a int); create view v1 as select * from s1; show full tables; -SELECT TABLE_TYPE,ENGINE FROM INFORMATION_SCHEMA.TABLES where table_schema="test"; +SELECT TABLE_TYPE,ENGINE FROM INFORMATION_SCHEMA.TABLES where table_schema="test" ORDER BY TABLE_NAME; drop table t1,s1; drop view v1; 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_debug,32bit.rdiff b/mysql-test/suite/sys_vars/r/sysvars_debug,32bit.rdiff index 6216efe7ec9..8adb294db00 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_debug,32bit.rdiff +++ b/mysql-test/suite/sys_vars/r/sysvars_debug,32bit.rdiff @@ -9,24 +9,3 @@ VARIABLE_COMMENT Extra sleep (in microseconds) to add to binlog fsync(), for debugging NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -43,20 +43,6 @@ - ENUM_VALUE_LIST NULL - READ_ONLY NO - COMMAND_LINE_ARGUMENT OPTIONAL --VARIABLE_NAME DEBUG_MUTEX_DEADLOCK_DETECTOR --SESSION_VALUE NULL --GLOBAL_VALUE ON --GLOBAL_VALUE_ORIGIN COMPILE-TIME --DEFAULT_VALUE ON --VARIABLE_SCOPE GLOBAL --VARIABLE_TYPE BOOLEAN --VARIABLE_COMMENT Enable checking of wrong mutex usage --NUMERIC_MIN_VALUE NULL --NUMERIC_MAX_VALUE NULL --NUMERIC_BLOCK_SIZE NULL --ENUM_VALUE_LIST OFF,ON --READ_ONLY YES --COMMAND_LINE_ARGUMENT OPTIONAL - VARIABLE_NAME DEBUG_NO_THREAD_ALARM - SESSION_VALUE NULL - GLOBAL_VALUE OFF diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_embedded,32bit.rdiff b/mysql-test/suite/sys_vars/r/sysvars_server_embedded,32bit.rdiff index 5f09f1c26f8..f7c78b35d39 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_server_embedded,32bit.rdiff +++ b/mysql-test/suite/sys_vars/r/sysvars_server_embedded,32bit.rdiff @@ -1,6 +1,6 @@ ---- a/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result -+++ b/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result -@@ -57,7 +57,7 @@ +--- sysvars_server_embedded.result ++++ sysvars_server_embedded,32bit.result +@@ -58,7 +58,7 @@ GLOBAL_VALUE_ORIGIN CONFIG DEFAULT_VALUE 1 VARIABLE_SCOPE SESSION @@ -9,7 +9,7 @@ VARIABLE_COMMENT Auto-increment columns are incremented by this NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 65535 -@@ -71,7 +71,7 @@ +@@ -72,7 +72,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 1 VARIABLE_SCOPE SESSION @@ -18,7 +18,7 @@ VARIABLE_COMMENT Offset added to Auto-increment columns. Used when auto-increment-increment != 1 NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 65535 -@@ -85,7 +85,7 @@ +@@ -86,7 +86,7 @@ GLOBAL_VALUE_ORIGIN AUTO DEFAULT_VALUE 150 VARIABLE_SCOPE GLOBAL @@ -27,7 +27,7 @@ VARIABLE_COMMENT The number of outstanding connection requests MariaDB can have. This comes into play when the main MariaDB thread gets very many connection requests in a very short time NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 65535 -@@ -144,7 +144,7 @@ +@@ -159,7 +159,7 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT The size of the transactional cache for updates to transactional engines for the binary log. If you often use transactions containing many statements, you can increase this to get more performance NUMERIC_MIN_VALUE 4096 @@ -36,7 +36,7 @@ NUMERIC_BLOCK_SIZE 4096 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -169,10 +169,10 @@ +@@ -184,10 +184,10 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 0 VARIABLE_SCOPE GLOBAL @@ -49,7 +49,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -183,10 +183,10 @@ +@@ -198,10 +198,10 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 100000 VARIABLE_SCOPE GLOBAL @@ -62,7 +62,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -256,7 +256,7 @@ +@@ -271,7 +271,7 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT The size of the statement cache for updates to non-transactional engines for the binary log. If you often use statements updating a great number of rows, you can increase this to get more performance. NUMERIC_MIN_VALUE 4096 @@ -71,7 +71,7 @@ NUMERIC_BLOCK_SIZE 4096 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -270,7 +270,7 @@ +@@ -285,7 +285,7 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Size of tree cache used in bulk insert optimisation. Note that this is a limit per thread! NUMERIC_MIN_VALUE 0 @@ -80,7 +80,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -477,7 +477,7 @@ +@@ -548,7 +548,7 @@ GLOBAL_VALUE_ORIGIN CONFIG DEFAULT_VALUE 10 VARIABLE_SCOPE GLOBAL @@ -89,7 +89,7 @@ VARIABLE_COMMENT The number of seconds the mysqld server is waiting for a connect packet before responding with 'Bad handshake' NUMERIC_MIN_VALUE 2 NUMERIC_MAX_VALUE 31536000 -@@ -533,7 +533,7 @@ +@@ -604,7 +604,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 15 VARIABLE_SCOPE SESSION @@ -98,7 +98,7 @@ VARIABLE_COMMENT Long search depth for the two-step deadlock detection NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 33 -@@ -547,7 +547,7 @@ +@@ -618,7 +618,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 4 VARIABLE_SCOPE SESSION @@ -107,7 +107,7 @@ VARIABLE_COMMENT Short search depth for the two-step deadlock detection NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 32 -@@ -561,7 +561,7 @@ +@@ -632,7 +632,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 50000000 VARIABLE_SCOPE SESSION @@ -116,7 +116,7 @@ VARIABLE_COMMENT Long timeout for the two-step deadlock detection (in microseconds) NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -575,7 +575,7 @@ +@@ -646,7 +646,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 10000 VARIABLE_SCOPE SESSION @@ -125,7 +125,7 @@ VARIABLE_COMMENT Short timeout for the two-step deadlock detection (in microseconds) NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -631,7 +631,7 @@ +@@ -702,7 +702,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 0 VARIABLE_SCOPE SESSION @@ -134,7 +134,7 @@ VARIABLE_COMMENT The default week format used by WEEK() functions NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 7 -@@ -645,7 +645,7 @@ +@@ -716,7 +716,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 100 VARIABLE_SCOPE GLOBAL @@ -143,7 +143,7 @@ VARIABLE_COMMENT After inserting delayed_insert_limit rows, the INSERT DELAYED handler will check if there are any SELECT statements pending. If so, it allows these to execute before continuing. NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 4294967295 -@@ -659,7 +659,7 @@ +@@ -730,7 +730,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 300 VARIABLE_SCOPE GLOBAL @@ -152,7 +152,7 @@ VARIABLE_COMMENT How long a INSERT DELAYED thread should wait for INSERT statements before terminating NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 31536000 -@@ -673,7 +673,7 @@ +@@ -744,7 +744,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 1000 VARIABLE_SCOPE GLOBAL @@ -161,7 +161,7 @@ VARIABLE_COMMENT What size queue (in rows) should be allocated for handling INSERT DELAYED. If the queue becomes full, any client that does INSERT DELAYED will wait until there is room in the queue again NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 4294967295 -@@ -701,7 +701,7 @@ +@@ -772,7 +772,7 @@ GLOBAL_VALUE_ORIGIN SQL DEFAULT_VALUE 4 VARIABLE_SCOPE SESSION @@ -170,7 +170,7 @@ VARIABLE_COMMENT Precision of the result of '/' operator will be increased on that value NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 38 -@@ -799,7 +799,7 @@ +@@ -870,7 +870,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 0 VARIABLE_SCOPE GLOBAL @@ -179,7 +179,7 @@ VARIABLE_COMMENT If non-zero, binary logs will be purged after expire_logs_days days; possible purges happen at startup and at binary log rotation NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 99 -@@ -841,7 +841,7 @@ +@@ -912,7 +912,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 1 VARIABLE_SCOPE GLOBAL @@ -188,7 +188,7 @@ VARIABLE_COMMENT The number of connections on extra-port NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 100000 -@@ -883,7 +883,7 @@ +@@ -954,7 +954,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 0 VARIABLE_SCOPE GLOBAL @@ -197,7 +197,7 @@ VARIABLE_COMMENT A dedicated thread is created to flush all tables at the given interval NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 31536000 -@@ -925,7 +925,7 @@ +@@ -996,7 +996,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 84 VARIABLE_SCOPE GLOBAL @@ -206,7 +206,7 @@ VARIABLE_COMMENT The maximum length of the word to be included in a FULLTEXT index. Note: FULLTEXT indexes must be rebuilt after changing this variable NUMERIC_MIN_VALUE 10 NUMERIC_MAX_VALUE 84 -@@ -939,7 +939,7 @@ +@@ -1010,7 +1010,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 4 VARIABLE_SCOPE GLOBAL @@ -215,7 +215,7 @@ VARIABLE_COMMENT The minimum length of the word to be included in a FULLTEXT index. Note: FULLTEXT indexes must be rebuilt after changing this variable NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 84 -@@ -953,7 +953,7 @@ +@@ -1024,7 +1024,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 20 VARIABLE_SCOPE GLOBAL @@ -224,7 +224,7 @@ VARIABLE_COMMENT Number of best matches to use for query expansion NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 1000 -@@ -1012,7 +1012,7 @@ +@@ -1083,7 +1083,7 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT The maximum length of the result of function GROUP_CONCAT() NUMERIC_MIN_VALUE 4 @@ -233,7 +233,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -1163,7 +1163,7 @@ +@@ -1234,7 +1234,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 0 VARIABLE_SCOPE SESSION @@ -242,7 +242,7 @@ VARIABLE_COMMENT Number of bytes used for a histogram. If set to 0, no histograms are created by ANALYZE. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 255 -@@ -1191,7 +1191,7 @@ +@@ -1262,7 +1262,7 @@ GLOBAL_VALUE_ORIGIN AUTO DEFAULT_VALUE 128 VARIABLE_SCOPE GLOBAL @@ -251,7 +251,7 @@ VARIABLE_COMMENT How many host names should be cached to avoid resolving. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 65536 -@@ -1345,7 +1345,7 @@ +@@ -1416,7 +1416,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 28800 VARIABLE_SCOPE SESSION @@ -260,7 +260,20 @@ VARIABLE_COMMENT The number of seconds the server waits for activity on an interactive connection before closing it NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 31536000 -@@ -1376,7 +1376,7 @@ +@@ -1430,10 +1430,10 @@ + GLOBAL_VALUE_ORIGIN COMPILE-TIME + DEFAULT_VALUE 1000 + VARIABLE_SCOPE SESSION +-VARIABLE_TYPE BIGINT UNSIGNED ++VARIABLE_TYPE INT UNSIGNED + VARIABLE_COMMENT The minimum number of scalar elements in the value list of IN predicate that triggers its conversion to IN subquery + NUMERIC_MIN_VALUE 0 +-NUMERIC_MAX_VALUE 18446744073709551615 ++NUMERIC_MAX_VALUE 4294967295 + NUMERIC_BLOCK_SIZE 1 + ENUM_VALUE_LIST NULL + READ_ONLY NO +@@ -1461,7 +1461,7 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT The size of the buffer that is used for joins NUMERIC_MIN_VALUE 128 @@ -269,7 +282,7 @@ NUMERIC_BLOCK_SIZE 128 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -1401,7 +1401,7 @@ +@@ -1486,7 +1486,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 2 VARIABLE_SCOPE SESSION @@ -278,7 +291,7 @@ VARIABLE_COMMENT Controls what join operations can be executed with join buffers. Odd numbers are used for plain join buffers while even numbers are used for linked buffers NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 8 -@@ -1432,7 +1432,7 @@ +@@ -1517,7 +1517,7 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT The size of the buffer used for index blocks for MyISAM tables. Increase this to get better index handling (for all reads and multiple writes) to as much as you can afford NUMERIC_MIN_VALUE 0 @@ -287,7 +300,7 @@ NUMERIC_BLOCK_SIZE 4096 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -1639,7 +1639,7 @@ +@@ -1724,7 +1724,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 86400 VARIABLE_SCOPE SESSION @@ -296,7 +309,7 @@ VARIABLE_COMMENT Timeout in seconds to wait for a lock before returning an error. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 31536000 -@@ -1779,7 +1779,7 @@ +@@ -1892,7 +1892,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 1 VARIABLE_SCOPE SESSION @@ -305,7 +318,7 @@ VARIABLE_COMMENT Write to slow log every #th slow query. Set to 1 to log everything. Increase it to reduce the size of the slow or the performance impact of slow logging NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 4294967295 -@@ -1821,7 +1821,7 @@ +@@ -1934,7 +1934,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 2 VARIABLE_SCOPE SESSION @@ -314,7 +327,7 @@ VARIABLE_COMMENT Log some not critical warnings to the general log file.Value can be between 0 and 11. Higher values mean more verbosity NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -1863,7 +1863,7 @@ +@@ -1976,7 +1976,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 16777216 VARIABLE_SCOPE SESSION @@ -323,7 +336,7 @@ VARIABLE_COMMENT Max packet length to send to or receive from the server NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 1073741824 -@@ -1873,14 +1873,14 @@ +@@ -1986,14 +1986,14 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MAX_BINLOG_CACHE_SIZE SESSION_VALUE NULL @@ -341,7 +354,7 @@ NUMERIC_BLOCK_SIZE 4096 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -1891,7 +1891,7 @@ +@@ -2004,7 +2004,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 1073741824 VARIABLE_SCOPE GLOBAL @@ -350,7 +363,7 @@ VARIABLE_COMMENT Binary log will be rotated automatically when the size exceeds this value. NUMERIC_MIN_VALUE 4096 NUMERIC_MAX_VALUE 1073741824 -@@ -1901,14 +1901,14 @@ +@@ -2014,14 +2014,14 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MAX_BINLOG_STMT_CACHE_SIZE SESSION_VALUE NULL @@ -368,7 +381,7 @@ NUMERIC_BLOCK_SIZE 4096 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -1919,7 +1919,7 @@ +@@ -2032,7 +2032,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 151 VARIABLE_SCOPE GLOBAL @@ -377,7 +390,7 @@ VARIABLE_COMMENT The number of simultaneous clients allowed NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 100000 -@@ -1933,7 +1933,7 @@ +@@ -2046,7 +2046,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 100 VARIABLE_SCOPE GLOBAL @@ -386,7 +399,7 @@ VARIABLE_COMMENT If there is more than this number of interrupted connections from a host this host will be blocked from further connections NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 4294967295 -@@ -1947,7 +1947,7 @@ +@@ -2060,7 +2060,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 20 VARIABLE_SCOPE SESSION @@ -395,7 +408,7 @@ VARIABLE_COMMENT Don't start more than this number of threads to handle INSERT DELAYED statements. If set to zero INSERT DELAYED will be not used NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 16384 -@@ -1975,7 +1975,7 @@ +@@ -2088,7 +2088,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 64 VARIABLE_SCOPE SESSION @@ -404,7 +417,7 @@ VARIABLE_COMMENT Max number of errors/warnings to store for a statement NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 65535 -@@ -1992,7 +1992,7 @@ +@@ -2105,7 +2105,7 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Don't allow creation of heap tables bigger than this NUMERIC_MIN_VALUE 16384 @@ -413,7 +426,7 @@ NUMERIC_BLOCK_SIZE 1024 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -2003,7 +2003,7 @@ +@@ -2116,7 +2116,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 20 VARIABLE_SCOPE SESSION @@ -422,7 +435,7 @@ VARIABLE_COMMENT Don't start more than this number of threads to handle INSERT DELAYED statements. If set to zero INSERT DELAYED will be not used NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 16384 -@@ -2031,7 +2031,7 @@ +@@ -2144,7 +2144,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 1024 VARIABLE_SCOPE SESSION @@ -431,7 +444,7 @@ VARIABLE_COMMENT Max number of bytes in sorted records NUMERIC_MIN_VALUE 4 NUMERIC_MAX_VALUE 8388608 -@@ -2045,7 +2045,7 @@ +@@ -2158,7 +2158,7 @@ GLOBAL_VALUE_ORIGIN AUTO DEFAULT_VALUE 1048576 VARIABLE_SCOPE GLOBAL @@ -440,7 +453,7 @@ VARIABLE_COMMENT The maximum BLOB length to send to server from mysql_send_long_data API. Deprecated option; use max_allowed_packet instead. NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 4294967295 -@@ -2059,7 +2059,7 @@ +@@ -2172,7 +2172,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 16382 VARIABLE_SCOPE GLOBAL @@ -449,7 +462,7 @@ VARIABLE_COMMENT Maximum number of prepared statements in the server NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 1048576 -@@ -2073,7 +2073,7 @@ +@@ -2186,7 +2186,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 4294967295 VARIABLE_SCOPE SESSION @@ -458,7 +471,7 @@ VARIABLE_COMMENT Maximum number of iterations when executing recursive queries NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -2087,7 +2087,7 @@ +@@ -2200,7 +2200,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 4294967295 VARIABLE_SCOPE SESSION @@ -467,7 +480,7 @@ VARIABLE_COMMENT Limit assumed max number of seeks when looking up rows based on a key NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 4294967295 -@@ -2115,7 +2115,7 @@ +@@ -2228,7 +2228,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 1024 VARIABLE_SCOPE SESSION @@ -476,7 +489,7 @@ VARIABLE_COMMENT The number of bytes to use when sorting BLOB or TEXT values (only the first max_sort_length bytes of each value are used; the rest are ignored) NUMERIC_MIN_VALUE 4 NUMERIC_MAX_VALUE 8388608 -@@ -2129,7 +2129,7 @@ +@@ -2242,7 +2242,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 0 VARIABLE_SCOPE SESSION @@ -485,7 +498,7 @@ VARIABLE_COMMENT Maximum stored procedure recursion depth NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 255 -@@ -2157,7 +2157,7 @@ +@@ -2270,7 +2270,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 32 VARIABLE_SCOPE SESSION @@ -494,7 +507,7 @@ VARIABLE_COMMENT Unused, will be removed. NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 4294967295 -@@ -2185,7 +2185,7 @@ +@@ -2298,7 +2298,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 4294967295 VARIABLE_SCOPE GLOBAL @@ -503,7 +516,7 @@ VARIABLE_COMMENT After this many write locks, allow some read locks to run in between NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 4294967295 -@@ -2199,7 +2199,7 @@ +@@ -2312,7 +2312,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 1024 VARIABLE_SCOPE GLOBAL @@ -512,7 +525,7 @@ VARIABLE_COMMENT Unused NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 1048576 -@@ -2213,7 +2213,7 @@ +@@ -2326,7 +2326,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 8 VARIABLE_SCOPE GLOBAL @@ -521,7 +534,7 @@ VARIABLE_COMMENT Unused NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 1024 -@@ -2227,7 +2227,7 @@ +@@ -2340,7 +2340,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 0 VARIABLE_SCOPE SESSION @@ -530,7 +543,7 @@ VARIABLE_COMMENT Don't write queries to slow log that examine fewer rows than that NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -2241,7 +2241,7 @@ +@@ -2354,7 +2354,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 262144 VARIABLE_SCOPE SESSION @@ -539,7 +552,7 @@ VARIABLE_COMMENT Size of buffer to use when using MRR with range access NUMERIC_MIN_VALUE 8192 NUMERIC_MAX_VALUE 2147483647 -@@ -2255,10 +2255,10 @@ +@@ -2368,10 +2368,10 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 256 VARIABLE_SCOPE SESSION @@ -552,7 +565,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -2269,7 +2269,7 @@ +@@ -2382,7 +2382,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 1024 VARIABLE_SCOPE GLOBAL @@ -561,7 +574,7 @@ VARIABLE_COMMENT Block size to be used for MyISAM index pages NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 16384 -@@ -2283,7 +2283,7 @@ +@@ -2396,7 +2396,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 6 VARIABLE_SCOPE GLOBAL @@ -570,7 +583,7 @@ VARIABLE_COMMENT Default pointer size to be used for MyISAM tables NUMERIC_MIN_VALUE 2 NUMERIC_MAX_VALUE 7 -@@ -2293,9 +2293,9 @@ +@@ -2406,9 +2406,9 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MYISAM_MAX_SORT_FILE_SIZE SESSION_VALUE NULL @@ -582,7 +595,7 @@ VARIABLE_SCOPE GLOBAL VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Don't use the fast sort index method to created index if the temporary file would get bigger than this -@@ -2307,14 +2307,14 @@ +@@ -2420,14 +2420,14 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MYISAM_MMAP_SIZE SESSION_VALUE NULL @@ -600,7 +613,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY YES -@@ -2339,10 +2339,10 @@ +@@ -2452,10 +2452,10 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 1 VARIABLE_SCOPE SESSION @@ -613,7 +626,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -2356,7 +2356,7 @@ +@@ -2469,7 +2469,7 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT The buffer that is allocated when sorting the index when doing a REPAIR or when creating indexes with CREATE INDEX or ALTER TABLE NUMERIC_MIN_VALUE 4096 @@ -622,7 +635,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -2409,7 +2409,7 @@ +@@ -2522,7 +2522,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 16384 VARIABLE_SCOPE SESSION @@ -631,7 +644,7 @@ VARIABLE_COMMENT Buffer length for TCP/IP and socket communication NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 1048576 -@@ -2423,7 +2423,7 @@ +@@ -2536,7 +2536,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 30 VARIABLE_SCOPE SESSION @@ -640,7 +653,7 @@ VARIABLE_COMMENT Number of seconds to wait for more data from a connection before aborting the read NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 31536000 -@@ -2437,7 +2437,7 @@ +@@ -2550,7 +2550,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 10 VARIABLE_SCOPE SESSION @@ -649,7 +662,7 @@ VARIABLE_COMMENT If a read on a communication port is interrupted, retry this many times before giving up NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 4294967295 -@@ -2451,7 +2451,7 @@ +@@ -2564,7 +2564,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 60 VARIABLE_SCOPE SESSION @@ -658,7 +671,7 @@ VARIABLE_COMMENT Number of seconds to wait for a block to be written to a connection before aborting the write NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 31536000 -@@ -2521,7 +2521,7 @@ +@@ -2634,7 +2634,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 1 VARIABLE_SCOPE SESSION @@ -667,7 +680,7 @@ VARIABLE_COMMENT Controls the heuristic(s) applied during query optimization to prune less-promising partial plans from the optimizer search space. Meaning: 0 - do not apply any heuristic, thus perform exhaustive search; 1 - prune plans based on number of retrieved rows NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 1 -@@ -2535,7 +2535,7 @@ +@@ -2648,7 +2648,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 62 VARIABLE_SCOPE SESSION @@ -676,7 +689,7 @@ VARIABLE_COMMENT Maximum depth of search performed by the query optimizer. Values larger than the number of relations in a query result in better query plans, but take longer to compile a query. Values smaller than the number of tables in a relation result in faster optimization, but may produce very bad query plans. If set to 0, the system will automatically pick a reasonable value. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 62 -@@ -2549,7 +2549,7 @@ +@@ -2662,7 +2662,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 100 VARIABLE_SCOPE SESSION @@ -685,7 +698,7 @@ VARIABLE_COMMENT Controls number of record samples to check condition selectivity NUMERIC_MIN_VALUE 10 NUMERIC_MAX_VALUE 4294967295 -@@ -2577,7 +2577,7 @@ +@@ -2690,7 +2690,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 1 VARIABLE_SCOPE SESSION @@ -694,7 +707,7 @@ VARIABLE_COMMENT Controls selectivity of which conditions the optimizer takes into account to calculate cardinality of a partial join when it searches for the best execution plan Meaning: 1 - use selectivity of index backed range conditions to calculate the cardinality of a partial join if the last joined table is accessed by full table scan or an index scan, 2 - use selectivity of index backed range conditions to calculate the cardinality of a partial join in any case, 3 - additionally always use selectivity of range conditions that are not backed by any index to calculate the cardinality of a partial join, 4 - use histograms to calculate selectivity of range conditions that are not backed by any index to calculate the cardinality of a partial join.5 - additionally use selectivity of certain non-range predicates calculated on record samples NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 5 -@@ -2605,7 +2605,7 @@ +@@ -2718,7 +2718,7 @@ GLOBAL_VALUE_ORIGIN CONFIG DEFAULT_VALUE -1 VARIABLE_SCOPE GLOBAL @@ -703,7 +716,7 @@ VARIABLE_COMMENT Maximum number of instrumented user@host accounts. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2619,7 +2619,7 @@ +@@ -2732,7 +2732,7 @@ GLOBAL_VALUE_ORIGIN CONFIG DEFAULT_VALUE -1 VARIABLE_SCOPE GLOBAL @@ -712,7 +725,7 @@ VARIABLE_COMMENT Size of the statement digest. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 200 -@@ -2633,7 +2633,7 @@ +@@ -2746,7 +2746,7 @@ GLOBAL_VALUE_ORIGIN CONFIG DEFAULT_VALUE -1 VARIABLE_SCOPE GLOBAL @@ -721,7 +734,7 @@ VARIABLE_COMMENT Number of rows in EVENTS_STAGES_HISTORY_LONG. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2647,7 +2647,7 @@ +@@ -2760,7 +2760,7 @@ GLOBAL_VALUE_ORIGIN CONFIG DEFAULT_VALUE -1 VARIABLE_SCOPE GLOBAL @@ -730,7 +743,7 @@ VARIABLE_COMMENT Number of rows per thread in EVENTS_STAGES_HISTORY. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1024 -@@ -2661,7 +2661,7 @@ +@@ -2774,7 +2774,7 @@ GLOBAL_VALUE_ORIGIN CONFIG DEFAULT_VALUE -1 VARIABLE_SCOPE GLOBAL @@ -739,7 +752,7 @@ VARIABLE_COMMENT Number of rows in EVENTS_STATEMENTS_HISTORY_LONG. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2675,7 +2675,7 @@ +@@ -2788,7 +2788,7 @@ GLOBAL_VALUE_ORIGIN CONFIG DEFAULT_VALUE -1 VARIABLE_SCOPE GLOBAL @@ -748,7 +761,7 @@ VARIABLE_COMMENT Number of rows per thread in EVENTS_STATEMENTS_HISTORY. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1024 -@@ -2689,7 +2689,7 @@ +@@ -2802,7 +2802,7 @@ GLOBAL_VALUE_ORIGIN CONFIG DEFAULT_VALUE -1 VARIABLE_SCOPE GLOBAL @@ -757,7 +770,7 @@ VARIABLE_COMMENT Number of rows in EVENTS_WAITS_HISTORY_LONG. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2703,7 +2703,7 @@ +@@ -2816,7 +2816,7 @@ GLOBAL_VALUE_ORIGIN CONFIG DEFAULT_VALUE -1 VARIABLE_SCOPE GLOBAL @@ -766,7 +779,7 @@ VARIABLE_COMMENT Number of rows per thread in EVENTS_WAITS_HISTORY. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1024 -@@ -2717,7 +2717,7 @@ +@@ -2830,7 +2830,7 @@ GLOBAL_VALUE_ORIGIN CONFIG DEFAULT_VALUE -1 VARIABLE_SCOPE GLOBAL @@ -775,7 +788,7 @@ VARIABLE_COMMENT Maximum number of instrumented hosts. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2731,7 +2731,7 @@ +@@ -2844,7 +2844,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 80 VARIABLE_SCOPE GLOBAL @@ -784,7 +797,7 @@ VARIABLE_COMMENT Maximum number of condition instruments. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 256 -@@ -2745,7 +2745,7 @@ +@@ -2858,7 +2858,7 @@ GLOBAL_VALUE_ORIGIN CONFIG DEFAULT_VALUE -1 VARIABLE_SCOPE GLOBAL @@ -793,7 +806,7 @@ VARIABLE_COMMENT Maximum number of instrumented condition objects. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2759,7 +2759,7 @@ +@@ -2872,7 +2872,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 1024 VARIABLE_SCOPE GLOBAL @@ -802,7 +815,7 @@ VARIABLE_COMMENT Maximum length considered for digest text, when stored in performance_schema tables. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 1048576 -@@ -2773,7 +2773,7 @@ +@@ -2886,7 +2886,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 50 VARIABLE_SCOPE GLOBAL @@ -811,7 +824,7 @@ VARIABLE_COMMENT Maximum number of file instruments. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 256 -@@ -2787,7 +2787,7 @@ +@@ -2900,7 +2900,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 32768 VARIABLE_SCOPE GLOBAL @@ -820,7 +833,7 @@ VARIABLE_COMMENT Maximum number of opened instrumented files. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 1048576 -@@ -2801,7 +2801,7 @@ +@@ -2914,7 +2914,7 @@ GLOBAL_VALUE_ORIGIN CONFIG DEFAULT_VALUE -1 VARIABLE_SCOPE GLOBAL @@ -829,7 +842,7 @@ VARIABLE_COMMENT Maximum number of instrumented files. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2815,7 +2815,7 @@ +@@ -2928,7 +2928,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 200 VARIABLE_SCOPE GLOBAL @@ -838,7 +851,7 @@ VARIABLE_COMMENT Maximum number of mutex instruments. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 256 -@@ -2829,7 +2829,7 @@ +@@ -2942,7 +2942,7 @@ GLOBAL_VALUE_ORIGIN CONFIG DEFAULT_VALUE -1 VARIABLE_SCOPE GLOBAL @@ -847,7 +860,7 @@ VARIABLE_COMMENT Maximum number of instrumented MUTEX objects. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 104857600 -@@ -2843,7 +2843,7 @@ +@@ -2956,7 +2956,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 40 VARIABLE_SCOPE GLOBAL @@ -856,7 +869,7 @@ VARIABLE_COMMENT Maximum number of rwlock instruments. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 256 -@@ -2857,7 +2857,7 @@ +@@ -2970,7 +2970,7 @@ GLOBAL_VALUE_ORIGIN CONFIG DEFAULT_VALUE -1 VARIABLE_SCOPE GLOBAL @@ -865,7 +878,7 @@ VARIABLE_COMMENT Maximum number of instrumented RWLOCK objects. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 104857600 -@@ -2871,7 +2871,7 @@ +@@ -2984,7 +2984,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 10 VARIABLE_SCOPE GLOBAL @@ -874,7 +887,7 @@ VARIABLE_COMMENT Maximum number of socket instruments. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 256 -@@ -2885,7 +2885,7 @@ +@@ -2998,7 +2998,7 @@ GLOBAL_VALUE_ORIGIN CONFIG DEFAULT_VALUE -1 VARIABLE_SCOPE GLOBAL @@ -883,7 +896,7 @@ VARIABLE_COMMENT Maximum number of opened instrumented sockets. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2899,7 +2899,7 @@ +@@ -3012,7 +3012,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 150 VARIABLE_SCOPE GLOBAL @@ -892,7 +905,7 @@ VARIABLE_COMMENT Maximum number of stage instruments. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 256 -@@ -2913,7 +2913,7 @@ +@@ -3026,7 +3026,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 191 VARIABLE_SCOPE GLOBAL @@ -901,7 +914,7 @@ VARIABLE_COMMENT Maximum number of statement instruments. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 256 -@@ -2927,7 +2927,7 @@ +@@ -3040,7 +3040,7 @@ GLOBAL_VALUE_ORIGIN CONFIG DEFAULT_VALUE -1 VARIABLE_SCOPE GLOBAL @@ -910,7 +923,7 @@ VARIABLE_COMMENT Maximum number of opened instrumented tables. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2941,7 +2941,7 @@ +@@ -3054,7 +3054,7 @@ GLOBAL_VALUE_ORIGIN CONFIG DEFAULT_VALUE -1 VARIABLE_SCOPE GLOBAL @@ -919,7 +932,7 @@ VARIABLE_COMMENT Maximum number of instrumented tables. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2955,7 +2955,7 @@ +@@ -3068,7 +3068,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 50 VARIABLE_SCOPE GLOBAL @@ -928,7 +941,7 @@ VARIABLE_COMMENT Maximum number of thread instruments. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 256 -@@ -2969,7 +2969,7 @@ +@@ -3082,7 +3082,7 @@ GLOBAL_VALUE_ORIGIN CONFIG DEFAULT_VALUE -1 VARIABLE_SCOPE GLOBAL @@ -937,7 +950,7 @@ VARIABLE_COMMENT Maximum number of instrumented threads. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2983,7 +2983,7 @@ +@@ -3096,7 +3096,7 @@ GLOBAL_VALUE_ORIGIN CONFIG DEFAULT_VALUE -1 VARIABLE_SCOPE GLOBAL @@ -946,7 +959,7 @@ VARIABLE_COMMENT Size of session attribute string buffer per thread. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2997,7 +2997,7 @@ +@@ -3110,7 +3110,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 100 VARIABLE_SCOPE GLOBAL @@ -955,7 +968,7 @@ VARIABLE_COMMENT Maximum number of rows in SETUP_ACTORS. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 1024 -@@ -3011,7 +3011,7 @@ +@@ -3124,7 +3124,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 100 VARIABLE_SCOPE GLOBAL @@ -964,7 +977,7 @@ VARIABLE_COMMENT Maximum number of rows in SETUP_OBJECTS. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 1048576 -@@ -3025,7 +3025,7 @@ +@@ -3138,7 +3138,7 @@ GLOBAL_VALUE_ORIGIN CONFIG DEFAULT_VALUE -1 VARIABLE_SCOPE GLOBAL @@ -973,7 +986,7 @@ VARIABLE_COMMENT Maximum number of instrumented users. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -3095,7 +3095,7 @@ +@@ -3208,7 +3208,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 32768 VARIABLE_SCOPE SESSION @@ -982,7 +995,7 @@ VARIABLE_COMMENT The size of the buffer that is allocated when preloading indexes NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 1073741824 -@@ -3123,7 +3123,7 @@ +@@ -3236,7 +3236,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 15 VARIABLE_SCOPE SESSION @@ -991,7 +1004,7 @@ VARIABLE_COMMENT Number of statements about which profiling information is maintained. If set to 0, no profiles are stored. See SHOW PROFILES. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 100 -@@ -3137,7 +3137,7 @@ +@@ -3250,7 +3250,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 5 VARIABLE_SCOPE SESSION @@ -1000,7 +1013,7 @@ VARIABLE_COMMENT Seconds between sending progress reports to the client for time-consuming statements. Set to 0 to disable progress reporting. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -3221,7 +3221,7 @@ +@@ -3334,7 +3334,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 16384 VARIABLE_SCOPE SESSION @@ -1009,7 +1022,7 @@ VARIABLE_COMMENT Allocation block size for query parsing and execution NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 4294967295 -@@ -3235,7 +3235,7 @@ +@@ -3348,7 +3348,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 1048576 VARIABLE_SCOPE GLOBAL @@ -1018,7 +1031,7 @@ VARIABLE_COMMENT Don't cache results that are bigger than this NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -3249,7 +3249,7 @@ +@@ -3362,7 +3362,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 4096 VARIABLE_SCOPE GLOBAL @@ -1027,7 +1040,7 @@ VARIABLE_COMMENT The minimum size for blocks allocated by the query cache NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -3266,7 +3266,7 @@ +@@ -3379,7 +3379,7 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT The memory allocated to store results from old queries NUMERIC_MIN_VALUE 0 @@ -1036,7 +1049,7 @@ NUMERIC_BLOCK_SIZE 1024 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -3319,7 +3319,7 @@ +@@ -3432,7 +3432,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 24576 VARIABLE_SCOPE SESSION @@ -1045,7 +1058,7 @@ VARIABLE_COMMENT Persistent buffer for query parsing and execution NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 4294967295 -@@ -3333,7 +3333,7 @@ +@@ -3446,7 +3446,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 4096 VARIABLE_SCOPE SESSION @@ -1054,7 +1067,7 @@ VARIABLE_COMMENT Allocation block size for storing ranges during optimization NUMERIC_MIN_VALUE 4096 NUMERIC_MAX_VALUE 4294967295 -@@ -3347,7 +3347,7 @@ +@@ -3460,7 +3460,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 131072 VARIABLE_SCOPE SESSION @@ -1063,7 +1076,7 @@ VARIABLE_COMMENT Each thread that does a sequential scan allocates a buffer of this size for each table it scans. If you do many sequential scans, you may want to increase this value NUMERIC_MIN_VALUE 8192 NUMERIC_MAX_VALUE 2147483647 -@@ -3375,7 +3375,7 @@ +@@ -3488,7 +3488,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 262144 VARIABLE_SCOPE SESSION @@ -1072,7 +1085,7 @@ VARIABLE_COMMENT When reading rows in sorted order after a sort, the rows are read through this buffer to avoid a disk seeks NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 2147483647 -@@ -3389,10 +3389,10 @@ +@@ -3502,10 +3502,10 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 8388608 VARIABLE_SCOPE SESSION @@ -1085,7 +1098,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -3431,7 +3431,7 @@ +@@ -3544,7 +3544,7 @@ GLOBAL_VALUE_ORIGIN CONFIG DEFAULT_VALUE 1 VARIABLE_SCOPE SESSION @@ -1094,7 +1107,7 @@ VARIABLE_COMMENT Uniquely identifies the server instance in the community of replication partners NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 4294967295 -@@ -3529,7 +3529,7 @@ +@@ -3642,7 +3642,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 1073741824 VARIABLE_SCOPE GLOBAL @@ -1103,7 +1116,7 @@ VARIABLE_COMMENT The maximum packet length to sent successfully from the master to slave. NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 1073741824 -@@ -3543,7 +3543,7 @@ +@@ -3656,7 +3656,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 2 VARIABLE_SCOPE GLOBAL @@ -1112,7 +1125,7 @@ VARIABLE_COMMENT If creating the thread takes longer than this value (in seconds), the Slow_launch_threads counter will be incremented NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 31536000 -@@ -3602,7 +3602,7 @@ +@@ -3715,7 +3715,7 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Each thread that needs to do a sort allocates a buffer of this size NUMERIC_MIN_VALUE 1024 @@ -1121,7 +1134,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -3893,7 +3893,7 @@ +@@ -4006,7 +4006,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 256 VARIABLE_SCOPE GLOBAL @@ -1130,7 +1143,7 @@ VARIABLE_COMMENT The soft upper limit for number of cached stored routines for one connection. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 524288 -@@ -3963,7 +3963,7 @@ +@@ -4076,7 +4076,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 400 VARIABLE_SCOPE GLOBAL @@ -1139,7 +1152,7 @@ VARIABLE_COMMENT The number of cached table definitions NUMERIC_MIN_VALUE 400 NUMERIC_MAX_VALUE 524288 -@@ -3977,7 +3977,7 @@ +@@ -4090,7 +4090,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 2000 VARIABLE_SCOPE GLOBAL @@ -1148,7 +1161,7 @@ VARIABLE_COMMENT The number of cached open tables NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 1048576 -@@ -4005,7 +4005,7 @@ +@@ -4118,7 +4118,7 @@ GLOBAL_VALUE_ORIGIN AUTO DEFAULT_VALUE 256 VARIABLE_SCOPE GLOBAL @@ -1157,7 +1170,7 @@ VARIABLE_COMMENT How many threads we should keep in a cache for reuse. These are freed after 5 minutes of idle time NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 16384 -@@ -4019,7 +4019,7 @@ +@@ -4132,7 +4132,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 10 VARIABLE_SCOPE GLOBAL @@ -1166,7 +1179,7 @@ VARIABLE_COMMENT Permits the application to give the threads system a hint for the desired number of threads that should be run at the same time.This variable has no effect, and is deprecated. It will be removed in a future release. NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 512 -@@ -4126,15 +4126,15 @@ +@@ -4239,15 +4239,15 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME TMP_DISK_TABLE_SIZE @@ -1186,7 +1199,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -4148,7 +4148,7 @@ +@@ -4261,7 +4261,7 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT If an internal in-memory temporary table exceeds this size, MariaDB will automatically convert it to an on-disk MyISAM or Aria table. Same as tmp_table_size. NUMERIC_MIN_VALUE 1024 @@ -1195,7 +1208,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -4162,7 +4162,7 @@ +@@ -4275,7 +4275,7 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Alias for tmp_memory_table_size. If an internal in-memory temporary table exceeds this size, MariaDB will automatically convert it to an on-disk MyISAM or Aria table. NUMERIC_MIN_VALUE 1024 @@ -1204,7 +1217,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -4173,7 +4173,7 @@ +@@ -4286,7 +4286,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 8192 VARIABLE_SCOPE SESSION @@ -1213,7 +1226,7 @@ VARIABLE_COMMENT Allocation block size for transactions to be stored in binary log NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 134217728 -@@ -4187,7 +4187,7 @@ +@@ -4300,7 +4300,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 4096 VARIABLE_SCOPE SESSION @@ -1222,7 +1235,7 @@ VARIABLE_COMMENT Persistent buffer for transactions to be stored in binary log NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 134217728 -@@ -4285,7 +4285,7 @@ +@@ -4398,7 +4398,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 28800 VARIABLE_SCOPE SESSION @@ -1231,7 +1244,7 @@ VARIABLE_COMMENT The number of seconds the server waits for activity on a connection before closing it NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 31536000 -@@ -4389,7 +4389,7 @@ +@@ -4503,7 +4503,7 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME OPEN_FILES_LIMIT VARIABLE_SCOPE GLOBAL @@ -1240,7 +1253,7 @@ VARIABLE_COMMENT If this is not 0, then mysqld will use this value to reserve file descriptors to use with setrlimit(). If this value is 0 or autoset then mysqld will reserve max_connections*5 or max_connections + table_cache*2 (whichever is larger) number of file descriptors NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -4402,7 +4402,7 @@ +@@ -4516,7 +4516,7 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Sets the internal state of the RAND() generator for replication purposes NUMERIC_MIN_VALUE 0 @@ -1249,7 +1262,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -4412,7 +4412,7 @@ +@@ -4526,7 +4526,7 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Sets the internal state of the RAND() generator for replication purposes NUMERIC_MIN_VALUE 0 @@ -1258,7 +1271,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -4497,7 +4497,7 @@ +@@ -4621,7 +4621,7 @@ VARIABLE_NAME LOG_TC_SIZE GLOBAL_VALUE_ORIGIN AUTO VARIABLE_SCOPE GLOBAL 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 2cd193e4d5c..13ac908c288 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result +++ b/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result @@ -1424,6 +1424,20 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED +VARIABLE_NAME IN_SUBQUERY_CONVERSION_THRESHOLD +SESSION_VALUE 1000 +GLOBAL_VALUE 1000 +GLOBAL_VALUE_ORIGIN COMPILE-TIME +DEFAULT_VALUE 1000 +VARIABLE_SCOPE SESSION +VARIABLE_TYPE BIGINT UNSIGNED +VARIABLE_COMMENT The minimum number of scalar elements in the value list of IN predicate that triggers its conversion to IN subquery +NUMERIC_MIN_VALUE 0 +NUMERIC_MAX_VALUE 18446744073709551615 +NUMERIC_BLOCK_SIZE 1 +ENUM_VALUE_LIST NULL +READ_ONLY NO +COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME IN_TRANSACTION SESSION_VALUE 0 GLOBAL_VALUE NULL @@ -1935,7 +1949,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 10.000000 VARIABLE_SCOPE SESSION VARIABLE_TYPE DOUBLE -VARIABLE_COMMENT Log all queries that have taken more than long_query_time seconds to execute to file. The argument will be treated as a decimal value with microsecond precision +VARIABLE_COMMENT Log all queries that have taken more than long_query_time seconds to execute to the slow query log file. The argument will be treated as a decimal value with microsecond precision NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 31536000 NUMERIC_BLOCK_SIZE NULL @@ -2994,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,32bit.rdiff b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded,32bit.rdiff index 4a01cbc8424..e548390f959 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded,32bit.rdiff +++ b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded,32bit.rdiff @@ -1,6 +1,6 @@ ---- suite/sys_vars/r/sysvars_server_notembedded.result 2017-09-14 10:37:46.000000000 +0000 -+++ suite/sys_vars/r/sysvars_server_notembedded,32bit.reject 2017-09-26 13:04:02.733012523 +0000 -@@ -57,7 +57,7 @@ +--- sysvars_server_notembedded.result ++++ sysvars_server_notembedded,32bit.result +@@ -58,7 +58,7 @@ GLOBAL_VALUE_ORIGIN CONFIG DEFAULT_VALUE 1 VARIABLE_SCOPE SESSION @@ -9,7 +9,7 @@ VARIABLE_COMMENT Auto-increment columns are incremented by this NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 65535 -@@ -71,7 +71,7 @@ +@@ -72,7 +72,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 1 VARIABLE_SCOPE SESSION @@ -18,7 +18,7 @@ VARIABLE_COMMENT Offset added to Auto-increment columns. Used when auto-increment-increment != 1 NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 65535 -@@ -85,7 +85,7 @@ +@@ -86,7 +86,7 @@ GLOBAL_VALUE_ORIGIN AUTO DEFAULT_VALUE 150 VARIABLE_SCOPE GLOBAL @@ -27,7 +27,7 @@ VARIABLE_COMMENT The number of outstanding connection requests MariaDB can have. This comes into play when the main MariaDB thread gets very many connection requests in a very short time NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 65535 -@@ -144,7 +144,7 @@ +@@ -159,7 +159,7 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT The size of the transactional cache for updates to transactional engines for the binary log. If you often use transactions containing many statements, you can increase this to get more performance NUMERIC_MIN_VALUE 4096 @@ -36,7 +36,7 @@ NUMERIC_BLOCK_SIZE 4096 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -169,10 +169,10 @@ +@@ -184,10 +184,10 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 0 VARIABLE_SCOPE GLOBAL @@ -49,7 +49,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -183,10 +183,10 @@ +@@ -198,10 +198,10 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 100000 VARIABLE_SCOPE GLOBAL @@ -62,7 +62,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -256,7 +256,7 @@ +@@ -271,7 +271,7 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT The size of the statement cache for updates to non-transactional engines for the binary log. If you often use statements updating a great number of rows, you can increase this to get more performance. NUMERIC_MIN_VALUE 4096 @@ -71,7 +71,7 @@ NUMERIC_BLOCK_SIZE 4096 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -270,7 +270,7 @@ +@@ -285,7 +285,7 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Size of tree cache used in bulk insert optimisation. Note that this is a limit per thread! NUMERIC_MIN_VALUE 0 @@ -80,7 +80,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -533,7 +533,7 @@ +@@ -548,7 +548,7 @@ GLOBAL_VALUE_ORIGIN CONFIG DEFAULT_VALUE 10 VARIABLE_SCOPE GLOBAL @@ -89,7 +89,7 @@ VARIABLE_COMMENT The number of seconds the mysqld server is waiting for a connect packet before responding with 'Bad handshake' NUMERIC_MIN_VALUE 2 NUMERIC_MAX_VALUE 31536000 -@@ -589,7 +589,7 @@ +@@ -604,7 +604,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 15 VARIABLE_SCOPE SESSION @@ -98,7 +98,7 @@ VARIABLE_COMMENT Long search depth for the two-step deadlock detection NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 33 -@@ -603,7 +603,7 @@ +@@ -618,7 +618,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 4 VARIABLE_SCOPE SESSION @@ -107,7 +107,7 @@ VARIABLE_COMMENT Short search depth for the two-step deadlock detection NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 32 -@@ -617,7 +617,7 @@ +@@ -632,7 +632,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 50000000 VARIABLE_SCOPE SESSION @@ -116,7 +116,7 @@ VARIABLE_COMMENT Long timeout for the two-step deadlock detection (in microseconds) NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -631,7 +631,7 @@ +@@ -646,7 +646,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 10000 VARIABLE_SCOPE SESSION @@ -125,7 +125,7 @@ VARIABLE_COMMENT Short timeout for the two-step deadlock detection (in microseconds) NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -701,7 +701,7 @@ +@@ -716,7 +716,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 0 VARIABLE_SCOPE SESSION @@ -134,7 +134,7 @@ VARIABLE_COMMENT The default week format used by WEEK() functions NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 7 -@@ -715,7 +715,7 @@ +@@ -730,7 +730,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 100 VARIABLE_SCOPE GLOBAL @@ -143,7 +143,7 @@ VARIABLE_COMMENT After inserting delayed_insert_limit rows, the INSERT DELAYED handler will check if there are any SELECT statements pending. If so, it allows these to execute before continuing. NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 4294967295 -@@ -729,7 +729,7 @@ +@@ -744,7 +744,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 300 VARIABLE_SCOPE GLOBAL @@ -152,7 +152,7 @@ VARIABLE_COMMENT How long a INSERT DELAYED thread should wait for INSERT statements before terminating NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 31536000 -@@ -743,7 +743,7 @@ +@@ -758,7 +758,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 1000 VARIABLE_SCOPE GLOBAL @@ -161,7 +161,7 @@ VARIABLE_COMMENT What size queue (in rows) should be allocated for handling INSERT DELAYED. If the queue becomes full, any client that does INSERT DELAYED will wait until there is room in the queue again NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 4294967295 -@@ -771,7 +771,7 @@ +@@ -786,7 +786,7 @@ GLOBAL_VALUE_ORIGIN SQL DEFAULT_VALUE 4 VARIABLE_SCOPE SESSION @@ -170,7 +170,7 @@ VARIABLE_COMMENT Precision of the result of '/' operator will be increased on that value NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 38 -@@ -883,7 +883,7 @@ +@@ -898,7 +898,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 0 VARIABLE_SCOPE GLOBAL @@ -179,7 +179,7 @@ VARIABLE_COMMENT If non-zero, binary logs will be purged after expire_logs_days days; possible purges happen at startup and at binary log rotation NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 99 -@@ -925,7 +925,7 @@ +@@ -940,7 +940,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 1 VARIABLE_SCOPE GLOBAL @@ -188,7 +188,7 @@ VARIABLE_COMMENT The number of connections on extra-port NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 100000 -@@ -967,7 +967,7 @@ +@@ -982,7 +982,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 0 VARIABLE_SCOPE GLOBAL @@ -197,7 +197,7 @@ VARIABLE_COMMENT A dedicated thread is created to flush all tables at the given interval NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 31536000 -@@ -1009,7 +1009,7 @@ +@@ -1024,7 +1024,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 84 VARIABLE_SCOPE GLOBAL @@ -206,7 +206,7 @@ VARIABLE_COMMENT The maximum length of the word to be included in a FULLTEXT index. Note: FULLTEXT indexes must be rebuilt after changing this variable NUMERIC_MIN_VALUE 10 NUMERIC_MAX_VALUE 84 -@@ -1023,7 +1023,7 @@ +@@ -1038,7 +1038,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 4 VARIABLE_SCOPE GLOBAL @@ -215,7 +215,7 @@ VARIABLE_COMMENT The minimum length of the word to be included in a FULLTEXT index. Note: FULLTEXT indexes must be rebuilt after changing this variable NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 84 -@@ -1037,7 +1037,7 @@ +@@ -1052,7 +1052,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 20 VARIABLE_SCOPE GLOBAL @@ -224,7 +224,7 @@ VARIABLE_COMMENT Number of best matches to use for query expansion NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 1000 -@@ -1096,7 +1096,7 @@ +@@ -1111,7 +1111,7 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT The maximum length of the result of function GROUP_CONCAT() NUMERIC_MIN_VALUE 4 @@ -233,7 +233,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -1345,7 +1345,7 @@ +@@ -1360,7 +1360,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 0 VARIABLE_SCOPE SESSION @@ -242,7 +242,7 @@ VARIABLE_COMMENT Number of bytes used for a histogram. If set to 0, no histograms are created by ANALYZE. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 255 -@@ -1373,7 +1373,7 @@ +@@ -1388,7 +1388,7 @@ GLOBAL_VALUE_ORIGIN AUTO DEFAULT_VALUE 128 VARIABLE_SCOPE GLOBAL @@ -251,7 +251,7 @@ VARIABLE_COMMENT How many host names should be cached to avoid resolving. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 65536 -@@ -1527,7 +1527,7 @@ +@@ -1542,7 +1542,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 28800 VARIABLE_SCOPE SESSION @@ -260,7 +260,20 @@ VARIABLE_COMMENT The number of seconds the server waits for activity on an interactive connection before closing it NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 31536000 -@@ -1558,7 +1558,7 @@ +@@ -1556,10 +1556,10 @@ + GLOBAL_VALUE_ORIGIN COMPILE-TIME + DEFAULT_VALUE 1000 + VARIABLE_SCOPE SESSION +-VARIABLE_TYPE BIGINT UNSIGNED ++VARIABLE_TYPE INT UNSIGNED + VARIABLE_COMMENT The minimum number of scalar elements in the value list of IN predicate that triggers its conversion to IN subquery + NUMERIC_MIN_VALUE 0 +-NUMERIC_MAX_VALUE 18446744073709551615 ++NUMERIC_MAX_VALUE 4294967295 + NUMERIC_BLOCK_SIZE 1 + ENUM_VALUE_LIST NULL + READ_ONLY NO +@@ -1587,7 +1587,7 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT The size of the buffer that is used for joins NUMERIC_MIN_VALUE 128 @@ -269,7 +282,7 @@ NUMERIC_BLOCK_SIZE 128 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -1583,7 +1583,7 @@ +@@ -1612,7 +1612,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 2 VARIABLE_SCOPE SESSION @@ -278,7 +291,7 @@ VARIABLE_COMMENT Controls what join operations can be executed with join buffers. Odd numbers are used for plain join buffers while even numbers are used for linked buffers NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 8 -@@ -1614,7 +1614,7 @@ +@@ -1643,7 +1643,7 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT The size of the buffer used for index blocks for MyISAM tables. Increase this to get better index handling (for all reads and multiple writes) to as much as you can afford NUMERIC_MIN_VALUE 0 @@ -287,7 +300,7 @@ NUMERIC_BLOCK_SIZE 4096 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -1835,7 +1835,7 @@ +@@ -1864,7 +1864,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 86400 VARIABLE_SCOPE SESSION @@ -296,7 +309,7 @@ VARIABLE_COMMENT Timeout in seconds to wait for a lock before returning an error. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 31536000 -@@ -2045,7 +2045,7 @@ +@@ -2074,7 +2074,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 1 VARIABLE_SCOPE SESSION @@ -305,7 +318,7 @@ VARIABLE_COMMENT Write to slow log every #th slow query. Set to 1 to log everything. Increase it to reduce the size of the slow or the performance impact of slow logging NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 4294967295 -@@ -2087,7 +2087,7 @@ +@@ -2116,7 +2116,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 2 VARIABLE_SCOPE SESSION @@ -314,7 +327,7 @@ VARIABLE_COMMENT Log some not critical warnings to the general log file.Value can be between 0 and 11. Higher values mean more verbosity NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -2143,7 +2143,7 @@ +@@ -2172,7 +2172,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 16777216 VARIABLE_SCOPE SESSION @@ -323,7 +336,7 @@ VARIABLE_COMMENT Max packet length to send to or receive from the server NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 1073741824 -@@ -2153,14 +2153,14 @@ +@@ -2182,14 +2182,14 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MAX_BINLOG_CACHE_SIZE SESSION_VALUE NULL @@ -341,7 +354,7 @@ NUMERIC_BLOCK_SIZE 4096 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -2171,7 +2171,7 @@ +@@ -2200,7 +2200,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 1073741824 VARIABLE_SCOPE GLOBAL @@ -350,7 +363,7 @@ VARIABLE_COMMENT Binary log will be rotated automatically when the size exceeds this value. NUMERIC_MIN_VALUE 4096 NUMERIC_MAX_VALUE 1073741824 -@@ -2181,14 +2181,14 @@ +@@ -2210,14 +2210,14 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MAX_BINLOG_STMT_CACHE_SIZE SESSION_VALUE NULL @@ -368,7 +381,7 @@ NUMERIC_BLOCK_SIZE 4096 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -2199,7 +2199,7 @@ +@@ -2228,7 +2228,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 151 VARIABLE_SCOPE GLOBAL @@ -377,7 +390,7 @@ VARIABLE_COMMENT The number of simultaneous clients allowed NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 100000 -@@ -2213,7 +2213,7 @@ +@@ -2242,7 +2242,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 100 VARIABLE_SCOPE GLOBAL @@ -386,7 +399,7 @@ VARIABLE_COMMENT If there is more than this number of interrupted connections from a host this host will be blocked from further connections NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 4294967295 -@@ -2227,7 +2227,7 @@ +@@ -2256,7 +2256,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 20 VARIABLE_SCOPE SESSION @@ -395,7 +408,7 @@ VARIABLE_COMMENT Don't start more than this number of threads to handle INSERT DELAYED statements. If set to zero INSERT DELAYED will be not used NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 16384 -@@ -2255,7 +2255,7 @@ +@@ -2284,7 +2284,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 64 VARIABLE_SCOPE SESSION @@ -404,7 +417,7 @@ VARIABLE_COMMENT Max number of errors/warnings to store for a statement NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 65535 -@@ -2272,7 +2272,7 @@ +@@ -2301,7 +2301,7 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Don't allow creation of heap tables bigger than this NUMERIC_MIN_VALUE 16384 @@ -413,7 +426,7 @@ NUMERIC_BLOCK_SIZE 1024 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -2283,7 +2283,7 @@ +@@ -2312,7 +2312,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 20 VARIABLE_SCOPE SESSION @@ -422,7 +435,7 @@ VARIABLE_COMMENT Don't start more than this number of threads to handle INSERT DELAYED statements. If set to zero INSERT DELAYED will be not used NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 16384 -@@ -2311,7 +2311,7 @@ +@@ -2340,7 +2340,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 1024 VARIABLE_SCOPE SESSION @@ -431,7 +444,7 @@ VARIABLE_COMMENT Max number of bytes in sorted records NUMERIC_MIN_VALUE 4 NUMERIC_MAX_VALUE 8388608 -@@ -2325,7 +2325,7 @@ +@@ -2354,7 +2354,7 @@ GLOBAL_VALUE_ORIGIN AUTO DEFAULT_VALUE 1048576 VARIABLE_SCOPE GLOBAL @@ -440,7 +453,7 @@ VARIABLE_COMMENT The maximum BLOB length to send to server from mysql_send_long_data API. Deprecated option; use max_allowed_packet instead. NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 4294967295 -@@ -2339,7 +2339,7 @@ +@@ -2368,7 +2368,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 16382 VARIABLE_SCOPE GLOBAL @@ -449,7 +462,7 @@ VARIABLE_COMMENT Maximum number of prepared statements in the server NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 1048576 -@@ -2353,7 +2353,7 @@ +@@ -2382,7 +2382,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 4294967295 VARIABLE_SCOPE SESSION @@ -458,7 +471,7 @@ VARIABLE_COMMENT Maximum number of iterations when executing recursive queries NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -2381,7 +2381,7 @@ +@@ -2410,7 +2410,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 4294967295 VARIABLE_SCOPE SESSION @@ -467,7 +480,7 @@ VARIABLE_COMMENT Limit assumed max number of seeks when looking up rows based on a key NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 4294967295 -@@ -2409,7 +2409,7 @@ +@@ -2438,7 +2438,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 1024 VARIABLE_SCOPE SESSION @@ -476,7 +489,7 @@ VARIABLE_COMMENT The number of bytes to use when sorting BLOB or TEXT values (only the first max_sort_length bytes of each value are used; the rest are ignored) NUMERIC_MIN_VALUE 4 NUMERIC_MAX_VALUE 8388608 -@@ -2423,7 +2423,7 @@ +@@ -2452,7 +2452,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 0 VARIABLE_SCOPE SESSION @@ -485,7 +498,7 @@ VARIABLE_COMMENT Maximum stored procedure recursion depth NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 255 -@@ -2451,7 +2451,7 @@ +@@ -2480,7 +2480,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 32 VARIABLE_SCOPE SESSION @@ -494,7 +507,7 @@ VARIABLE_COMMENT Unused, will be removed. NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 4294967295 -@@ -2479,7 +2479,7 @@ +@@ -2508,7 +2508,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 4294967295 VARIABLE_SCOPE GLOBAL @@ -503,7 +516,7 @@ VARIABLE_COMMENT After this many write locks, allow some read locks to run in between NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 4294967295 -@@ -2493,7 +2493,7 @@ +@@ -2522,7 +2522,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 1024 VARIABLE_SCOPE GLOBAL @@ -512,7 +525,7 @@ VARIABLE_COMMENT Unused NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 1048576 -@@ -2507,7 +2507,7 @@ +@@ -2536,7 +2536,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 8 VARIABLE_SCOPE GLOBAL @@ -521,7 +534,7 @@ VARIABLE_COMMENT Unused NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 1024 -@@ -2521,7 +2521,7 @@ +@@ -2550,7 +2550,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 0 VARIABLE_SCOPE SESSION @@ -530,7 +543,7 @@ VARIABLE_COMMENT Don't write queries to slow log that examine fewer rows than that NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -2535,7 +2535,7 @@ +@@ -2564,7 +2564,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 262144 VARIABLE_SCOPE SESSION @@ -539,7 +552,7 @@ VARIABLE_COMMENT Size of buffer to use when using MRR with range access NUMERIC_MIN_VALUE 8192 NUMERIC_MAX_VALUE 2147483647 -@@ -2549,10 +2549,10 @@ +@@ -2578,10 +2578,10 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 256 VARIABLE_SCOPE SESSION @@ -552,7 +565,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -2563,7 +2563,7 @@ +@@ -2592,7 +2592,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 1024 VARIABLE_SCOPE GLOBAL @@ -561,7 +574,7 @@ VARIABLE_COMMENT Block size to be used for MyISAM index pages NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 16384 -@@ -2577,7 +2577,7 @@ +@@ -2606,7 +2606,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 6 VARIABLE_SCOPE GLOBAL @@ -570,7 +583,7 @@ VARIABLE_COMMENT Default pointer size to be used for MyISAM tables NUMERIC_MIN_VALUE 2 NUMERIC_MAX_VALUE 7 -@@ -2587,9 +2587,9 @@ +@@ -2616,9 +2616,9 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MYISAM_MAX_SORT_FILE_SIZE SESSION_VALUE NULL @@ -582,7 +595,7 @@ VARIABLE_SCOPE GLOBAL VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Don't use the fast sort index method to created index if the temporary file would get bigger than this -@@ -2601,14 +2601,14 @@ +@@ -2630,14 +2630,14 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MYISAM_MMAP_SIZE SESSION_VALUE NULL @@ -600,7 +613,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY YES -@@ -2633,10 +2633,10 @@ +@@ -2662,10 +2662,10 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 1 VARIABLE_SCOPE SESSION @@ -613,7 +626,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -2650,7 +2650,7 @@ +@@ -2679,7 +2679,7 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT The buffer that is allocated when sorting the index when doing a REPAIR or when creating indexes with CREATE INDEX or ALTER TABLE NUMERIC_MIN_VALUE 4096 @@ -622,7 +635,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -2703,7 +2703,7 @@ +@@ -2732,7 +2732,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 16384 VARIABLE_SCOPE SESSION @@ -631,7 +644,7 @@ VARIABLE_COMMENT Buffer length for TCP/IP and socket communication NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 1048576 -@@ -2717,7 +2717,7 @@ +@@ -2746,7 +2746,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 30 VARIABLE_SCOPE SESSION @@ -640,7 +653,7 @@ VARIABLE_COMMENT Number of seconds to wait for more data from a connection before aborting the read NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 31536000 -@@ -2731,7 +2731,7 @@ +@@ -2760,7 +2760,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 10 VARIABLE_SCOPE SESSION @@ -649,7 +662,7 @@ VARIABLE_COMMENT If a read on a communication port is interrupted, retry this many times before giving up NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 4294967295 -@@ -2745,7 +2745,7 @@ +@@ -2774,7 +2774,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 60 VARIABLE_SCOPE SESSION @@ -658,7 +671,7 @@ VARIABLE_COMMENT Number of seconds to wait for a block to be written to a connection before aborting the write NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 31536000 -@@ -2815,7 +2815,7 @@ +@@ -2844,7 +2844,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 1 VARIABLE_SCOPE SESSION @@ -667,7 +680,7 @@ VARIABLE_COMMENT Controls the heuristic(s) applied during query optimization to prune less-promising partial plans from the optimizer search space. Meaning: 0 - do not apply any heuristic, thus perform exhaustive search; 1 - prune plans based on number of retrieved rows NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 1 -@@ -2829,7 +2829,7 @@ +@@ -2858,7 +2858,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 62 VARIABLE_SCOPE SESSION @@ -676,7 +689,7 @@ VARIABLE_COMMENT Maximum depth of search performed by the query optimizer. Values larger than the number of relations in a query result in better query plans, but take longer to compile a query. Values smaller than the number of tables in a relation result in faster optimization, but may produce very bad query plans. If set to 0, the system will automatically pick a reasonable value. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 62 -@@ -2843,7 +2843,7 @@ +@@ -2872,7 +2872,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 100 VARIABLE_SCOPE SESSION @@ -685,7 +698,7 @@ VARIABLE_COMMENT Controls number of record samples to check condition selectivity NUMERIC_MIN_VALUE 10 NUMERIC_MAX_VALUE 4294967295 -@@ -2871,7 +2871,7 @@ +@@ -2900,7 +2900,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 1 VARIABLE_SCOPE SESSION @@ -694,7 +707,7 @@ VARIABLE_COMMENT Controls selectivity of which conditions the optimizer takes into account to calculate cardinality of a partial join when it searches for the best execution plan Meaning: 1 - use selectivity of index backed range conditions to calculate the cardinality of a partial join if the last joined table is accessed by full table scan or an index scan, 2 - use selectivity of index backed range conditions to calculate the cardinality of a partial join in any case, 3 - additionally always use selectivity of range conditions that are not backed by any index to calculate the cardinality of a partial join, 4 - use histograms to calculate selectivity of range conditions that are not backed by any index to calculate the cardinality of a partial join.5 - additionally use selectivity of certain non-range predicates calculated on record samples NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 5 -@@ -2899,7 +2899,7 @@ +@@ -2928,7 +2928,7 @@ GLOBAL_VALUE_ORIGIN CONFIG DEFAULT_VALUE -1 VARIABLE_SCOPE GLOBAL @@ -703,7 +716,7 @@ VARIABLE_COMMENT Maximum number of instrumented user@host accounts. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2913,7 +2913,7 @@ +@@ -2942,7 +2942,7 @@ GLOBAL_VALUE_ORIGIN CONFIG DEFAULT_VALUE -1 VARIABLE_SCOPE GLOBAL @@ -712,7 +725,7 @@ VARIABLE_COMMENT Size of the statement digest. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 200 -@@ -2927,7 +2927,7 @@ +@@ -2956,7 +2956,7 @@ GLOBAL_VALUE_ORIGIN CONFIG DEFAULT_VALUE -1 VARIABLE_SCOPE GLOBAL @@ -721,7 +734,7 @@ VARIABLE_COMMENT Number of rows in EVENTS_STAGES_HISTORY_LONG. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2941,7 +2941,7 @@ +@@ -2970,7 +2970,7 @@ GLOBAL_VALUE_ORIGIN CONFIG DEFAULT_VALUE -1 VARIABLE_SCOPE GLOBAL @@ -730,7 +743,7 @@ VARIABLE_COMMENT Number of rows per thread in EVENTS_STAGES_HISTORY. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1024 -@@ -2955,7 +2955,7 @@ +@@ -2984,7 +2984,7 @@ GLOBAL_VALUE_ORIGIN CONFIG DEFAULT_VALUE -1 VARIABLE_SCOPE GLOBAL @@ -739,7 +752,7 @@ VARIABLE_COMMENT Number of rows in EVENTS_STATEMENTS_HISTORY_LONG. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2969,7 +2969,7 @@ +@@ -2998,7 +2998,7 @@ GLOBAL_VALUE_ORIGIN CONFIG DEFAULT_VALUE -1 VARIABLE_SCOPE GLOBAL @@ -748,7 +761,7 @@ VARIABLE_COMMENT Number of rows per thread in EVENTS_STATEMENTS_HISTORY. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1024 -@@ -2983,7 +2983,7 @@ +@@ -3012,7 +3012,7 @@ GLOBAL_VALUE_ORIGIN CONFIG DEFAULT_VALUE -1 VARIABLE_SCOPE GLOBAL @@ -757,7 +770,7 @@ VARIABLE_COMMENT Number of rows in EVENTS_WAITS_HISTORY_LONG. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2997,7 +2997,7 @@ +@@ -3026,7 +3026,7 @@ GLOBAL_VALUE_ORIGIN CONFIG DEFAULT_VALUE -1 VARIABLE_SCOPE GLOBAL @@ -766,7 +779,7 @@ VARIABLE_COMMENT Number of rows per thread in EVENTS_WAITS_HISTORY. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1024 -@@ -3011,7 +3011,7 @@ +@@ -3040,7 +3040,7 @@ GLOBAL_VALUE_ORIGIN CONFIG DEFAULT_VALUE -1 VARIABLE_SCOPE GLOBAL @@ -775,7 +788,7 @@ VARIABLE_COMMENT Maximum number of instrumented hosts. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -3025,7 +3025,7 @@ +@@ -3054,7 +3054,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 80 VARIABLE_SCOPE GLOBAL @@ -784,7 +797,7 @@ VARIABLE_COMMENT Maximum number of condition instruments. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 256 -@@ -3039,7 +3039,7 @@ +@@ -3068,7 +3068,7 @@ GLOBAL_VALUE_ORIGIN CONFIG DEFAULT_VALUE -1 VARIABLE_SCOPE GLOBAL @@ -793,7 +806,7 @@ VARIABLE_COMMENT Maximum number of instrumented condition objects. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -3053,7 +3053,7 @@ +@@ -3082,7 +3082,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 1024 VARIABLE_SCOPE GLOBAL @@ -802,7 +815,7 @@ VARIABLE_COMMENT Maximum length considered for digest text, when stored in performance_schema tables. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 1048576 -@@ -3067,7 +3067,7 @@ +@@ -3096,7 +3096,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 50 VARIABLE_SCOPE GLOBAL @@ -811,7 +824,7 @@ VARIABLE_COMMENT Maximum number of file instruments. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 256 -@@ -3081,7 +3081,7 @@ +@@ -3110,7 +3110,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 32768 VARIABLE_SCOPE GLOBAL @@ -820,7 +833,7 @@ VARIABLE_COMMENT Maximum number of opened instrumented files. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 1048576 -@@ -3095,7 +3095,7 @@ +@@ -3124,7 +3124,7 @@ GLOBAL_VALUE_ORIGIN CONFIG DEFAULT_VALUE -1 VARIABLE_SCOPE GLOBAL @@ -829,7 +842,7 @@ VARIABLE_COMMENT Maximum number of instrumented files. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -3109,7 +3109,7 @@ +@@ -3138,7 +3138,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 200 VARIABLE_SCOPE GLOBAL @@ -838,7 +851,7 @@ VARIABLE_COMMENT Maximum number of mutex instruments. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 256 -@@ -3123,7 +3123,7 @@ +@@ -3152,7 +3152,7 @@ GLOBAL_VALUE_ORIGIN CONFIG DEFAULT_VALUE -1 VARIABLE_SCOPE GLOBAL @@ -847,7 +860,7 @@ VARIABLE_COMMENT Maximum number of instrumented MUTEX objects. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 104857600 -@@ -3137,7 +3137,7 @@ +@@ -3166,7 +3166,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 40 VARIABLE_SCOPE GLOBAL @@ -856,7 +869,7 @@ VARIABLE_COMMENT Maximum number of rwlock instruments. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 256 -@@ -3151,7 +3151,7 @@ +@@ -3180,7 +3180,7 @@ GLOBAL_VALUE_ORIGIN CONFIG DEFAULT_VALUE -1 VARIABLE_SCOPE GLOBAL @@ -865,7 +878,7 @@ VARIABLE_COMMENT Maximum number of instrumented RWLOCK objects. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 104857600 -@@ -3165,7 +3165,7 @@ +@@ -3194,7 +3194,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 10 VARIABLE_SCOPE GLOBAL @@ -874,7 +887,7 @@ VARIABLE_COMMENT Maximum number of socket instruments. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 256 -@@ -3179,7 +3179,7 @@ +@@ -3208,7 +3208,7 @@ GLOBAL_VALUE_ORIGIN CONFIG DEFAULT_VALUE -1 VARIABLE_SCOPE GLOBAL @@ -883,7 +896,7 @@ VARIABLE_COMMENT Maximum number of opened instrumented sockets. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -3193,7 +3193,7 @@ +@@ -3222,7 +3222,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 150 VARIABLE_SCOPE GLOBAL @@ -892,7 +905,7 @@ VARIABLE_COMMENT Maximum number of stage instruments. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 256 -@@ -3207,7 +3207,7 @@ +@@ -3236,7 +3236,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 191 VARIABLE_SCOPE GLOBAL @@ -901,7 +914,7 @@ VARIABLE_COMMENT Maximum number of statement instruments. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 256 -@@ -3221,7 +3221,7 @@ +@@ -3250,7 +3250,7 @@ GLOBAL_VALUE_ORIGIN CONFIG DEFAULT_VALUE -1 VARIABLE_SCOPE GLOBAL @@ -910,7 +923,7 @@ VARIABLE_COMMENT Maximum number of opened instrumented tables. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -3235,7 +3235,7 @@ +@@ -3264,7 +3264,7 @@ GLOBAL_VALUE_ORIGIN CONFIG DEFAULT_VALUE -1 VARIABLE_SCOPE GLOBAL @@ -919,7 +932,7 @@ VARIABLE_COMMENT Maximum number of instrumented tables. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -3249,7 +3249,7 @@ +@@ -3278,7 +3278,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 50 VARIABLE_SCOPE GLOBAL @@ -928,7 +941,7 @@ VARIABLE_COMMENT Maximum number of thread instruments. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 256 -@@ -3263,7 +3263,7 @@ +@@ -3292,7 +3292,7 @@ GLOBAL_VALUE_ORIGIN CONFIG DEFAULT_VALUE -1 VARIABLE_SCOPE GLOBAL @@ -937,7 +950,7 @@ VARIABLE_COMMENT Maximum number of instrumented threads. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -3277,7 +3277,7 @@ +@@ -3306,7 +3306,7 @@ GLOBAL_VALUE_ORIGIN CONFIG DEFAULT_VALUE -1 VARIABLE_SCOPE GLOBAL @@ -946,7 +959,7 @@ VARIABLE_COMMENT Size of session attribute string buffer per thread. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -3291,7 +3291,7 @@ +@@ -3320,7 +3320,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 100 VARIABLE_SCOPE GLOBAL @@ -955,7 +968,7 @@ VARIABLE_COMMENT Maximum number of rows in SETUP_ACTORS. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 1024 -@@ -3305,7 +3305,7 @@ +@@ -3334,7 +3334,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 100 VARIABLE_SCOPE GLOBAL @@ -964,7 +977,7 @@ VARIABLE_COMMENT Maximum number of rows in SETUP_OBJECTS. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 1048576 -@@ -3319,7 +3319,7 @@ +@@ -3348,7 +3348,7 @@ GLOBAL_VALUE_ORIGIN CONFIG DEFAULT_VALUE -1 VARIABLE_SCOPE GLOBAL @@ -973,7 +986,7 @@ VARIABLE_COMMENT Maximum number of instrumented users. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -3389,7 +3389,7 @@ +@@ -3418,7 +3418,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 32768 VARIABLE_SCOPE SESSION @@ -982,7 +995,7 @@ VARIABLE_COMMENT The size of the buffer that is allocated when preloading indexes NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 1073741824 -@@ -3417,7 +3417,7 @@ +@@ -3446,7 +3446,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 15 VARIABLE_SCOPE SESSION @@ -991,7 +1004,7 @@ VARIABLE_COMMENT Number of statements about which profiling information is maintained. If set to 0, no profiles are stored. See SHOW PROFILES. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 100 -@@ -3431,7 +3431,7 @@ +@@ -3460,7 +3460,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 5 VARIABLE_SCOPE SESSION @@ -1000,7 +1013,7 @@ VARIABLE_COMMENT Seconds between sending progress reports to the client for time-consuming statements. Set to 0 to disable progress reporting. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -3515,7 +3515,7 @@ +@@ -3544,7 +3544,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 16384 VARIABLE_SCOPE SESSION @@ -1009,7 +1022,7 @@ VARIABLE_COMMENT Allocation block size for query parsing and execution NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 4294967295 -@@ -3529,7 +3529,7 @@ +@@ -3558,7 +3558,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 1048576 VARIABLE_SCOPE GLOBAL @@ -1018,7 +1031,7 @@ VARIABLE_COMMENT Don't cache results that are bigger than this NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -3543,7 +3543,7 @@ +@@ -3572,7 +3572,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 4096 VARIABLE_SCOPE GLOBAL @@ -1027,7 +1040,7 @@ VARIABLE_COMMENT The minimum size for blocks allocated by the query cache NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -3560,7 +3560,7 @@ +@@ -3589,7 +3589,7 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT The memory allocated to store results from old queries NUMERIC_MIN_VALUE 0 @@ -1036,7 +1049,7 @@ NUMERIC_BLOCK_SIZE 1024 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -3613,7 +3613,7 @@ +@@ -3642,7 +3642,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 24576 VARIABLE_SCOPE SESSION @@ -1045,7 +1058,7 @@ VARIABLE_COMMENT Persistent buffer for query parsing and execution NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 4294967295 -@@ -3627,7 +3627,7 @@ +@@ -3656,7 +3656,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 4096 VARIABLE_SCOPE SESSION @@ -1054,7 +1067,7 @@ VARIABLE_COMMENT Allocation block size for storing ranges during optimization NUMERIC_MIN_VALUE 4096 NUMERIC_MAX_VALUE 4294967295 -@@ -3644,7 +3644,7 @@ +@@ -3673,7 +3673,7 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Maximum speed(KB/s) to read binlog from master (0 = no limit) NUMERIC_MIN_VALUE 0 @@ -1063,7 +1076,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -3655,7 +3655,7 @@ +@@ -3684,7 +3684,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 131072 VARIABLE_SCOPE SESSION @@ -1072,7 +1085,7 @@ VARIABLE_COMMENT Each thread that does a sequential scan allocates a buffer of this size for each table it scans. If you do many sequential scans, you may want to increase this value NUMERIC_MIN_VALUE 8192 NUMERIC_MAX_VALUE 2147483647 -@@ -3683,7 +3683,7 @@ +@@ -3712,7 +3712,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 262144 VARIABLE_SCOPE SESSION @@ -1081,7 +1094,7 @@ VARIABLE_COMMENT When reading rows in sorted order after a sort, the rows are read through this buffer to avoid a disk seeks NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 2147483647 -@@ -3963,10 +3963,10 @@ +@@ -3992,10 +3992,10 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 8388608 VARIABLE_SCOPE SESSION @@ -1094,7 +1107,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -4005,7 +4005,7 @@ +@@ -4034,7 +4034,7 @@ GLOBAL_VALUE_ORIGIN CONFIG DEFAULT_VALUE 1 VARIABLE_SCOPE SESSION @@ -1103,7 +1116,7 @@ VARIABLE_COMMENT Uniquely identifies the server instance in the community of replication partners NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 4294967295 -@@ -4187,7 +4187,7 @@ +@@ -4216,7 +4216,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 0 VARIABLE_SCOPE GLOBAL @@ -1112,7 +1125,7 @@ VARIABLE_COMMENT Maximum number of parallel threads to use on slave for events in a single replication domain. When using multiple domains, this can be used to limit a single domain from grabbing all threads and thus stalling other domains. The default of 0 means to allow a domain to grab as many threads as it wants, up to the value of slave_parallel_threads. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 16383 -@@ -4229,7 +4229,7 @@ +@@ -4258,7 +4258,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 1073741824 VARIABLE_SCOPE GLOBAL @@ -1121,7 +1134,7 @@ VARIABLE_COMMENT The maximum packet length to sent successfully from the master to slave. NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 1073741824 -@@ -4257,7 +4257,7 @@ +@@ -4286,7 +4286,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 131072 VARIABLE_SCOPE GLOBAL @@ -1130,7 +1143,7 @@ VARIABLE_COMMENT Limit on how much memory SQL threads should use per parallel replication thread when reading ahead in the relay log looking for opportunities for parallel replication. Only used when --slave-parallel-threads > 0. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 2147483647 -@@ -4285,7 +4285,7 @@ +@@ -4314,7 +4314,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 0 VARIABLE_SCOPE GLOBAL @@ -1139,7 +1152,7 @@ VARIABLE_COMMENT If non-zero, number of threads to spawn to apply in parallel events on the slave that were group-committed on the master or were logged with GTID in different replication domains. Note that these threads are in addition to the IO and SQL threads, which are always created by a replication slave NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 16383 -@@ -4299,7 +4299,7 @@ +@@ -4328,7 +4328,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 0 VARIABLE_SCOPE GLOBAL @@ -1148,7 +1161,7 @@ VARIABLE_COMMENT Alias for slave_parallel_threads NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 16383 -@@ -4355,7 +4355,7 @@ +@@ -4384,7 +4384,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 10 VARIABLE_SCOPE GLOBAL @@ -1157,7 +1170,7 @@ VARIABLE_COMMENT Number of times the slave SQL thread will retry a transaction in case it failed with a deadlock or elapsed lock wait timeout, before giving up and stopping NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -4383,7 +4383,7 @@ +@@ -4412,7 +4412,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 2 VARIABLE_SCOPE GLOBAL @@ -1166,7 +1179,7 @@ VARIABLE_COMMENT If creating the thread takes longer than this value (in seconds), the Slow_launch_threads counter will be incremented NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 31536000 -@@ -4442,7 +4442,7 @@ +@@ -4471,7 +4471,7 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Each thread that needs to do a sort allocates a buffer of this size NUMERIC_MIN_VALUE 1024 @@ -1175,7 +1188,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -4747,7 +4747,7 @@ +@@ -4776,7 +4776,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 256 VARIABLE_SCOPE GLOBAL @@ -1184,7 +1197,7 @@ VARIABLE_COMMENT The soft upper limit for number of cached stored routines for one connection. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 524288 -@@ -4845,7 +4845,7 @@ +@@ -4874,7 +4874,7 @@ GLOBAL_VALUE_ORIGIN AUTO DEFAULT_VALUE 400 VARIABLE_SCOPE GLOBAL @@ -1193,7 +1206,7 @@ VARIABLE_COMMENT The number of cached table definitions NUMERIC_MIN_VALUE 400 NUMERIC_MAX_VALUE 524288 -@@ -4859,7 +4859,7 @@ +@@ -4888,7 +4888,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 2000 VARIABLE_SCOPE GLOBAL @@ -1202,7 +1215,7 @@ VARIABLE_COMMENT The number of cached open tables NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 1048576 -@@ -4887,7 +4887,7 @@ +@@ -4916,7 +4916,7 @@ GLOBAL_VALUE_ORIGIN AUTO DEFAULT_VALUE 256 VARIABLE_SCOPE GLOBAL @@ -1211,7 +1224,7 @@ VARIABLE_COMMENT How many threads we should keep in a cache for reuse. These are freed after 5 minutes of idle time NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 16384 -@@ -4901,7 +4901,7 @@ +@@ -4930,7 +4930,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 10 VARIABLE_SCOPE GLOBAL @@ -1220,7 +1233,7 @@ VARIABLE_COMMENT Permits the application to give the threads system a hint for the desired number of threads that should be run at the same time.This variable has no effect, and is deprecated. It will be removed in a future release. NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 512 -@@ -5106,15 +5106,15 @@ +@@ -5135,15 +5135,15 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME TMP_DISK_TABLE_SIZE @@ -1240,7 +1253,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -5128,7 +5128,7 @@ +@@ -5157,7 +5157,7 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT If an internal in-memory temporary table exceeds this size, MariaDB will automatically convert it to an on-disk MyISAM or Aria table. Same as tmp_table_size. NUMERIC_MIN_VALUE 1024 @@ -1249,7 +1262,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -5142,7 +5142,7 @@ +@@ -5171,7 +5171,7 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Alias for tmp_memory_table_size. If an internal in-memory temporary table exceeds this size, MariaDB will automatically convert it to an on-disk MyISAM or Aria table. NUMERIC_MIN_VALUE 1024 @@ -1258,7 +1271,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -5153,7 +5153,7 @@ +@@ -5182,7 +5182,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 8192 VARIABLE_SCOPE SESSION @@ -1267,7 +1280,7 @@ VARIABLE_COMMENT Allocation block size for transactions to be stored in binary log NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 134217728 -@@ -5167,7 +5167,7 @@ +@@ -5196,7 +5196,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 4096 VARIABLE_SCOPE SESSION @@ -1276,7 +1289,7 @@ VARIABLE_COMMENT Persistent buffer for transactions to be stored in binary log NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 134217728 -@@ -5265,7 +5265,7 @@ +@@ -5294,7 +5294,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 28800 VARIABLE_SCOPE SESSION @@ -1285,7 +1298,7 @@ VARIABLE_COMMENT The number of seconds the server waits for activity on a connection before closing it NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 31536000 -@@ -5369,7 +5369,7 @@ +@@ -5399,7 +5399,7 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME OPEN_FILES_LIMIT VARIABLE_SCOPE GLOBAL @@ -1294,7 +1307,7 @@ VARIABLE_COMMENT If this is not 0, then mysqld will use this value to reserve file descriptors to use with setrlimit(). If this value is 0 or autoset then mysqld will reserve max_connections*5 or max_connections + table_cache*2 (whichever is larger) number of file descriptors NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -5382,7 +5382,7 @@ +@@ -5412,7 +5412,7 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Sets the internal state of the RAND() generator for replication purposes NUMERIC_MIN_VALUE 0 @@ -1303,7 +1316,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -5392,7 +5392,7 @@ +@@ -5422,7 +5422,7 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Sets the internal state of the RAND() generator for replication purposes NUMERIC_MIN_VALUE 0 @@ -1312,7 +1325,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -5477,7 +5477,7 @@ +@@ -5517,7 +5517,7 @@ VARIABLE_NAME LOG_TC_SIZE GLOBAL_VALUE_ORIGIN AUTO VARIABLE_SCOPE GLOBAL 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 65537aeaa55..5f417b10d52 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result +++ b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result @@ -1550,6 +1550,20 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED +VARIABLE_NAME IN_SUBQUERY_CONVERSION_THRESHOLD +SESSION_VALUE 1000 +GLOBAL_VALUE 1000 +GLOBAL_VALUE_ORIGIN COMPILE-TIME +DEFAULT_VALUE 1000 +VARIABLE_SCOPE SESSION +VARIABLE_TYPE BIGINT UNSIGNED +VARIABLE_COMMENT The minimum number of scalar elements in the value list of IN predicate that triggers its conversion to IN subquery +NUMERIC_MIN_VALUE 0 +NUMERIC_MAX_VALUE 18446744073709551615 +NUMERIC_BLOCK_SIZE 1 +ENUM_VALUE_LIST NULL +READ_ONLY NO +COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME IN_TRANSACTION SESSION_VALUE 0 GLOBAL_VALUE NULL @@ -2117,7 +2131,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 10.000000 VARIABLE_SCOPE SESSION VARIABLE_TYPE DOUBLE -VARIABLE_COMMENT Log all queries that have taken more than long_query_time seconds to execute to file. The argument will be treated as a decimal value with microsecond precision +VARIABLE_COMMENT Log all queries that have taken more than long_query_time seconds to execute to the slow query log file. The argument will be treated as a decimal value with microsecond precision NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 31536000 NUMERIC_BLOCK_SIZE NULL @@ -3204,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/vcol/r/vcol_blocked_sql_funcs.result b/mysql-test/suite/vcol/r/vcol_blocked_sql_funcs.result index 2d5bcfe553d..19e8efb06ad 100644 --- a/mysql-test/suite/vcol/r/vcol_blocked_sql_funcs.result +++ b/mysql-test/suite/vcol/r/vcol_blocked_sql_funcs.result @@ -127,8 +127,8 @@ ERROR HY000: Function or expression 'uuid_short()' cannot be used in the GENERAT create or replace table t1 (a varchar(1024) as (uuid()) PERSISTENT); ERROR HY000: Function or expression 'uuid()' cannot be used in the GENERATED ALWAYS AS clause of `a` # VALUES() -create or replace table t1 (a varchar(1024), b varchar(1024) as (values(a))); -ERROR HY000: Function or expression 'values()' cannot be used in the GENERATED ALWAYS AS clause of `b` +create or replace table t1 (a varchar(1024), b varchar(1024) as (value(a))); +ERROR HY000: Function or expression 'value()' cannot be used in the GENERATED ALWAYS AS clause of `b` # VERSION() create or replace table t1 (a varchar(1024), b varchar(1024) as (version()) PERSISTENT); ERROR HY000: Function or expression 'version()' cannot be used in the GENERATED ALWAYS AS clause of `b` diff --git a/mysql-test/suite/vcol/t/vcol_blocked_sql_funcs_main.inc b/mysql-test/suite/vcol/t/vcol_blocked_sql_funcs_main.inc index 37de02a2b29..52324176694 100644 --- a/mysql-test/suite/vcol/t/vcol_blocked_sql_funcs_main.inc +++ b/mysql-test/suite/vcol/t/vcol_blocked_sql_funcs_main.inc @@ -187,7 +187,7 @@ create or replace table t1 (a varchar(1024) as (uuid()) PERSISTENT); --echo # VALUES() -- error ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED -create or replace table t1 (a varchar(1024), b varchar(1024) as (values(a))); +create or replace table t1 (a varchar(1024), b varchar(1024) as (value(a))); --echo # VERSION() -- error ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED 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/compound.test b/mysql-test/t/compound.test index cabdf96e00e..94a6c18b2f5 100644 --- a/mysql-test/t/compound.test +++ b/mysql-test/t/compound.test @@ -106,7 +106,8 @@ select @a| /**/ while (select count(*) from information_schema.tables where table_schema='test') do select concat('drop table ', table_name) into @a - from information_schema.tables where table_schema='test' limit 1; + from information_schema.tables where table_schema='test' + order by table_name limit 1; select @a as 'executing:'; prepare dt from @a; execute dt; diff --git a/mysql-test/t/create.test b/mysql-test/t/create.test index bd89f220060..a8c4eff7365 100644 --- a/mysql-test/t/create.test +++ b/mysql-test/t/create.test @@ -1017,6 +1017,7 @@ from имÑ_таблицы_в_кодировке_утф8_длиной_больш # database, table, field, key, view select * from имÑ_таблицы_в_кодировке_утф8_длиной_больше_чем_48; +--sorted_result select TABLE_NAME from information_schema.tables where table_schema='test'; 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/default.test b/mysql-test/t/default.test index 7ee3b590a83..44778bc568a 100644 --- a/mysql-test/t/default.test +++ b/mysql-test/t/default.test @@ -180,7 +180,7 @@ CREATE TABLE t1 (a INT DEFAULT 10); INSERT INTO t1 VALUES (11); CREATE VIEW v1 AS SELECT a AS a FROM t1; CREATE VIEW v2 AS SELECT DEFAULT(a) AS a FROM t1; -CREATE VIEW v3 AS SELECT VALUES(a) AS a FROM t1; +CREATE VIEW v3 AS SELECT VALUE(a) AS a FROM t1; SELECT * FROM v1; SELECT * FROM v2; SELECT * FROM v3; @@ -447,7 +447,7 @@ CALL p1; DROP PROCEDURE p1; --error ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED -CREATE TABLE t1 (a INT DEFAULT VALUES(a)); +CREATE TABLE t1 (a INT DEFAULT VALUE(a)); CREATE TABLE t1 (a INT); 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 55461002fd4..73d94d10382 100644 --- a/mysql-test/t/errors.test +++ b/mysql-test/t/errors.test @@ -179,16 +179,16 @@ SELECT UPDATEXML(-73 * -2465717823867977728,@@global.auto_increment_increment,nu CREATE TABLE t1 (a INT); CREATE TABLE t2(a INT PRIMARY KEY, b INT); --error ER_BAD_FIELD_ERROR -SELECT '' AS b FROM t1 GROUP BY VALUES(b); +SELECT '' AS b FROM t1 GROUP BY VALUE(b); --error ER_BAD_FIELD_ERROR -REPLACE t2(b) SELECT '' AS b FROM t1 GROUP BY VALUES(b); +REPLACE t2(b) SELECT '' AS b FROM t1 GROUP BY VALUE(b); --error ER_BAD_FIELD_ERROR -UPDATE t2 SET a=(SELECT '' AS b FROM t1 GROUP BY VALUES(b)); +UPDATE t2 SET a=(SELECT '' AS b FROM t1 GROUP BY VALUE(b)); --error ER_BAD_FIELD_ERROR INSERT INTO t2 VALUES (1,0) ON DUPLICATE KEY UPDATE - b=(SELECT '' AS b FROM t1 GROUP BY VALUES(b)); + b=(SELECT '' AS b FROM t1 GROUP BY VALUE(b)); INSERT INTO t2(a,b) VALUES (1,0) ON DUPLICATE KEY UPDATE - b=(SELECT VALUES(a)+2 FROM t1); + b=(SELECT VALUE(a)+2 FROM t1); DROP TABLE t1, t2; --echo # @@ -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/except.test b/mysql-test/t/except.test index e13137701a9..f88d9b29e35 100644 --- a/mysql-test/t/except.test +++ b/mysql-test/t/except.test @@ -81,3 +81,17 @@ create table t3 (select a,b,b1 from t1) except (select c,d,d1 from t2); show create table t3; drop tables t1,t2,t3; + +--echo # +--echo # MDEV-13723: Server crashes in ha_heap::find_unique_row or +--echo # Assertion `0' failed in st_select_lex_unit::optimize with INTERSECT +--echo # +CREATE TABLE t (i INT); +INSERT INTO t VALUES (1),(2); + +SELECT * FROM t WHERE i != ANY ( SELECT 3 EXCEPT SELECT 3 ); + +drop table t; + + +--echo # End of 10.3 tests diff --git a/mysql-test/t/func_group_innodb.test b/mysql-test/t/func_group_innodb.test index c62d3d08496..1d175f85ed9 100644 --- a/mysql-test/t/func_group_innodb.test +++ b/mysql-test/t/func_group_innodb.test @@ -168,7 +168,7 @@ set storage_engine=innodb; create table y select 1 b; select 1 from y group by b; -select 1 from y group by values(b); +select 1 from y group by value(b); drop table y; SET storage_engine=@old_engine; diff --git a/mysql-test/t/func_misc.test b/mysql-test/t/func_misc.test index ac983048129..91ee449a7ff 100644 --- a/mysql-test/t/func_misc.test +++ b/mysql-test/t/func_misc.test @@ -316,7 +316,7 @@ CREATE TABLE t1 (a INT, b INT) ENGINE=MyISAM; INSERT INTO t1 VALUES (1,10); CREATE VIEW v1 AS SELECT * FROM t1; -EXPLAIN EXTENDED SELECT VALUES(b) FROM v1; +EXPLAIN EXTENDED SELECT VALUE(b) FROM v1; drop view v1; drop table t1; @@ -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/gis.test b/mysql-test/t/gis.test index 94e56774bf4..ca806778f0e 100644 --- a/mysql-test/t/gis.test +++ b/mysql-test/t/gis.test @@ -1491,6 +1491,7 @@ SHOW CREATE TABLE information_schema.spatial_ref_sys; create table t1(g GEOMETRY, pt POINT); create table t2(g LINESTRING, pl POLYGON); +--sorted_result select * from information_schema.geometry_columns where f_table_schema='test'; drop table t1, t2; diff --git a/mysql-test/t/group_by_null.test b/mysql-test/t/group_by_null.test index b3fa2a003ec..93e965671dd 100644 --- a/mysql-test/t/group_by_null.test +++ b/mysql-test/t/group_by_null.test @@ -3,5 +3,5 @@ # create table t1 (a int); insert into t1 values (1),(2); -select max('foo') from t1 group by values(a), extractvalue('bar','qux') order by "v"; +select max('foo') from t1 group by value(a), extractvalue('bar','qux') order by "v"; drop table t1; 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/information_schema.test b/mysql-test/t/information_schema.test index 417390dcafe..9c306de0e3f 100644 --- a/mysql-test/t/information_schema.test +++ b/mysql-test/t/information_schema.test @@ -32,7 +32,9 @@ create user mysqltest_3@localhost; create user mysqltest_3; +--sorted_result select * from information_schema.SCHEMATA where schema_name > 'm'; +--sorted_result select schema_name from information_schema.schemata; show databases like 't%'; show databases; @@ -71,6 +73,7 @@ select c, v2.table_name from v1 right join information_schema.TABLES v2 on (v1.c=v2.table_name) where v1.c like "t%"; +--sorted_result select table_name from information_schema.TABLES where table_schema = "mysqltest" and table_name like "t%"; @@ -206,6 +209,7 @@ show create procedure sel2; # Test for views # create view v0 (c) as select schema_name from information_schema.schemata; +--sorted_result select * from v0; --replace_column 3 # explain select * from v0; @@ -222,6 +226,7 @@ create view v4 (c) as select COLLATION_NAME from information_schema.collations where COLLATION_NAME like "latin1%"; select * from v4; show keys from v4; +--sorted_result select * from information_schema.views where TABLE_NAME like "v%"; drop view v0, v1, v2, v3, v4; @@ -273,6 +278,7 @@ create table t1(a int); create view v1 (c) as select a from t1 with check option; create view v2 (c) as select a from t1 WITH LOCAL CHECK OPTION; create view v3 (c) as select a from t1 WITH CASCADED CHECK OPTION; +--sorted_result select * from information_schema.views; grant select (a) on test.t1 to joe@localhost with grant option; select * from INFORMATION_SCHEMA.COLUMN_PRIVILEGES; @@ -316,6 +322,7 @@ drop table t1; create table t1 (s1 int); insert into t1 values (0),(9),(0); +--sorted_result select s1 from t1 where s1 in (select version from information_schema.tables) union select version from information_schema.tables; @@ -408,12 +415,18 @@ create view v3 (c) as select sub1(1); create table t4(f1 int, KEY f1_key (f1)); drop table t1; drop function sub1; +--sorted_result select table_name from information_schema.views where table_schema='test'; +--sorted_result select table_name from information_schema.views where table_schema='test'; select column_name from information_schema.columns -where table_schema='test'; +where table_schema='test' and table_name='t4'; +select column_name from information_schema.columns +where table_schema='test' and table_name='v2'; +select column_name from information_schema.columns +where table_schema='test' and table_name='v3'; select index_name from information_schema.statistics where table_schema='test'; select constraint_name from information_schema.table_constraints where table_schema='test'; @@ -503,9 +516,11 @@ drop table t_crashme; # select table_schema,table_name, column_name from information_schema.columns -where data_type = 'longtext' and table_schema != 'performance_schema'; +where data_type = 'longtext' and table_schema != 'performance_schema' +order by binary table_name, ordinal_position; select table_name, column_name, data_type from information_schema.columns -where data_type = 'datetime' and table_name not like 'innodb_%'; +where data_type = 'datetime' and table_name not like 'innodb_%' +order by binary table_name, ordinal_position; # # Bug#8164 subquery with INFORMATION_SCHEMA.COLUMNS, 100 % CPU @@ -870,7 +885,7 @@ connect (con16681,localhost,mysqltest_1,,test); connection con16681; select * from information_schema.views -where table_name='v1' or table_name='v2'; +where table_name='v1' or table_name='v2' order by table_name; connection default; disconnect con16681; drop view v1, v2; @@ -884,7 +899,7 @@ set @a:= '.'; create table t1(f1 char(5)); create table t2(f1 char(5)); select concat(@a, table_name), @a, table_name -from information_schema.tables where table_schema = 'test'; +from information_schema.tables where table_schema = 'test' order by table_name; drop table t1,t2; @@ -996,7 +1011,8 @@ create table t2 (f1 int(11), f2 int(11)); select table_name from information_schema.tables where table_schema = 'test' and table_name not in (select table_name from information_schema.columns - where table_schema = 'test' and column_name = 'f3'); + where table_schema = 'test' and column_name = 'f3') +order by table_name; drop table t1,t2; @@ -1007,7 +1023,7 @@ create table t1(f1 int); create view v1 as select f1+1 as a from t1; create table t2 (f1 int, f2 int); create view v2 as select f1+1 as a, f2 as b from t2; -select table_name, is_updatable from information_schema.views; +select table_name, is_updatable from information_schema.views order by table_name; # # Note: we can perform 'delete' for non updatable view. # @@ -1507,9 +1523,9 @@ let $wait_condition= --source include/wait_condition.inc --echo # These statements should not be blocked by pending lock requests select table_name, column_name, data_type from information_schema.columns - where table_schema = 'test' and table_name in ('t1', 't2'); + where table_schema = 'test' and table_name in ('t1', 't2') order by table_name, column_name; select table_name, auto_increment from information_schema.tables - where table_schema = 'test' and table_name in ('t1', 't2'); + where table_schema = 'test' and table_name in ('t1', 't2') order by table_name; connection con3726_1; unlock tables; connection con3726_2; @@ -1671,14 +1687,14 @@ let $wait_condition= --echo # Issue query to I_S which will open 't0' and get --echo # blocked on 't1' because of RENAME. ---send select table_name, auto_increment from information_schema.tables where table_schema='mysqltest' +--send select table_name, auto_increment from information_schema.tables where table_schema='mysqltest' and table_name='t0' union select table_name, auto_increment from information_schema.tables where table_schema='mysqltest' and table_name<>'t0' order by table_name connect (con12828477_3, localhost, root,,mysqltest); --echo # Wait while the above SELECT is blocked. let $wait_condition= select count(*) = 1 from information_schema.processlist where state = "Waiting for table metadata lock" and - info = "select table_name, auto_increment from information_schema.tables where table_schema='mysqltest'"; + info like '%t0%union%t0%'; --source include/wait_condition.inc --echo # diff --git a/mysql-test/t/information_schema2.test b/mysql-test/t/information_schema2.test index 9810c5a0aae..d2fa3da2b5f 100644 --- a/mysql-test/t/information_schema2.test +++ b/mysql-test/t/information_schema2.test @@ -15,5 +15,5 @@ create table t2 (x int); create table t3 (x int); create table t4 AS select table_name from information_schema.TABLES where table_schema = database() and table_type = 'BASE TABLE' ; delete from t4 where table_name not in (select table_name from information_schema.TABLES where table_schema = database() and table_type = 'BASE TABLE'); -select * from t4; +select * from t4 order by table_name; drop table t1, t2, t3, t4; diff --git a/mysql-test/t/information_schema_db.test b/mysql-test/t/information_schema_db.test index 70ad9b5b920..94908570969 100644 --- a/mysql-test/t/information_schema_db.test +++ b/mysql-test/t/information_schema_db.test @@ -100,10 +100,10 @@ create function f2 () returns int return (select max(i) from t2); create view v2 as select f2(); drop table t2; select table_name, table_type, table_comment from information_schema.tables -where table_schema='test'; +where table_schema='test' order by table_name; drop table t1; select table_name, table_type, table_comment from information_schema.tables -where table_schema='test'; +where table_schema='test' order by table_name; drop function f1; drop function f2; drop view v1, v2; diff --git a/mysql-test/t/information_schema_inno.test b/mysql-test/t/information_schema_inno.test index 9a9658e9027..3cdbb8111d9 100644 --- a/mysql-test/t/information_schema_inno.test +++ b/mysql-test/t/information_schema_inno.test @@ -16,8 +16,10 @@ FOREIGN KEY (t1_id) REFERENCES t1(id) ON UPDATE CASCADE) ENGINE=INNODB; CREATE TABLE t3 (id INT PRIMARY KEY, t2_id INT, INDEX par_ind (t2_id), FOREIGN KEY (id, t2_id) REFERENCES t2(t1_id, id) ON DELETE CASCADE) ENGINE=INNODB; +--sorted_result select * from information_schema.TABLE_CONSTRAINTS where TABLE_SCHEMA= "test"; +--sorted_result select * from information_schema.KEY_COLUMN_USAGE where TABLE_SCHEMA= "test"; @@ -45,6 +47,7 @@ CREATE TABLE t5(b1 INT, b2 INT, INDEX (b1, b2), FOREIGN KEY (b1, b2) REFERENCES t4(b1, b2) ON UPDATE RESTRICT ON DELETE CASCADE) ENGINE=INNODB; +--sorted_result select a.CONSTRAINT_SCHEMA, b.TABLE_NAME, CONSTRAINT_TYPE, b.CONSTRAINT_NAME, UNIQUE_CONSTRAINT_SCHEMA, UNIQUE_CONSTRAINT_NAME, MATCH_OPTION, UPDATE_RULE, DELETE_RULE, b.REFERENCED_TABLE_NAME @@ -74,7 +77,8 @@ create table `t-1` ( use test; select referenced_table_schema, referenced_table_name from information_schema.key_column_usage -where constraint_schema = 'db-1'; +where constraint_schema = 'db-1' +order by referenced_table_schema, referenced_table_name; drop database `db-1`; # diff --git a/mysql-test/t/information_schema_part.test b/mysql-test/t/information_schema_part.test index ea88f364c07..62fba4f53d8 100644 --- a/mysql-test/t/information_schema_part.test +++ b/mysql-test/t/information_schema_part.test @@ -63,7 +63,7 @@ subpartition by key (a) subpartition x22 tablespace t2) ); --replace_column 16 # 19 # 20 # -select * from information_schema.partitions where table_schema="test"; +select * from information_schema.partitions where table_schema="test" order by table_name, partition_name; drop table t1,t2; create table t1 ( diff --git a/mysql-test/t/insert_update.test b/mysql-test/t/insert_update.test index 7234973eeb8..06e16be84d7 100644 --- a/mysql-test/t/insert_update.test +++ b/mysql-test/t/insert_update.test @@ -22,9 +22,9 @@ SELECT * FROM t1; INSERT t1 SET a=5 ON DUPLICATE KEY UPDATE b=0; SELECT * FROM t1; INSERT t1 VALUES (2,1,11), (7,4,40) ON DUPLICATE KEY UPDATE c=c+VALUES(a); -SELECT *, VALUES(a) FROM t1; -explain extended SELECT *, VALUES(a) FROM t1; -explain extended select * from t1 where values(a); +SELECT *, VALUE(a) FROM t1; +explain extended SELECT *, VALUE(a) FROM t1; +explain extended select * from t1 where value(a); DROP TABLE t1; # @@ -79,7 +79,7 @@ SELECT * FROM t1; --error ER_NON_UNIQ_ERROR INSERT t1 SELECT a,b,c FROM t2 WHERE d=2 ON DUPLICATE KEY UPDATE c=c+VALUES(a); INSERT t1 SELECT a,b,c FROM t2 WHERE d=2 ON DUPLICATE KEY UPDATE c=t1.c+VALUES(t1.a); -SELECT *, VALUES(a) FROM t1; +SELECT *, VALUE(a) FROM t1; DROP TABLE t1; DROP TABLE t2; diff --git a/mysql-test/t/intersect.test b/mysql-test/t/intersect.test index 6028b2fa498..99a54606291 100644 --- a/mysql-test/t/intersect.test +++ b/mysql-test/t/intersect.test @@ -190,3 +190,4 @@ show create view v1; drop view v1; drop tables t1,t2,t3; +--echo # End of 10.3 tests diff --git a/mysql-test/t/mysql_upgrade_noengine.test b/mysql-test/t/mysql_upgrade_noengine.test index cfc3a1dc406..1d65e7ffa1c 100644 --- a/mysql-test/t/mysql_upgrade_noengine.test +++ b/mysql-test/t/mysql_upgrade_noengine.test @@ -19,16 +19,19 @@ install soname 'ha_archive'; vertical_results; create table t1 (a int) engine=blackhole; create table t2 (a int) engine=archive; -select table_catalog, table_schema, table_name, table_type, engine, row_format, table_rows, data_length, table_comment from information_schema.tables where table_schema='test'; +select table_catalog, table_schema, table_name, table_type, engine, row_format, table_rows, data_length, table_comment from information_schema.tables where table_schema='test' and table_name='t1'; +select table_catalog, table_schema, table_name, table_type, engine, row_format, table_rows, data_length, table_comment from information_schema.tables where table_schema='test' and table_name='t2'; flush tables; uninstall plugin blackhole; uninstall plugin archive; -select table_catalog, table_schema, table_name, table_type, engine, row_format, table_rows, data_length, table_comment from information_schema.tables where table_schema='test'; +select table_catalog, table_schema, table_name, table_type, engine, row_format, table_rows, data_length, table_comment from information_schema.tables where table_schema='test' and table_name='t1'; +select table_catalog, table_schema, table_name, table_type, engine, row_format, table_rows, data_length, table_comment from information_schema.tables where table_schema='test' and table_name='t2'; # upgrade from 10.1 - engines aren't enabled exec $MYSQL_UPGRADE 2>&1; -select table_catalog, table_schema, table_name, table_type, engine, row_format, table_rows, data_length, table_comment from information_schema.tables where table_schema='test'; +select table_catalog, table_schema, table_name, table_type, engine, row_format, table_rows, data_length, table_comment from information_schema.tables where table_schema='test' and table_name='t1'; +select table_catalog, table_schema, table_name, table_type, engine, row_format, table_rows, data_length, table_comment from information_schema.tables where table_schema='test' and table_name='t2'; # pretend it's an upgrade from 10.0 alter table mysql.user drop column default_role, drop column max_statement_time; @@ -41,14 +44,16 @@ EOF # still upgrade from 10.1 exec $MYSQL_UPGRADE 2>&1; -select table_catalog, table_schema, table_name, table_type, engine, row_format, table_rows, data_length, table_comment from information_schema.tables where table_schema='test'; +select table_catalog, table_schema, table_name, table_type, engine, row_format, table_rows, data_length, table_comment from information_schema.tables where table_schema='test' and table_name='t1'; +select table_catalog, table_schema, table_name, table_type, engine, row_format, table_rows, data_length, table_comment from information_schema.tables where table_schema='test' and table_name='t2'; alter table mysql.user drop column default_role, drop column max_statement_time; remove_file $datadir/mysql_upgrade_info; # upgrade from 10.0 - engines are enabled exec $MYSQL_UPGRADE 2>&1; -select table_catalog, table_schema, table_name, table_type, engine, row_format, table_rows, data_length, table_comment from information_schema.tables where table_schema='test'; +select table_catalog, table_schema, table_name, table_type, engine, row_format, table_rows, data_length, table_comment from information_schema.tables where table_schema='test' and table_name='t1'; +select table_catalog, table_schema, table_name, table_type, engine, row_format, table_rows, data_length, table_comment from information_schema.tables where table_schema='test' and table_name='t2'; drop table t1, t2; diff --git a/mysql-test/t/opt_tvc.test b/mysql-test/t/opt_tvc.test new file mode 100644 index 00000000000..2e00308aa78 --- /dev/null +++ b/mysql-test/t/opt_tvc.test @@ -0,0 +1,315 @@ +create table t1 (a int, b int); + +insert into t1 +values (1,2), (4,6), (9,7), + (1,1), (2,5), (7,8); + +create table t2 (a int, b int, c int); + +insert into t2 +values (1,2,3), (5,1,2), (4,3,7), + (8,9,0), (10,7,1), (5,5,1); + +create table t3 (a int, b varchar(16), index idx(a)); +insert into t3 values + (1, "abc"), (3, "egh"), (8, "axxx"), (10, "abc"), + (2, "ccw"), (8, "wqqe"), (7, "au"), (9, "waa"), + (3, "rass"), (9, "ert"), (9, "lok"), (8, "aww"), + (1, "todd"), (3, "rew"), (8, "aww"), (3, "sw"), + (11, "llk"), (7, "rbw"), (1, "sm"), (2, "jyp"), + (4, "yq"), (5, "pled"), (12, "ligin"), (12, "toww"), + (6, "mxm"), (15, "wanone"), (9, "sunqq"), (2, "abe"); + +--echo # optimization is not used + +let $query= select * from t1 where a in (1,2); +eval $query; +eval explain extended $query; + +--echo # set minimum number of values in VALUEs list when optimization works to 2 + +set @@in_subquery_conversion_threshold= 2; + +--echo # single IN-predicate in WHERE-part + +let $query= select * from t1 where a in (1,2); + +let $optimized_query= +select * from t1 +where a in + ( + select * + from (values (1),(2)) as tvc_0 + ); + +eval $query; +eval $optimized_query; +eval explain extended $query; +eval explain extended $optimized_query; + +--echo # AND-condition with IN-predicates in WHERE-part + +let $query= +select * from t1 +where a in (1,2) and + b in (1,5); + +let $optimized_query= +select * from t1 +where a in +( + select * + from (values (1),(2)) as tvc_0 +) +and b in +( + select * + from (values (1),(5)) as tvc_1 +); + +eval $query; +eval $optimized_query; +eval explain extended $query; +eval explain extended $optimized_query; + +--echo # subquery with IN-predicate + +let $query= +select * from t1 +where a in +( + select a + from t2 where b in (3,4) +); + +let $optimized_query= +select * from t1 +where a in +( + select a from t2 + where b in + ( + select * + from (values (3),(4)) as tvc_0 + ) +); + +eval $query; +eval $optimized_query; +eval explain extended $query; +eval explain extended $optimized_query; + +--echo # derived table with IN-predicate + +let $query= +select * from +( + select * + from t1 + where a in (1,2) +) as dr_table; + +let $optimized_query= +select * from +( + select * + from t1 + where a in + ( + select * + from (values (1),(2)) + as tvc_0 + ) +) as dr_table; + +eval $query; +eval $optimized_query; +eval explain extended $query; +eval explain extended $optimized_query; + +--echo # non-recursive CTE with IN-predicate + +let $cte_query= +with tvc_0 as +( + select * + from t1 + where a in (1,2) +) +select * from tvc_0; + +eval $cte_query; +eval $optimized_query; +eval explain extended $cte_query; +eval explain extended $optimized_query; + +--echo # VIEW with IN-predicate + +create view v1 as + select * + from t1 + where a in (1,2); + +create view v2 as + select * + from t1 + where a in + ( + select * + from (values (1),(2)) + as tvc_0 + ) +; + +let $query= select * from v1; +let $optimized_query= select * from v2; + +eval $query; +eval $optimized_query; +eval explain extended $query; +eval explain extended $optimized_query; + +drop view v1,v2; + +--echo # subselect defined by derived table with IN-predicate + +let $query= +select * from t1 +where a in +( + select 1 + from + ( + select * + from t1 + where a in (1,2) + ) + as dr_table +); + +let $optimized_query= +select * from t1 +where a in +( + select 1 + from + ( + select * + from t1 + where a in + ( + select * + from (values (1),(2)) + as tvc_0 + ) + ) + as dr_table +); + +eval $query; +eval $optimized_query; +eval explain extended $query; +eval explain extended $optimized_query; + +--echo # derived table with IN-predicate and group by + +let $query= +select * from +( + select max(a),b + from t1 + where b in (3,5) + group by b +) as dr_table; + +let $optimized_query= +select * from +( + select max(a),b + from t1 + where b in + ( + select * + from (values (3),(5)) + as tvc_0 + ) + group by b +) as dr_table; + +eval $query; +eval $optimized_query; +eval explain extended $query; +eval explain extended $optimized_query; + +--echo # prepare statement + +prepare stmt from "select * from t1 where a in (1,2)"; +execute stmt; +execute stmt; +deallocate prepare stmt; + +--echo # use inside out access from tvc rows + +let $query= select * from t3 where a in (1,4,10); +set @@in_subquery_conversion_threshold= default; +eval $query; +eval explain extended $query; +set @@in_subquery_conversion_threshold= 2; +eval $query; +eval explain extended $query; + +--echo # use vectors in IN predeicate + +set @@in_subquery_conversion_threshold= 4; + +let $query= +select * from t1 where (a,b) in ((1,2),(3,4)); + +eval $query; +eval explain extended $query; +set @@in_subquery_conversion_threshold= 2; + +--echo # trasformation works for the one IN predicate and doesn't work for the other + +set @@in_subquery_conversion_threshold= 5; + +let $query= +select * from t2 +where (a,b) in ((1,2),(8,9)) and + (a,c) in ((1,3),(8,0),(5,1)); + +eval $query; +eval explain extended $query; +set @@in_subquery_conversion_threshold= 2; + +--echo # +--echo # mdev-14281: conversion of NOT IN predicate into subquery predicate +--echo # + +let $query= +select * from t1 +where (a,b) not in ((1,2),(8,9), (5,1)); +let $optimized_query= +select * from t1 +where (a,b) not in (select * from (values (1,2),(8,9), (5,1)) as tvc_0); + +eval $query; +eval $optimized_query; +eval explain extended $query; +eval explain extended $optimized_query; + +let $query= +select * from t1 +where b < 7 and (a,b) not in ((1,2),(8,9), (5,1)); +eval $query; +eval explain extended $query; + +let $query= +select * from t2 +where (a,c) not in ((1,2),(8,9), (5,1)); +eval $query; +eval explain extended $query; + +drop table t1, t2, t3; + +set @@in_subquery_conversion_threshold= default; diff --git a/mysql-test/t/partition_exchange.test b/mysql-test/t/partition_exchange.test index e538bee16cd..8dc40da0caa 100644 --- a/mysql-test/t/partition_exchange.test +++ b/mysql-test/t/partition_exchange.test @@ -29,14 +29,16 @@ SHOW CREATE TABLE t2; SELECT TABLE_NAME, TABLE_TYPE, ENGINE, ROW_FORMAT, CREATE_OPTIONS FROM INFORMATION_SCHEMA.TABLES -WHERE TABLE_SCHEMA = 'test' AND TABLE_NAME IN ('t1', 't2'); +WHERE TABLE_SCHEMA = 'test' AND TABLE_NAME IN ('t1', 't2') +ORDER BY TABLE_NAME; ALTER TABLE t1 EXCHANGE PARTITION p1 WITH TABLE t2; SHOW CREATE TABLE t1; SHOW CREATE TABLE t2; SELECT TABLE_NAME, TABLE_TYPE, ENGINE, ROW_FORMAT, CREATE_OPTIONS FROM INFORMATION_SCHEMA.TABLES -WHERE TABLE_SCHEMA = 'test' AND TABLE_NAME IN ('t1', 't2'); +WHERE TABLE_SCHEMA = 'test' AND TABLE_NAME IN ('t1', 't2') +ORDER BY TABLE_NAME; DROP TABLE t2; @@ -53,7 +55,8 @@ SHOW CREATE TABLE t1; SHOW CREATE TABLE t2; SELECT TABLE_NAME, TABLE_TYPE, ENGINE, ROW_FORMAT, CREATE_OPTIONS FROM INFORMATION_SCHEMA.TABLES -WHERE TABLE_SCHEMA = 'test' AND TABLE_NAME IN ('t1', 't2'); +WHERE TABLE_SCHEMA = 'test' AND TABLE_NAME IN ('t1', 't2') +ORDER BY TABLE_NAME; --echo # Only the non partitioned table have ROW_FORMAT set. DROP TABLE t1, t2; @@ -77,7 +80,8 @@ SHOW CREATE TABLE t1; SHOW CREATE TABLE t2; SELECT TABLE_NAME, TABLE_TYPE, ENGINE, ROW_FORMAT, CREATE_OPTIONS FROM INFORMATION_SCHEMA.TABLES -WHERE TABLE_SCHEMA = 'test' AND TABLE_NAME IN ('t1', 't2'); +WHERE TABLE_SCHEMA = 'test' AND TABLE_NAME IN ('t1', 't2') +ORDER BY TABLE_NAME; --echo # No table have ROW_FORMAT set. DROP TABLE t1, t2; @@ -101,7 +105,8 @@ SHOW CREATE TABLE t1; SHOW CREATE TABLE t2; SELECT TABLE_NAME, TABLE_TYPE, ENGINE, ROW_FORMAT, CREATE_OPTIONS FROM INFORMATION_SCHEMA.TABLES -WHERE TABLE_SCHEMA = 'test' AND TABLE_NAME IN ('t1', 't2'); +WHERE TABLE_SCHEMA = 'test' AND TABLE_NAME IN ('t1', 't2') +ORDER BY TABLE_NAME; --echo # Not same ROW_FORMAT as default (but same). DROP TABLE t1, t2; @@ -125,7 +130,8 @@ SHOW CREATE TABLE t1; SHOW CREATE TABLE t2; SELECT TABLE_NAME, TABLE_TYPE, ENGINE, ROW_FORMAT, CREATE_OPTIONS FROM INFORMATION_SCHEMA.TABLES -WHERE TABLE_SCHEMA = 'test' AND TABLE_NAME IN ('t1', 't2'); +WHERE TABLE_SCHEMA = 'test' AND TABLE_NAME IN ('t1', 't2') +ORDER BY TABLE_NAME; --echo # Not same ROW_FORMAT as default (tables differs). DROP TABLE t1, t2; @@ -150,7 +156,8 @@ SHOW CREATE TABLE t1; SHOW CREATE TABLE t2; SELECT TABLE_NAME, TABLE_TYPE, ENGINE, ROW_FORMAT, CREATE_OPTIONS FROM INFORMATION_SCHEMA.TABLES -WHERE TABLE_SCHEMA = 'test' AND TABLE_NAME IN ('t1', 't2'); +WHERE TABLE_SCHEMA = 'test' AND TABLE_NAME IN ('t1', 't2') +ORDER BY TABLE_NAME; --echo # Different than default (forced ROW_TYPE) DROP TABLE t1, t2; @@ -175,7 +182,8 @@ SHOW CREATE TABLE t1; SHOW CREATE TABLE t2; SELECT TABLE_NAME, TABLE_TYPE, ENGINE, ROW_FORMAT, CREATE_OPTIONS FROM INFORMATION_SCHEMA.TABLES -WHERE TABLE_SCHEMA = 'test' AND TABLE_NAME IN ('t1', 't2'); +WHERE TABLE_SCHEMA = 'test' AND TABLE_NAME IN ('t1', 't2') +ORDER BY TABLE_NAME; --horizontal_results DROP TABLE t1, t2; diff --git a/mysql-test/t/ps.test b/mysql-test/t/ps.test index b61c4cf2568..ec55b9c9d21 100644 --- a/mysql-test/t/ps.test +++ b/mysql-test/t/ps.test @@ -4283,7 +4283,7 @@ EXECUTE IMMEDIATE MAX('SELECT 1 AS c'); EXECUTE IMMEDIATE DEFAULT(a); --error ER_BAD_FIELD_ERROR -EXECUTE IMMEDIATE VALUES(a); +EXECUTE IMMEDIATE VALUE(a); CREATE FUNCTION f1() RETURNS VARCHAR(64) RETURN 't1'; diff --git a/mysql-test/t/range.test b/mysql-test/t/range.test index ab951809b7a..ca6ac61d27a 100644 --- a/mysql-test/t/range.test +++ b/mysql-test/t/range.test @@ -3,6 +3,8 @@ # --source include/have_innodb.inc +set in_subquery_conversion_threshold=10000; + --disable_warnings drop table if exists t1, t2, t3, t10, t100; --enable_warnings @@ -2049,3 +2051,4 @@ drop table t1,t2,t3; --echo # End of 10.2 tests --echo # +set in_subquery_conversion_threshold=default; 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/sp.test b/mysql-test/t/sp.test index 94d779de203..3b615d29166 100644 --- a/mysql-test/t/sp.test +++ b/mysql-test/t/sp.test @@ -5299,7 +5299,7 @@ insert into t3 (id, county) values (1, 'York')| create procedure bug15441(c varchar(25)) begin - update t3 set id=2, county=values(c); + update t3 set id=2, county=value(c); end| --error ER_BAD_FIELD_ERROR call bug15441('county')| @@ -5326,7 +5326,7 @@ begin on duplicate key update county= values(county); select * from t3; - update t3 set id=2, county=values(id); + update t3 set id=2, county=value(id); select * from t3; end| call bug15441('Yale')| @@ -5722,8 +5722,10 @@ create procedure bug18344_2() begin end| use test| +--sorted_result select schema_name from information_schema.schemata where schema_name like 'bug18344%'| +--sorted_result select routine_name,routine_schema from information_schema.routines where routine_schema like 'bug18344%'| diff --git a/mysql-test/t/status.test b/mysql-test/t/status.test index 7ab32241bcb..bff45fca583 100644 --- a/mysql-test/t/status.test +++ b/mysql-test/t/status.test @@ -387,6 +387,39 @@ drop table t1; # End of 5.3 tests +--echo # +--echo # MDEV-11153 - Introduce status variables for table cache monitoring and +--echo # tuning +--echo # +SET @old_table_open_cache= @@table_open_cache; +SET @@global.table_open_cache=10; +FLUSH TABLES; +FLUSH STATUS; +SHOW STATUS LIKE 'Table_open_cache%'; +disable_query_log; +let $i= `SELECT @@table_open_cache + 5`; +while ($i) +{ + eval CREATE TABLE t$i(a INT); + eval DELETE FROM t$i; + eval DELETE FROM t$i; + eval DELETE FROM t$i; + dec $i; +} +enable_query_log; +SHOW STATUS LIKE 'Table_open_cache%'; +FLUSH TABLES; +FLUSH STATUS; +disable_query_log; +let $i= `SELECT @@table_open_cache + 5`; +while ($i) +{ + eval DROP TABLE t$i; + dec $i; +} +enable_query_log; +SET @@global.table_open_cache= @old_table_open_cache; + # Restore global concurrent_insert value. Keep in the end of the test file. --connection default set @@global.concurrent_insert= @old_concurrent_insert; 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/subselect_sj.test b/mysql-test/t/subselect_sj.test index f90f1e2e927..6fdccee339d 100644 --- a/mysql-test/t/subselect_sj.test +++ b/mysql-test/t/subselect_sj.test @@ -2490,6 +2490,7 @@ drop table t1,t2; --echo # CREATE TABLE t1 (db VARCHAR(64) DEFAULT NULL); INSERT INTO t1 VALUES ('mysql'),('information_schema'); +--sorted_result SELECT * FROM t1 WHERE db IN (SELECT `SCHEMA_NAME` FROM information_schema.SCHEMATA); DROP TABLE t1; diff --git a/mysql-test/t/table_value_constr.test b/mysql-test/t/table_value_constr.test new file mode 100644 index 00000000000..578f8943fbb --- /dev/null +++ b/mysql-test/t/table_value_constr.test @@ -0,0 +1,1046 @@ +create table t1 (a int, b int); + +insert into t1 values (1,2),(4,6),(9,7), + (1,1),(2,5),(7,8); + +--echo # just VALUES + +values (1,2); + +values (1,2), (3,4), (5.6,0); + +values ("abc", "def"); + +--echo # UNION that uses VALUES structure(s) + +select 1,2 +union +values (1,2); + +values (1,2) +union +select 1,2; + +select 1,2 +union +values (1,2),(3,4),(5,6),(7,8); + +select 3,7 +union +values (1,2),(3,4),(5,6); + +select 3,7,4 +union +values (1,2,5),(4,5,6); + +select 1,2 +union +values (1,7),(3,6.5); + +select 1,2 +union +values (1,2.0),(3,6); + +select 1.8,2 +union +values (1,2),(3,6); + +values (1,2.4),(3,6) +union +select 2.8,9; + +values (1,2),(3,4),(5,6),(7,8) +union +select 5,6; + +select "ab","cdf" +union +values ("al","zl"),("we","q"); + +values ("ab", "cdf") +union +select "ab","cdf"; + +values (1,2) +union +values (1,2),(5,6); + +values (1,2) +union +values (3,4),(5,6); + +values (1,2) +union +values (1,2) +union values (4,5); + +--echo # UNION ALL that uses VALUES structure + +values (1,2),(3,4) +union all +select 5,6; + +values (1,2),(3,4) +union all +select 1,2; + +select 5,6 +union all +values (1,2),(3,4); + +select 1,2 +union all +values (1,2),(3,4); + +values (1,2) +union all +values (1,2),(5,6); + +values (1,2) +union all +values (3,4),(5,6); + +values (1,2) +union all +values (1,2) +union all +values (4,5); + +values (1,2) +union all +values (1,2) +union values (1,2); + +values (1,2) +union +values (1,2) +union all +values (1,2); + +--echo # EXCEPT that uses VALUES structure(s) + +select 1,2 +except +values (3,4),(5,6); + +select 1,2 +except +values (1,2),(3,4); + +values (1,2),(3,4) +except +select 5,6; + +values (1,2),(3,4) +except +select 1,2; + +values (1,2),(3,4) +except +values (5,6); + +values (1,2),(3,4) +except +values (1,2); + +--echo # INTERSECT that uses VALUES structure(s) + +select 1,2 +intersect +values (3,4),(5,6); + +select 1,2 +intersect +values (1,2),(3,4); + +values (1,2),(3,4) +intersect +select 5,6; + +values (1,2),(3,4) +intersect +select 1,2; + +values (1,2),(3,4) +intersect +values (5,6); + +values (1,2),(3,4) +intersect +values (1,2); + +--echo # combination of different structures that uses VALUES structures : UNION + EXCEPT + +values (1,2),(3,4) +except +select 1,2 +union values (1,2); + +values (1,2),(3,4) +except +values (1,2) +union +values (1,2); + +values (1,2),(3,4) +except +values (1,2) +union +values (3,4); + +values (1,2),(3,4) +union +values (1,2) +except +values (1,2); + +--echo # combination of different structures that uses VALUES structures : UNION ALL + EXCEPT + +values (1,2),(3,4) +except +select 1,2 +union all +values (1,2); + +values (1,2),(3,4) +except +values (1,2) +union all +values (1,2); + +values (1,2),(3,4) +except +values (1,2) +union all +values (3,4); + +values (1,2),(3,4) +union all +values (1,2) +except +values (1,2); + +--echo # combination of different structures that uses VALUES structures : UNION + INTERSECT + +values (1,2),(3,4) +intersect +select 1,2 +union +values (1,2); + +values (1,2),(3,4) +intersect +values (1,2) +union +values (1,2); + +values (1,2),(3,4) +intersect +values (1,2) +union +values (3,4); + +values (1,2),(3,4) +union +values (1,2) +intersect +values (1,2); + +--echo # combination of different structures that uses VALUES structures : UNION ALL + INTERSECT + +values (1,2),(3,4) +intersect +select 1,2 +union all +values (1,2); + +values (1,2),(3,4) +intersect +values (1,2) +union all +values (1,2); + +values (1,2),(3,4) +intersect +values (1,2) +union all +values (3,4); + +values (1,2),(3,4) +union all +values (1,2) +intersect +values (1,2); + +--echo # combination of different structures that uses VALUES structures : UNION + UNION ALL + +values (1,2),(3,4) +union all +select 1,2 +union +values (1,2); + +values (1,2),(3,4) +union all +values (1,2) +union +values (1,2); + +values (1,2),(3,4) +union all +values (1,2) +union +values (3,4); + +values (1,2),(3,4) +union +values (1,2) +union all +values (1,2); + +values (1,2) +union +values (1,2) +union all +values (1,2); + +--echo # CTE that uses VALUES structure(s) : non-recursive CTE + +with t2 as +( + values (1,2),(3,4) +) +select * from t2; + +with t2 as +( + select 1,2 + union + values (1,2) +) +select * from t2; + +with t2 as +( + select 1,2 + union + values (1,2),(3,4) +) +select * from t2; + +with t2 as +( + values (1,2) + union + select 1,2 +) +select * from t2; + +with t2 as +( + values (1,2),(3,4) + union + select 1,2 +) +select * from t2; + +with t2 as +( + values (5,6) + union + values (1,2),(3,4) +) +select * from t2; + +with t2 as +( + values (1,2) + union + values (1,2),(3,4) +) +select * from t2; + +with t2 as +( + select 1,2 + union all + values (1,2),(3,4) +) +select * from t2; + +with t2 as +( + values (1,2),(3,4) + union all + select 1,2 +) +select * from t2; + +with t2 as +( + values (1,2) + union all + values (1,2),(3,4) +) +select * from t2; + +--echo # recursive CTE that uses VALUES structure(s) : singe VALUES structure as anchor + +with recursive t2(a,b) as +( + values(1,1) + union + select t1.a, t1.b + from t1,t2 + where t1.a=t2.a +) +select * from t2; + +with recursive t2(a,b) as +( + values(1,1) + union + select t1.a+1, t1.b + from t1,t2 + where t1.a=t2.a +) +select * from t2; + +--echo # recursive CTE that uses VALUES structure(s) : several VALUES structures as anchors + +with recursive t2(a,b) as +( + values(1,1) + union + values (3,4) + union + select t2.a+1, t1.b + from t1,t2 + where t1.a=t2.a +) +select * from t2; + +--echo # recursive CTE that uses VALUES structure(s) : that uses UNION ALL + +with recursive t2(a,b,st) as +( + values(1,1,1) + union all + select t2.a, t1.b, t2.st+1 + from t1,t2 + where t1.a=t2.a and st<3 +) +select * from t2; + +--echo # recursive CTE that uses VALUES structure(s) : computation of factorial (first 10 elements) + +with recursive fact(n,f) as +( + values(1,1) + union + select n+1,f*n from fact where n < 10 +) +select * from fact; + +--echo # Derived table that uses VALUES structure(s) : singe VALUES structure + +select * from (values (1,2),(3,4)) as t2; + +--echo # Derived table that uses VALUES structure(s) : UNION with VALUES structure(s) + +select * from (select 1,2 union values (1,2)) as t2; + +select * from (select 1,2 union values (1,2),(3,4)) as t2; + +select * from (values (1,2) union select 1,2) as t2; + +select * from (values (1,2),(3,4) union select 1,2) as t2; + +select * from (values (5,6) union values (1,2),(3,4)) as t2; + +select * from (values (1,2) union values (1,2),(3,4)) as t2; + +--echo # Derived table that uses VALUES structure(s) : UNION ALL with VALUES structure(s) + +select * from (select 1,2 union all values (1,2),(3,4)) as t2; + +select * from (values (1,2),(3,4) union all select 1,2) as t2; + +select * from (values (1,2) union all values (1,2),(3,4)) as t2; + +--echo # CREATE VIEW that uses VALUES structure(s) : singe VALUES structure + +let $drop_view= drop view v1; +let $select_view= select * from v1; + +create view v1 as values (1,2),(3,4); + +eval $select_view; +eval $drop_view; + +--echo # CREATE VIEW that uses VALUES structure(s) : UNION with VALUES structure(s) + +create view v1 as + select 1,2 + union + values (1,2); + +eval $select_view; +eval $drop_view; + +create view v1 as + select 1,2 + union + values (1,2),(3,4); + +eval $select_view; +eval $drop_view; + +create view v1 as + values (1,2) + union + select 1,2; + +eval $select_view; +eval $drop_view; + +create view v1 as + values (1,2),(3,4) + union + select 1,2; + +eval $select_view; +eval $drop_view; + +create view v1 as + values (5,6) + union + values (1,2),(3,4); + +eval $select_view; +eval $drop_view; + +--echo # CREATE VIEW that uses VALUES structure(s) : UNION ALL with VALUES structure(s) + +create view v1 as + values (1,2) + union + values (1,2),(3,4); + +eval $select_view; +eval $drop_view; + +create view v1 as + select 1,2 + union all + values (1,2),(3,4); + +eval $select_view; +eval $drop_view; + +create view v1 as + values (1,2),(3,4) + union all + select 1,2; + +eval $select_view; +eval $drop_view; + +create view v1 as + values (1,2) + union all + values (1,2),(3,4); + +eval $select_view; +eval $drop_view; + +--echo # IN-subquery with VALUES structure(s) : simple case +let $query= +select * from t1 +where a in (values (1)); +let $subst_query= +select * from t1 +where a in (select * from (values (1)) as tvc_0); +eval $query; +eval $subst_query; +eval explain extended $query; +eval explain extended $subst_query; + +--echo # IN-subquery with VALUES structure(s) : UNION with VALUES on the first place +let $query= +select * from t1 +where a in (values (1) union select 2); +let $subst_query= +select * from t1 +where a in (select * from (values (1)) as tvc_0 union + select 2); +eval $query; +eval $subst_query; +eval explain extended $query; +eval explain extended $subst_query; + +--echo # IN-subquery with VALUES structure(s) : UNION with VALUES on the second place +let $query= +select * from t1 +where a in (select 2 union values (1)); +let $subst_query= +select * from t1 +where a in (select 2 union + select * from (values (1)) tvc_0); +eval $query; +eval $subst_query; +eval explain extended $query; +eval explain extended $subst_query; + +--echo # IN-subquery with VALUES structure(s) : UNION ALL +let $query= +select * from t1 +where a in (values (1) union all select b from t1); +let $subst_query= +select * from t1 +where a in (select * from (values (1)) as tvc_0 union all + select b from t1); + +eval $query; +eval $subst_query; +eval explain extended $query; +eval explain extended $subst_query; + +--echo # NOT IN subquery with VALUES structure(s) : simple case +let $query= +select * from t1 +where a not in (values (1),(2)); +let $subst_query= +select * from t1 +where a not in (select * from (values (1),(2)) as tvc_0); + +eval $query; +eval $subst_query; +eval explain extended $query; +eval explain extended $subst_query; + +--echo # NOT IN subquery with VALUES structure(s) : UNION with VALUES on the first place +let $query= +select * from t1 +where a not in (values (1) union select 2); +let $subst_query= +select * from t1 +where a not in (select * from (values (1)) as tvc_0 union + select 2); + +eval $query; +eval $subst_query; +eval explain extended $query; +eval explain extended $subst_query; + +--echo # NOT IN subquery with VALUES structure(s) : UNION with VALUES on the second place +let $query= +select * from t1 +where a not in (select 2 union values (1)); +let $subst_query= +select * from t1 +where a not in (select 2 union + select * from (values (1)) as tvc_0); + +eval $query; +eval $subst_query; +eval explain extended $query; +eval explain extended $subst_query; + +--echo # ANY-subquery with VALUES structure(s) : simple case +let $query= +select * from t1 +where a = any (values (1),(2)); +let $subst_query= +select * from t1 +where a = any (select * from (values (1),(2)) as tvc_0); + +eval $query; +eval $subst_query; +eval explain extended $query; +eval explain extended $subst_query; + +--echo # ANY-subquery with VALUES structure(s) : UNION with VALUES on the first place +let $query= +select * from t1 +where a = any (values (1) union select 2); +let $subst_query= +select * from t1 +where a = any (select * from (values (1)) as tvc_0 union + select 2); + +eval $query; +eval $subst_query; +eval explain extended $query; +eval explain extended $subst_query; + +--echo # ANY-subquery with VALUES structure(s) : UNION with VALUES on the second place +let $query= +select * from t1 +where a = any (select 2 union values (1)); +let $subst_query= +select * from t1 +where a = any (select 2 union + select * from (values (1)) as tvc_0); + +eval $query; +eval $subst_query; +eval explain extended $query; +eval explain extended $subst_query; + +--echo # ALL-subquery with VALUES structure(s) : simple case +let $query= +select * from t1 +where a = all (values (1)); +let $subst_query= +select * from t1 +where a = all (select * from (values (1)) as tvc_0); + +eval $query; +eval $subst_query; +eval explain extended $query; +eval explain extended $subst_query; + +--echo # ALL-subquery with VALUES structure(s) : UNION with VALUES on the first place +let $query= +select * from t1 +where a = all (values (1) union select 1); +let $subst_query= +select * from t1 +where a = all (select * from (values (1)) as tvc_0 union + select 1); + +eval $query; +eval $subst_query; +eval explain extended $query; +eval explain extended $subst_query; + +--echo # ALL-subquery with VALUES structure(s) : UNION with VALUES on the second place +let $query= +select * from t1 +where a = any (select 1 union values (1)); +let $subst_query= +select * from t1 +where a = any (select 1 union + select * from (values (1)) as tvc_0); + +eval $query; +eval $subst_query; +eval explain extended $query; +eval explain extended $subst_query; + +--echo # prepare statement that uses VALUES structure(s): single VALUES structure + +prepare stmt1 from " +values (1,2); +"; + +execute stmt1; +execute stmt1; +deallocate prepare stmt1; + +--echo # prepare statement that uses VALUES structure(s): UNION with VALUES structure(s) + +prepare stmt1 from " + select 1,2 + union + values (1,2),(3,4); +"; + +execute stmt1; +execute stmt1; +deallocate prepare stmt1; + +prepare stmt1 from " + values (1,2),(3,4) + union + select 1,2; +"; + +execute stmt1; +execute stmt1; +deallocate prepare stmt1; + +prepare stmt1 from " + select 1,2 + union + values (3,4) + union + values (1,2); +"; + +execute stmt1; +execute stmt1; +deallocate prepare stmt1; + +prepare stmt1 from " + values (5,6) + union + values (1,2),(3,4); +"; + +execute stmt1; +execute stmt1; +deallocate prepare stmt1; + +--echo # prepare statement that uses VALUES structure(s): UNION ALL with VALUES structure(s) + +prepare stmt1 from " + select 1,2 + union + values (1,2),(3,4); +"; + +execute stmt1; +execute stmt1; +deallocate prepare stmt1; + +prepare stmt1 from " + values (1,2),(3,4) + union all + select 1,2; +"; + +execute stmt1; +execute stmt1; +deallocate prepare stmt1; + +prepare stmt1 from " + select 1,2 + union all + values (3,4) + union all + values (1,2); +"; + +execute stmt1; +execute stmt1; +deallocate prepare stmt1; + +prepare stmt1 from " + values (1,2) + union all + values (1,2),(3,4); +"; + +execute stmt1; +execute stmt1; +deallocate prepare stmt1; + +--echo # explain query that uses VALUES structure(s): single VALUES structure + +explain +values (1,2); + +explain format=json +values (1,2); + +--echo # explain query that uses VALUES structure(s): UNION with VALUES structure(s) + +explain +select 1,2 +union +values (1,2),(3,4); + +explain +values (1,2),(3,4) +union +select 1,2; + +explain +values (5,6) +union +values (1,2),(3,4); + +explain format=json +select 1,2 +union +values (1,2),(3,4); + +explain format=json +values (1,2),(3,4) +union +select 1,2; + +explain format=json +values (5,6) +union +values (1,2),(3,4); + +explain +select 1,2 +union +values (3,4) +union +values (1,2); + +explain format=json +select 1,2 +union +values (3,4) +union +values (1,2); + +--echo # explain query that uses VALUES structure(s): UNION ALL with VALUES structure(s) + +explain +select 1,2 +union +values (1,2),(3,4); + +explain +values (1,2),(3,4) +union all +select 1,2; + +explain +values (1,2) +union all +values (1,2),(3,4); + +explain format=json +values (1,2),(3,4) +union all +select 1,2; + +explain format=json +select 1,2 +union +values (1,2),(3,4); + +explain format=json +values (1,2) +union all +values (1,2),(3,4); + +explain +select 1,2 +union all +values (3,4) +union all +values (1,2); + +explain format=json +select 1,2 +union all +values (3,4) +union all +values (1,2); + +--echo # analyze query that uses VALUES structure(s): single VALUES structure + +analyze +values (1,2); + +analyze format=json +values (1,2); + +--echo # analyze query that uses VALUES structure(s): UNION with VALUES structure(s) + +analyze +select 1,2 +union +values (1,2),(3,4); + +analyze +values (1,2),(3,4) +union +select 1,2; + +analyze +values (5,6) +union +values (1,2),(3,4); + +analyze format=json +select 1,2 +union +values (1,2),(3,4); + +analyze format=json +values (1,2),(3,4) +union +select 1,2; + +analyze format=json +values (5,6) +union +values (1,2),(3,4); + +analyze +select 1,2 +union +values (3,4) +union +values (1,2); + +analyze format=json +select 1,2 +union +values (3,4) +union +values (1,2); + +--echo # analyze query that uses VALUES structure(s): UNION ALL with VALUES structure(s) + +analyze +select 1,2 +union +values (1,2),(3,4); + +analyze +values (1,2),(3,4) +union all +select 1,2; + +analyze +values (1,2) +union all +values (1,2),(3,4); + +analyze format=json +values (1,2),(3,4) +union all +select 1,2; + +analyze format=json +select 1,2 +union +values (1,2),(3,4); + +analyze format=json +values (1,2) +union all +values (1,2),(3,4); + +analyze +select 1,2 +union all +values (3,4) +union all +values (1,2); + +analyze format=json +select 1,2 +union all +values (3,4) +union all +values (1,2); + +--echo # different number of values in TVC +--error ER_WRONG_NUMBER_OF_VALUES_IN_TVC +values (1,2),(3,4,5); + +--echo # illegal parameter data types in TVC +--error ER_ILLEGAL_PARAMETER_DATA_TYPES2_FOR_OPERATION +values (1,point(1,1)),(1,1); +--error ER_ILLEGAL_PARAMETER_DATA_TYPES2_FOR_OPERATION +values (1,point(1,1)+1); + +--echo # field reference in TVC +--error ER_FIELD_REFERENCE_IN_TVC +select * from (values (1), (b), (2)) as new_tvc; +--error ER_FIELD_REFERENCE_IN_TVC +select * from (values (1), (t1.b), (2)) as new_tvc; + +drop table t1; 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_datetime_hires.test b/mysql-test/t/type_datetime_hires.test index a62c227f563..d220a4601eb 100644 --- a/mysql-test/t/type_datetime_hires.test +++ b/mysql-test/t/type_datetime_hires.test @@ -57,6 +57,7 @@ INSERT INTO t2 VALUES ('2006-10-02 21:50:01.567',8), ('2006-10-02 21:50:01.5678',9); +--sorted_result select table_name,partition_name,partition_method,partition_expression,partition_description,table_rows from information_schema.partitions where table_name in ('t1', 't2'); drop table t1, t2; 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/variables.test b/mysql-test/t/variables.test index 1f65956f8ad..67082fd48ff 100644 --- a/mysql-test/t/variables.test +++ b/mysql-test/t/variables.test @@ -1361,7 +1361,7 @@ set session rand_seed1=DEFAULT; # Bug #14211565 CRASH WHEN ATTEMPTING TO SET SYSTEM VARIABLE TO RESULT OF VALUES() # --error ER_BAD_FIELD_ERROR -set autocommit = values(v); +set autocommit = value(v); # # MDEV-6673 I_S.SESSION_VARIABLES shows global values 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/t/win_percentile.test b/mysql-test/t/win_percentile.test new file mode 100644 index 00000000000..468d8cff56b --- /dev/null +++ b/mysql-test/t/win_percentile.test @@ -0,0 +1,104 @@ +CREATE TABLE t1 (name CHAR(10), test double, score DECIMAL(19,4)); +INSERT INTO t1 VALUES +('Chun', 0, 3), ('Chun', 0, 7), +('Kaolin', 0.5, 3), ('Kaolin', 0.6, 7), +('Kaolin', 0.5, 4), +('Tatiana', 0.8, 4), ('Tata', 0.8, 4); + +--echo # +--echo # Test invalid syntax +--echo # + +--echo # Order by clause has more than one element +--error ER_PARSE_ERROR +select percentile_disc(0.5) within group(order by score,test) over (partition by name) from t1; +--error ER_PARSE_ERROR +select percentile_cont(0.5) within group(order by score,test) over (partition by name) from t1; + +--echo # Order by clause has no element +--error ER_PARSE_ERROR +select percentile_disc(0.5) within group() over (partition by name) from t1; +--error ER_PARSE_ERROR +select percentile_cont(0.5) within group() over (partition by name) from t1; + +--echo # No parameters to the percentile functions +--error ER_PARSE_ERROR +select percentile_disc() within group() over (partition by name) from t1; +--error ER_PARSE_ERROR +select percentile_cont() within group() over (partition by name) from t1; + + + +--echo # +--echo # Test simple syntax +--echo # + +select name, percentile_cont(0.5) within group(order by score) over (partition by name) as c from t1; +select name, percentile_disc(0.5) within group(order by score) over (partition by name) as c from t1; + +--echo # no partition clause +select name, percentile_disc(0.5) within group(order by score) over () from t1; +select name, percentile_cont(0.5) within group(order by score) over () from t1; + +--echo # argument set to null +--error ER_WRONG_TYPE_OF_ARGUMENT +select name, percentile_cont(null) within group(order by score) over (partition by name) from t1; +--error ER_WRONG_TYPE_OF_ARGUMENT +select name, percentile_disc(null) within group(order by score) over (partition by name) from t1; + +--echo #subqueries having percentile functions +select * from ( select name , percentile_cont(0.5) within group ( order by score) over (partition by name ) from t1 ) as t; +select * from ( select name , percentile_disc(0.5) within group ( order by score) over (partition by name ) from t1 ) as t; +select name from t1 a where (select percentile_disc(0.5) within group (order by score) over (partition by name) from t1 b limit 1) >= 0.5; + +--echo #disallowed fields in order by +--error ER_WRONG_TYPE_FOR_PERCENTILE_FUNC +select score, percentile_cont(0.5) within group(order by name) over (partition by score) from t1; +--error ER_WRONG_TYPE_FOR_PERCENTILE_FUNC +select score, percentile_disc(0.5) within group(order by name) over (partition by score) from t1; + +--echo #parameter value should be in the range of [0,1] +--error ER_ARGUMENT_OUT_OF_RANGE +select percentile_disc(1.5) within group(order by score) over (partition by name) from t1; +--error ER_ARGUMENT_OUT_OF_RANGE +select percentile_cont(1.5) within group(order by score) over (partition by name) from t1; + +--echo #Argument should remain constant for the entire partition +--error ER_ARGUMENT_NOT_CONSTANT +select name,percentile_cont(test) within group(order by score) over (partition by name) from t1; +--error ER_ARGUMENT_NOT_CONSTANT +select name, percentile_disc(test) within group(order by score) over (partition by name) from t1; + +--echo #only numerical types are allowed as argument to percentile functions +--error ER_WRONG_TYPE_OF_ARGUMENT +select name, percentile_cont(name) within group(order by score) over (partition by name) from t1; +--error ER_WRONG_TYPE_OF_ARGUMENT +select name, percentile_disc(name) within group(order by score) over (partition by name) from t1; + +--echo #complete query with partition column +select name,cume_dist() over (partition by name order by score), percentile_disc(0.5) within group(order by score) over (partition by name) as c from t1; +select name, percentile_cont(0.5) within group(order by score) over (partition by name) as c from t1; + +select name,cume_dist() over (partition by name order by score) as b, percentile_disc(0.1) within group(order by score) over (partition by name) as c from t1; +select name,cume_dist() over (partition by name order by score) as b, percentile_disc(0.2) within group(order by score) over (partition by name) as c from t1; +select name,cume_dist() over (partition by name order by score) as b, percentile_disc(0.3) within group(order by score) over (partition by name) as c from t1; +select name,cume_dist() over (partition by name order by score) as b, percentile_disc(0.4) within group(order by score) over (partition by name) as c from t1; +select name,cume_dist() over (partition by name order by score) as b, percentile_disc(0.5) within group(order by score) over (partition by name) as c from t1; +select name,cume_dist() over (partition by name order by score) as b, percentile_disc(0.6) within group(order by score) over (partition by name) as c from t1; +select name,cume_dist() over (partition by name order by score) as b, percentile_disc(0.7) within group(order by score) over (partition by name) as c from t1; +select name,cume_dist() over (partition by name order by score) as b, percentile_disc(0.8) within group(order by score) over (partition by name) as c from t1; +select name,cume_dist() over (partition by name order by score) as b, percentile_disc(0.9) within group(order by score) over (partition by name) as c from t1; +select name,cume_dist() over (partition by name order by score) as b, percentile_disc(1) within group(order by score) over (partition by name) as c from t1; + +select median(score) over (partition by name), percentile_cont(0) within group(order by score) over (partition by name) as c from t1; +select median(score) over (partition by name), percentile_cont(0.1) within group(order by score) over (partition by name) as c from t1; +select median(score) over (partition by name), percentile_cont(0.2) within group(order by score) over (partition by name) as c from t1; +select median(score) over (partition by name), percentile_cont(0.3) within group(order by score) over (partition by name) as c from t1; +select median(score) over (partition by name), percentile_cont(0.4) within group(order by score) over (partition by name) as c from t1; +select median(score) over (partition by name), percentile_cont(0.5) within group(order by score) over (partition by name) as c from t1; +select median(score) over (partition by name), percentile_cont(0.6) within group(order by score) over (partition by name) as c from t1; +select median(score) over (partition by name), percentile_cont(0.7) within group(order by score) over (partition by name) as c from t1; +select median(score) over (partition by name), percentile_cont(0.8) within group(order by score) over (partition by name) as c from t1; +select median(score) over (partition by name), percentile_cont(0.9) within group(order by score) over (partition by name) as c from t1; +select median(score) over (partition by name), percentile_cont(1) within group(order by score) over (partition by name) as c from t1; +drop table t1; 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/mf_keycache.c b/mysys/mf_keycache.c index 19e1e165b12..2f0f2bf05c0 100644 --- a/mysys/mf_keycache.c +++ b/mysys/mf_keycache.c @@ -749,7 +749,6 @@ finish: SYNOPSIS finish_resize_simple_key_cache() keycache pointer to the control block of a simple key cache - acquire_lock <=> acquire the key cache lock at start DESCRIPTION This function performs finalizing actions for the operation of @@ -757,8 +756,6 @@ finish: keycache as a pointer to the control block structure of the type SIMPLE_KEY_CACHE_CB for this key cache. The function sets the flag in_resize in this structure to FALSE. - The parameter acquire_lock says whether the key cache lock must be - acquired at the start of the function. RETURN VALUE none @@ -770,14 +767,10 @@ finish: */ static -void finish_resize_simple_key_cache(SIMPLE_KEY_CACHE_CB *keycache, - my_bool acquire_lock) +void finish_resize_simple_key_cache(SIMPLE_KEY_CACHE_CB *keycache) { DBUG_ENTER("finish_resize_simple_key_cache"); - if (acquire_lock) - keycache_pthread_mutex_lock(&keycache->cache_lock); - mysql_mutex_assert_owner(&keycache->cache_lock); /* @@ -849,8 +842,7 @@ int resize_simple_key_cache(SIMPLE_KEY_CACHE_CB *keycache, int blocks= 0; DBUG_ENTER("resize_simple_key_cache"); - if (!keycache->key_cache_inited) - DBUG_RETURN(blocks); + DBUG_ASSERT(keycache->key_cache_inited); /* Note that the cache_lock mutex and the resize_queue are left untouched. @@ -866,7 +858,7 @@ int resize_simple_key_cache(SIMPLE_KEY_CACHE_CB *keycache, changed_blocks_hash_size); finish: - finish_resize_simple_key_cache(keycache, 0); + finish_resize_simple_key_cache(keycache); DBUG_RETURN(blocks); } @@ -2611,12 +2603,11 @@ restart: SYNOPSIS - read_block() + read_block_{primary|secondary}() keycache pointer to a key cache data structure block block to which buffer the data is to be read read_length size of data to be read min_length at least so much data must be read - primary <-> the current thread will read the data RETURN VALUE None @@ -2630,90 +2621,100 @@ restart: portion is less than read_length, but not less than min_length. */ -static void read_block(SIMPLE_KEY_CACHE_CB *keycache, - BLOCK_LINK *block, uint read_length, - uint min_length, my_bool primary) +static void read_block_primary(SIMPLE_KEY_CACHE_CB *keycache, + BLOCK_LINK *block, uint read_length, + uint min_length) { size_t got_length; /* On entry cache_lock is locked */ - KEYCACHE_THREAD_TRACE("read_block"); - if (primary) - { - /* - This code is executed only by threads that submitted primary - requests. Until block->status contains BLOCK_READ, all other - request for the block become secondary requests. For a primary - request the block must be properly initialized. - */ - DBUG_ASSERT(((block->status & ~BLOCK_FOR_UPDATE) == BLOCK_IN_USE) || - fail_block(block)); - DBUG_ASSERT((block->length == 0) || fail_block(block)); - DBUG_ASSERT((block->offset == keycache->key_cache_block_size) || - fail_block(block)); - DBUG_ASSERT((block->requests > 0) || fail_block(block)); - - KEYCACHE_DBUG_PRINT("read_block", - ("page to be read by primary request")); - - keycache->global_cache_read++; - /* Page is not in buffer yet, is to be read from disk */ - keycache_pthread_mutex_unlock(&keycache->cache_lock); - /* - Here other threads may step in and register as secondary readers. - They will register in block->wqueue[COND_FOR_REQUESTED]. - */ - got_length= my_pread(block->hash_link->file, block->buffer, - read_length, block->hash_link->diskpos, MYF(0)); - keycache_pthread_mutex_lock(&keycache->cache_lock); - /* - The block can now have been marked for free (in case of - FLUSH_RELEASE). Otherwise the state must be unchanged. - */ - DBUG_ASSERT(((block->status & ~(BLOCK_REASSIGNED | - BLOCK_FOR_UPDATE)) == BLOCK_IN_USE) || - fail_block(block)); - DBUG_ASSERT((block->length == 0) || fail_block(block)); - DBUG_ASSERT((block->offset == keycache->key_cache_block_size) || - fail_block(block)); - DBUG_ASSERT((block->requests > 0) || fail_block(block)); - - if (got_length < min_length) - block->status|= BLOCK_ERROR; - else - { - block->status|= BLOCK_READ; - block->length= got_length; - /* - Do not set block->offset here. If this block is marked - BLOCK_CHANGED later, we want to flush only the modified part. So - only a writer may set block->offset down from - keycache->key_cache_block_size. - */ - } - KEYCACHE_DBUG_PRINT("read_block", - ("primary request: new page in cache")); - /* Signal that all pending requests for this page now can be processed */ - release_whole_queue(&block->wqueue[COND_FOR_REQUESTED]); - } + KEYCACHE_THREAD_TRACE("read_block_primary"); + + /* + This code is executed only by threads that submitted primary + requests. Until block->status contains BLOCK_READ, all other + request for the block become secondary requests. For a primary + request the block must be properly initialized. + */ + DBUG_ASSERT(((block->status & ~BLOCK_FOR_UPDATE) == BLOCK_IN_USE) || + fail_block(block)); + DBUG_ASSERT((block->length == 0) || fail_block(block)); + DBUG_ASSERT((block->offset == keycache->key_cache_block_size) || + fail_block(block)); + DBUG_ASSERT((block->requests > 0) || fail_block(block)); + + KEYCACHE_DBUG_PRINT("read_block_primary", + ("page to be read by primary request")); + + keycache->global_cache_read++; + /* Page is not in buffer yet, is to be read from disk */ + keycache_pthread_mutex_unlock(&keycache->cache_lock); + /* + Here other threads may step in and register as secondary readers. + They will register in block->wqueue[COND_FOR_REQUESTED]. + */ + got_length= my_pread(block->hash_link->file, block->buffer, + read_length, block->hash_link->diskpos, MYF(0)); + keycache_pthread_mutex_lock(&keycache->cache_lock); + /* + The block can now have been marked for free (in case of + FLUSH_RELEASE). Otherwise the state must be unchanged. + */ + DBUG_ASSERT(((block->status & ~(BLOCK_REASSIGNED | + BLOCK_FOR_UPDATE)) == BLOCK_IN_USE) || + fail_block(block)); + DBUG_ASSERT((block->length == 0) || fail_block(block)); + DBUG_ASSERT((block->offset == keycache->key_cache_block_size) || + fail_block(block)); + DBUG_ASSERT((block->requests > 0) || fail_block(block)); + + if (got_length < min_length) + block->status|= BLOCK_ERROR; else { + block->status|= BLOCK_READ; + block->length= got_length; /* - This code is executed only by threads that submitted secondary - requests. At this point it could happen that the cache block is - not yet assigned to the hash_link for the requested file block. - But at awake from the wait this should be the case. Unfortunately - we cannot assert this here because we do not know the hash_link - for the requested file block nor the file and position. So we have - to assert this in the caller. + Do not set block->offset here. If this block is marked + BLOCK_CHANGED later, we want to flush only the modified part. So + only a writer may set block->offset down from + keycache->key_cache_block_size. */ - KEYCACHE_DBUG_PRINT("read_block", - ("secondary request waiting for new page to be read")); - wait_on_queue(&block->wqueue[COND_FOR_REQUESTED], &keycache->cache_lock); - KEYCACHE_DBUG_PRINT("read_block", - ("secondary request: new page in cache")); } + KEYCACHE_DBUG_PRINT("read_block_primary", + ("primary request: new page in cache")); + /* Signal that all pending requests for this page now can be processed */ + release_whole_queue(&block->wqueue[COND_FOR_REQUESTED]); + + DBUG_ASSERT(keycache->can_be_used); +} + + +static void read_block_secondary(SIMPLE_KEY_CACHE_CB *keycache, + BLOCK_LINK *block) +{ + KEYCACHE_THREAD_TRACE("read_block_secondary"); + + /* + This code is executed only by threads that submitted secondary + requests. At this point it could happen that the cache block is + not yet assigned to the hash_link for the requested file block. + But at awake from the wait this should be the case. Unfortunately + we cannot assert this here because we do not know the hash_link + for the requested file block nor the file and position. So we have + to assert this in the caller. + */ + KEYCACHE_DBUG_PRINT("read_block_secondary", + ("secondary request waiting for new page to be read")); + + wait_on_queue(&block->wqueue[COND_FOR_REQUESTED], &keycache->cache_lock); + + KEYCACHE_DBUG_PRINT("read_block_secondary", + ("secondary request: new page in cache")); + + DBUG_ASSERT(keycache->can_be_used); + DBUG_ASSERT(block->status & (BLOCK_READ | BLOCK_IN_USE)); } @@ -2858,22 +2859,24 @@ uchar *simple_key_cache_read(SIMPLE_KEY_CACHE_CB *keycache, } if (!(block->status & BLOCK_ERROR)) { - if (page_st != PAGE_READ) + if (page_st == PAGE_TO_BE_READ) + { + MYSQL_KEYCACHE_READ_MISS(); + read_block_primary(keycache, block, + keycache->key_cache_block_size, read_length+offset); + } + else if (page_st == PAGE_WAIT_TO_BE_READ) { MYSQL_KEYCACHE_READ_MISS(); /* The requested page is to be read into the block buffer */ - read_block(keycache, block, - keycache->key_cache_block_size, read_length+offset, - (my_bool)(page_st == PAGE_TO_BE_READ)); + read_block_secondary(keycache, block); + /* A secondary request must now have the block assigned to the - requested file block. It does not hurt to check it for - primary requests too. + requested file block. */ - DBUG_ASSERT(keycache->can_be_used); DBUG_ASSERT(block->hash_link->file == file); DBUG_ASSERT(block->hash_link->diskpos == filepos); - DBUG_ASSERT(block->status & (BLOCK_READ | BLOCK_IN_USE)); } else if (block->length < read_length + offset) { @@ -3077,23 +3080,30 @@ int simple_key_cache_insert(SIMPLE_KEY_CACHE_CB *keycache, } if (!(block->status & BLOCK_ERROR)) { - if ((page_st == PAGE_WAIT_TO_BE_READ) || - ((page_st == PAGE_TO_BE_READ) && - (offset || (read_length < keycache->key_cache_block_size)))) + if (page_st == PAGE_WAIT_TO_BE_READ) { /* - Either - this is a secondary request for a block to be read into the cache. The block is in eviction. It is not yet assigned to the requested file block (It does not point to the right hash_link). So we cannot call remove_reader() on the block. And we cannot access the hash_link directly here. We need to - wait until the assignment is complete. read_block() executes - the correct wait when called with primary == FALSE. - - Or + wait until the assignment is complete. read_block_secondary() + executes the correct wait. + */ + read_block_secondary(keycache, block); + /* + A secondary request must now have the block assigned to the + requested file block. + */ + DBUG_ASSERT(block->hash_link->file == file); + DBUG_ASSERT(block->hash_link->diskpos == filepos); + } + else if (page_st == PAGE_TO_BE_READ && + (offset || (read_length < keycache->key_cache_block_size))) + { + /* this is a primary request for a block to be read into the cache and the supplied data does not fill the whole block. @@ -3108,17 +3118,8 @@ int simple_key_cache_insert(SIMPLE_KEY_CACHE_CB *keycache, Though reading again what the caller did read already is an expensive operation, we need to do this for correctness. */ - read_block(keycache, block, keycache->key_cache_block_size, - read_length + offset, (page_st == PAGE_TO_BE_READ)); - /* - A secondary request must now have the block assigned to the - requested file block. It does not hurt to check it for - primary requests too. - */ - DBUG_ASSERT(keycache->can_be_used); - DBUG_ASSERT(block->hash_link->file == file); - DBUG_ASSERT(block->hash_link->diskpos == filepos); - DBUG_ASSERT(block->status & (BLOCK_READ | BLOCK_IN_USE)); + read_block_primary(keycache, block, keycache->key_cache_block_size, + read_length + offset); } else if (page_st == PAGE_TO_BE_READ) { @@ -3413,25 +3414,29 @@ int simple_key_cache_write(SIMPLE_KEY_CACHE_CB *keycache, reading the file block. If the read completes after us, it overwrites our new contents with the old contents. So we have to wait for the other thread to complete the read of this block. - read_block() takes care for the wait. + read_block_primary|secondary() takes care for the wait. */ - if (!(block->status & BLOCK_ERROR) && - ((page_st == PAGE_TO_BE_READ && - (offset || read_length < keycache->key_cache_block_size)) || - (page_st == PAGE_WAIT_TO_BE_READ))) + if (!(block->status & BLOCK_ERROR)) { - read_block(keycache, block, - offset + read_length >= keycache->key_cache_block_size? - offset : keycache->key_cache_block_size, - offset, (page_st == PAGE_TO_BE_READ)); - DBUG_ASSERT(keycache->can_be_used); - DBUG_ASSERT(block->status & (BLOCK_READ | BLOCK_IN_USE)); - /* - Prevent block from flushing and from being selected for to be - freed. This must be set when we release the cache_lock. - Here we set it in case we could not set it above. - */ - block->status|= BLOCK_FOR_UPDATE; + if (page_st == PAGE_TO_BE_READ && + (offset || read_length < keycache->key_cache_block_size)) + { + read_block_primary(keycache, block, + offset + read_length >= keycache->key_cache_block_size? + offset : keycache->key_cache_block_size, + offset); + /* + Prevent block from flushing and from being selected for to be + freed. This must be set when we release the cache_lock. + Here we set it in case we could not set it above. + */ + block->status|= BLOCK_FOR_UPDATE; + } + else if (page_st == PAGE_WAIT_TO_BE_READ) + { + read_block_secondary(keycache, block); + block->status|= BLOCK_FOR_UPDATE; + } } /* The block should always be assigned to the requested file block @@ -5279,7 +5284,8 @@ int resize_partitioned_key_cache(PARTITIONED_KEY_CACHE_CB *keycache, { for (i= 0; i < partitions; i++) { - finish_resize_simple_key_cache(keycache->partition_array[i], 1); + keycache_pthread_mutex_lock(&keycache->partition_array[i]->cache_lock); + finish_resize_simple_key_cache(keycache->partition_array[i]); } } DBUG_RETURN(blocks); 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/mysys/my_getopt.c b/mysys/my_getopt.c index 185cb1fc25c..c9bfe2e1eaa 100644 --- a/mysys/my_getopt.c +++ b/mysys/my_getopt.c @@ -834,6 +834,7 @@ static int setval(const struct my_option *opts, void *value, char *argument, goto ret; }; } + break; case GET_BIT: { uint tmp; 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/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh index b06106ceae6..80a93c979ac 100644 --- a/scripts/mysqld_safe.sh +++ b/scripts/mysqld_safe.sh @@ -153,7 +153,11 @@ log_generic () { echo "$msg" case $logging in init) ;; # Just echo the message, don't save it anywhere - file) echo "$msg" | "$helper" "$user" log "$err_log" ;; + file) + if [ -n "$helper" ]; then + echo "$msg" | "$helper" "$user" log "$err_log" + fi + ;; syslog) logger -t "$syslog_tag_mysqld_safe" -p "$priority" "$*" ;; *) echo "Internal program error (non-fatal):" \ @@ -173,7 +177,11 @@ log_notice () { eval_log_error () { local cmd="$1" case $logging in - file) cmd="$cmd 2>&1 | "`shell_quote_string "$helper"`" $user log "`shell_quote_string "$err_log"` ;; + file) + if [ -n "$helper" ]; then + cmd="$cmd 2>&1 | "`shell_quote_string "$helper"`" $user log "`shell_quote_string "$err_log"` + fi + ;; syslog) # mysqld often prefixes its messages with a timestamp, which is # redundant when logging to syslog (which adds its own timestamp) @@ -455,8 +463,9 @@ get_mysql_config() { # set_malloc_lib LIB # - If LIB is empty, do nothing and return -# - If LIB is 'tcmalloc', look for tcmalloc shared library in /usr/lib -# then pkglibdir. tcmalloc is part of the Google perftools project. +# - If LIB starts with 'tcmalloc' or 'jemalloc', look for the shared library in +# /usr/lib, /usr/lib64 and then pkglibdir. +# tcmalloc is part of the Google perftools project. # - If LIB is an absolute path, assume it is a malloc shared library # # Put LIB in mysqld_ld_preload, which will be added to LD_PRELOAD when @@ -464,23 +473,23 @@ get_mysql_config() { set_malloc_lib() { malloc_lib="$1" - if [ "$malloc_lib" = tcmalloc ]; then + if expr "$malloc_lib" : "\(tcmalloc\|jemalloc\)" > /dev/null ; then pkglibdir=`get_mysql_config --variable=pkglibdir` - malloc_lib= + where='' # This list is kept intentionally simple. Simply set --malloc-lib # to a full path if another location is desired. - for libdir in /usr/lib "$pkglibdir" "$pkglibdir/mysql"; do - for flavor in _minimal '' _and_profiler _debug; do - tmp="$libdir/libtcmalloc$flavor.so" - #log_notice "DEBUG: Checking for malloc lib '$tmp'" - [ -r "$tmp" ] || continue - malloc_lib="$tmp" - break 2 - done + for libdir in /usr/lib /usr/lib64 "$pkglibdir" "$pkglibdir/mysql"; do + tmp=`echo "$libdir/lib$malloc_lib.so".[0-9]` + where="$where $libdir" + # log_notice "DEBUG: Checking for malloc lib '$tmp'" + [ -r "$tmp" ] || continue + malloc_lib="$tmp" + where='' + break done - if [ -z "$malloc_lib" ]; then - log_error "no shared library for --malloc-lib=tcmalloc found in /usr/lib or $pkglibdir" + if [ -n "$where" ]; then + log_error "no shared library for lib$malloc_lib.so.[0-9] found in$where" exit 1 fi fi @@ -496,8 +505,8 @@ set_malloc_lib() { fi ;; *) - log_error "--malloc-lib must be an absolute path or 'tcmalloc'; " \ - "ignoring value '$malloc_lib'" + log_error "--malloc-lib must be an absolute path, 'tcmalloc' or " \ + "'jemalloc'; ignoring value '$malloc_lib'" exit 1 ;; esac @@ -549,6 +558,9 @@ fi helper=`find_in_bin mysqld_safe_helper` print_defaults=`find_in_bin my_print_defaults` +# Check if helper exists +$helper --help >/dev/null 2>&1 || helper="" + # # Second, try to find the data directory # @@ -751,7 +763,7 @@ then does not exist or is not executable. Please cd to the mysql installation directory and restart this script from there as follows: ./bin/mysqld_safe& -See http://dev.mysql.com/doc/mysql/en/mysqld-safe.html for more information" +See https://mariadb.com/kb/en/mysqld_safe for more information" exit 1 fi diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt index 270c0d82993..0697b53e414 100644 --- a/sql/CMakeLists.txt +++ b/sql/CMakeLists.txt @@ -143,6 +143,7 @@ SET (SQL_SOURCE sql_cte.cc item_vers.cc sql_sequence.cc sql_sequence.h ha_sequence.h + sql_tvc.cc sql_tvc.h ${WSREP_SOURCES} table_cache.cc encryption.cc temporary_tables.cc proxy_protocol.cc 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/gen_lex_token.cc b/sql/gen_lex_token.cc index e024ee3799e..b36df5e94be 100644 --- a/sql/gen_lex_token.cc +++ b/sql/gen_lex_token.cc @@ -132,6 +132,8 @@ void compute_tokens() set_token(WITH_ROLLUP_SYM, "WITH ROLLUP"); set_token(WITH_SYSTEM_SYM, "WITH SYSTEM"); set_token(FOR_SYSTEM_TIME_SYM, "FOR SYSTEM_TIME"); + set_token(VALUES_IN_SYM, "VALUES IN"); + set_token(VALUES_LESS_SYM, "VALUES LESS"); set_token(NOT2_SYM, "!"); set_token(OR2_SYM, "|"); set_token(PARAM_MARKER, "?"); diff --git a/sql/handler.cc b/sql/handler.cc index 68e43119caa..1e3c7aca9ee 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; } @@ -5137,8 +5137,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); @@ -5209,6 +5214,13 @@ static int cmp_table_names(LEX_CSTRING * const *a, LEX_CSTRING * const *b) (uchar*)((*b)->str), (*b)->length); } +#ifndef DBUG_OFF +static int cmp_table_names_desc(LEX_CSTRING * const *a, LEX_CSTRING * const *b) +{ + return -cmp_table_names(a, b); +} +#endif + } Discovered_table_list::Discovered_table_list(THD *thd_arg, @@ -5261,6 +5273,15 @@ void Discovered_table_list::sort() tables->sort(cmp_table_names); } + +#ifndef DBUG_OFF +void Discovered_table_list::sort_desc() +{ + tables->sort(cmp_table_names_desc); +} +#endif + + void Discovered_table_list::remove_duplicates() { LEX_CSTRING **src= tables->front(); diff --git a/sql/handler.h b/sql/handler.h index 66fa336f675..9478645671c 100644 --- a/sql/handler.h +++ b/sql/handler.h @@ -4520,6 +4520,13 @@ public: void sort(); void remove_duplicates(); // assumes that the list is sorted +#ifndef DBUG_OFF + /* + Used to find unstable mtr tests querying + INFORMATION_SCHEMA.TABLES without ORDER BY. + */ + void sort_desc(); +#endif }; int ha_discover_table(THD *thd, TABLE_SHARE *share); diff --git a/sql/item.cc b/sql/item.cc index a0a06975ea7..2ed6c594e18 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) { @@ -5778,6 +5792,13 @@ bool Item_field::fix_fields(THD *thd, Item **reference) DBUG_ASSERT(fixed == 0); Field *from_field= (Field *)not_found_field; bool outer_fixed= false; + + if (thd->lex->current_select->in_tvc) + { + my_error(ER_FIELD_REFERENCE_IN_TVC, MYF(0), + full_name(), thd->where); + return(1); + } if (!field) // If field is not checked { @@ -8718,18 +8739,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; } @@ -9215,7 +9237,7 @@ bool Item_insert_value::fix_fields(THD *thd, Item **items) void Item_insert_value::print(String *str, enum_query_type query_type) { - str->append(STRING_WITH_LEN("values(")); + str->append(STRING_WITH_LEN("value(")); arg->print(str, query_type); str->append(')'); } diff --git a/sql/item.h b/sql/item.h index 6184417136a..991ac0604f1 100644 --- a/sql/item.h +++ b/sql/item.h @@ -732,7 +732,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 @@ -1762,6 +1764,8 @@ public: virtual Item *derived_grouping_field_transformer_for_where(THD *thd, uchar *arg) { return this; } + virtual Item *in_predicate_to_in_subs_transformer(THD *thd, uchar *arg) + { return this; } virtual bool expr_cache_is_needed(THD *) { return FALSE; } virtual Item *safe_charset_converter(THD *thd, CHARSET_INFO *tocs); bool needs_charset_converter(uint32 length, CHARSET_INFO *tocs) const @@ -2769,7 +2773,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); @@ -3041,6 +3045,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); @@ -4420,7 +4435,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) @@ -4728,9 +4743,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(); } @@ -4999,7 +5014,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; @@ -5535,7 +5550,7 @@ public: bool update_vcol_processor(void *arg) { return 0; } bool check_vcol_func_processor(void *arg) { - return mark_unsupported_function("values()", arg, VCOL_IMPOSSIBLE); + return mark_unsupported_function("value()", arg, VCOL_IMPOSSIBLE); } }; diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index 85bee75fe79..ae06f0a089c 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -1223,10 +1223,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); @@ -2053,10 +2054,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); } @@ -2381,10 +2383,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); } @@ -4147,10 +4150,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); } @@ -4426,6 +4430,26 @@ longlong Item_func_in::val_int() } +void Item_func_in::mark_as_condition_AND_part(TABLE_LIST *embedding) +{ + THD *thd= current_thd; + + Query_arena *arena, backup; + arena= thd->activate_stmt_arena_if_needed(&backup); + + if (to_be_transformed_into_in_subq(thd)) + { + transform_into_subq= true; + thd->lex->current_select->in_funcs.push_back(this, thd->mem_root); + } + + if (arena) + thd->restore_active_arena(arena, &backup); + + emb_on_expr_nest= embedding; +} + + longlong Item_func_bit_or::val_int() { DBUG_ASSERT(fixed == 1); @@ -4654,7 +4678,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; @@ -4667,7 +4692,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 62066ef61e5..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: @@ -2280,6 +2280,7 @@ class Item_func_in :public Item_func_opt_neg, protected: SEL_TREE *get_func_mm_tree(RANGE_OPT_PARAM *param, Field *field, Item *value); + bool transform_into_subq; public: /// An array of values, created when the bisection lookup method is used in_vector *array; @@ -2296,11 +2297,14 @@ public: */ bool arg_types_compatible; + TABLE_LIST *emb_on_expr_nest; + Item_func_in(THD *thd, List<Item> &list): Item_func_opt_neg(thd, list), Predicant_to_list_comparator(thd, arg_count - 1), + transform_into_subq(false), array(0), have_null(0), - arg_types_compatible(FALSE) + arg_types_compatible(FALSE), emb_on_expr_nest(0) { } longlong val_int(); bool fix_fields(THD *, Item **); @@ -2378,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); } @@ -2392,7 +2396,11 @@ public: return NULL; } return clone; - } + } + void mark_as_condition_AND_part(TABLE_LIST *embedding); + bool to_be_transformed_into_in_subq(THD *thd); + bool create_value_list_for_tvc(THD *thd, List< List<Item> > *values); + Item *in_predicate_to_in_subs_transformer(THD *thd, uchar *arg); }; class cmp_item_row :public cmp_item @@ -2902,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 e8c9c0ef484..ddf830395e5 100644 --- a/sql/item_func.h +++ b/sql/item_func.h @@ -132,7 +132,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() @@ -2812,6 +2812,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_jsonfunc.cc b/sql/item_jsonfunc.cc index 7edafa3dc33..54ffa5a2e63 100644 --- a/sql/item_jsonfunc.cc +++ b/sql/item_jsonfunc.cc @@ -1353,6 +1353,8 @@ longlong Item_func_json_contains_path::val_int() bzero(p_found, (arg_count-2) * sizeof(bool)); n_found= arg_count - 2; } + else + n_found= 0; /* Jost to prevent 'uninitialized value' warnings */ result= 0; while (json_get_path_next(&je, &p) == 0) @@ -2059,7 +2061,7 @@ String *Item_func_json_merge::val_str(String *str) { DBUG_ASSERT(fixed == 1); json_engine_t je1, je2; - String *js1= args[0]->val_json(&tmp_js1), *js2; + String *js1= args[0]->val_json(&tmp_js1), *js2=NULL; uint n_arg; LINT_INIT(js2); 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 1f2949903b4..3a7d8582913 100644 --- a/sql/item_subselect.cc +++ b/sql/item_subselect.cc @@ -116,9 +116,10 @@ void Item_subselect::init(st_select_lex *select_lex, do not take into account expression inside aggregate functions because they can access original table fields */ - parsing_place= (outer_select->in_sum_expr ? NO_MATTER - : outer_select->parsing_place); - if (unit->is_unit_op()) + parsing_place= (outer_select->in_sum_expr ? + NO_MATTER : + outer_select->parsing_place); + if (unit->is_unit_op() && unit->first_select()->next_select()) engine= new subselect_union_engine(unit, result, this); else engine= new subselect_single_select_engine(select_lex, result, this); @@ -264,6 +265,13 @@ bool Item_subselect::fix_fields(THD *thd_param, Item **ref) if (check_stack_overrun(thd, STACK_MIN_SIZE, (uchar*)&res)) return TRUE; + for (SELECT_LEX *sl= unit->first_select(); sl; sl= sl->next_select()) + { + if (sl->tvc) + { + wrap_tvc_in_derived_table(thd, sl); + } + } if (!(res= engine->prepare(thd))) { @@ -452,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; @@ -1160,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); } @@ -2937,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); } @@ -3318,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 6112c1c22f4..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(); /* @@ -266,6 +266,7 @@ public: Item* build_clone(THD *thd, MEM_ROOT *mem_root) { return 0; } Item* get_copy(THD *thd, MEM_ROOT *mem_root) { return 0; } + bool wrap_tvc_in_derived_table(THD *thd, st_select_lex *tvc_sl); friend class select_result_interceptor; friend class Item_in_optimizer; @@ -624,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(); @@ -878,6 +879,7 @@ public: virtual enum_engine_type engine_type() { return SINGLE_SELECT_ENGINE; } int get_identifier(); void force_reexecution(); + void change_select(st_select_lex *new_select) { select_lex= new_select; } friend class subselect_hash_sj_engine; friend class Item_in_subselect; 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 7845ed3318f..e91728a1aa1 100644 --- a/sql/item_sum.h +++ b/sql/item_sum.h @@ -354,7 +354,8 @@ public: VARIANCE_FUNC, SUM_BIT_FUNC, UDF_SUM_FUNC, GROUP_CONCAT_FUNC, ROW_NUMBER_FUNC, RANK_FUNC, DENSE_RANK_FUNC, PERCENT_RANK_FUNC, CUME_DIST_FUNC, NTILE_FUNC, FIRST_VALUE_FUNC, LAST_VALUE_FUNC, - NTH_VALUE_FUNC, LEAD_FUNC, LAG_FUNC + NTH_VALUE_FUNC, LEAD_FUNC, LAG_FUNC, PERCENTILE_CONT_FUNC, + PERCENTILE_DISC_FUNC }; Item **ref_by; /* pointer to a ref to the object used to register it */ @@ -1034,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_vers.cc b/sql/item_vers.cc index 5866afa4570..82577a767ea 100644 --- a/sql/item_vers.cc +++ b/sql/item_vers.cc @@ -44,7 +44,8 @@ VTQ_common<Item_func_X>::check_hton() DBUG_ASSERT(hton); if (!(hton->flags & HTON_NATIVE_SYS_VERSIONING) && hton->db_type != DB_TYPE_HEAP) { - my_error(ER_VERS_ENGINE_UNSUPPORTED, MYF(0), Item::name.str ? Item::name.str : this->func_name()); + my_error(ER_VERS_ENGINE_UNSUPPORTED, MYF(0), this->Item::name.str ? + this->Item::name.str : this->func_name()); hton= NULL; } } diff --git a/sql/item_windowfunc.cc b/sql/item_windowfunc.cc index 835a3cbfdae..8432ab43ad8 100644 --- a/sql/item_windowfunc.cc +++ b/sql/item_windowfunc.cc @@ -108,6 +108,7 @@ Item_window_func::fix_fields(THD *thd, Item **ref) my_error(ER_NO_ORDER_LIST_IN_WINDOW_SPEC, MYF(0), window_func()->func_name()); return true; } + /* TODO: why the last parameter is 'ref' in this call? What if window_func decides to substitute itself for something else and does *ref=.... ? @@ -168,10 +169,25 @@ void Item_window_func::split_sum_func(THD *thd, Ref_ptr_array ref_pointer_array, window_func()->setup_caches(thd); } +bool Item_window_func::check_result_type_of_order_item() +{ + if (only_single_element_order_list()) + { + Item_result rtype= window_spec->order_list->first->item[0]->cmp_type(); + // TODO (varun) : support date type in percentile_cont function + if (rtype != REAL_RESULT && rtype != INT_RESULT && + rtype != DECIMAL_RESULT && rtype != TIME_RESULT) + { + my_error(ER_WRONG_TYPE_FOR_PERCENTILE_FUNC, MYF(0), window_func()->func_name()); + return TRUE; + } + setting_handler_for_percentile_functions(rtype); + } + return FALSE; +} /* This must be called before attempting to compute the window function values. - @detail If we attempt to do it in fix_fields(), partition_fields will refer to the original window function arguments. @@ -194,6 +210,71 @@ void Item_sum_dense_rank::setup_window_func(THD *thd, Window_spec *window_spec) clear(); } +void Item_sum_percentile_disc::setup_window_func(THD *thd, Window_spec *window_spec) +{ + order_item= window_spec->order_list->first->item[0]; + if (!(value= order_item->get_cache(thd))) + return; + value->setup(thd, order_item); + value->store(order_item); +} + +void Item_sum_percentile_cont::setup_window_func(THD *thd, Window_spec *window_spec) +{ + order_item= window_spec->order_list->first->item[0]; + /* TODO(varun): need to discuss and finalise what type should we + return for percentile cont functions + */ + if (!(ceil_value= order_item->get_cache(thd))) + return; + ceil_value->setup(thd, order_item); + ceil_value->store(order_item); + + if (!(floor_value= order_item->get_cache(thd))) + return; + floor_value->setup(thd, order_item); + floor_value->store(order_item); +} +bool Item_sum_percentile_cont::fix_fields(THD *thd, Item **ref) +{ + bool res; + res= Item_sum_num::fix_fields(thd, ref); + if (res) + return res; + + switch(args[0]->cmp_type()) + { + case DECIMAL_RESULT: + case REAL_RESULT: + case INT_RESULT: + break; + default: + my_error(ER_WRONG_TYPE_OF_ARGUMENT, MYF(0), func_name()); + return TRUE; + } + return res; +} +bool Item_sum_percentile_disc::fix_fields(THD *thd, Item **ref) +{ + bool res; + res= Item_sum_num::fix_fields(thd, ref); + if (res) + return res; + + switch(args[0]->cmp_type()) + { + case DECIMAL_RESULT: + case REAL_RESULT: + case INT_RESULT: + break; + default: + my_error(ER_WRONG_TYPE_OF_ARGUMENT, MYF(0), func_name()); + return TRUE; + } + return res; + +} + bool Item_sum_dense_rank::add() { if (peer_tracker->check_if_next_group() || first_add) diff --git a/sql/item_windowfunc.h b/sql/item_windowfunc.h index 64a974d55d6..849c298f5aa 100644 --- a/sql/item_windowfunc.h +++ b/sql/item_windowfunc.h @@ -24,6 +24,7 @@ class Window_spec; int test_if_group_changed(List<Cached_item> &list); + /* A wrapper around test_if_group_changed */ class Group_bound_tracker { @@ -31,10 +32,10 @@ public: Group_bound_tracker(THD *thd, SQL_I_List<ORDER> *list) { - for (ORDER *curr = list->first; curr; curr=curr->next) + for (ORDER *curr = list->first; curr; curr=curr->next) { - Cached_item *tmp= new_Cached_item(thd, curr->item[0], TRUE); - group_fields.push_back(tmp); + Cached_item *tmp= new_Cached_item(thd, curr->item[0], TRUE); + group_fields.push_back(tmp); } } @@ -572,6 +573,9 @@ class Item_sum_cume_dist: public Item_sum_window_with_row_count Item_sum_cume_dist(THD *thd) : Item_sum_window_with_row_count(thd), current_row_count_(0) {} + Item_sum_cume_dist(THD *thd, Item *arg) : Item_sum_window_with_row_count(thd,arg), + current_row_count_(0) {} + double val_real() { if (get_row_count() == 0) @@ -618,6 +622,11 @@ class Item_sum_cume_dist: public Item_sum_window_with_row_count Item *get_copy(THD *thd, MEM_ROOT *mem_root) { return get_item_copy<Item_sum_cume_dist>(thd, mem_root, this); } + ulonglong get_row_number() + { + return current_row_count_ ; + } + private: ulonglong current_row_count_; }; @@ -693,6 +702,277 @@ class Item_sum_ntile : public Item_sum_window_with_row_count ulong current_row_count_; }; +class Item_sum_percentile_disc : public Item_sum_cume_dist, + public Type_handler_hybrid_field_type +{ +public: + Item_sum_percentile_disc(THD *thd, Item* arg) : Item_sum_cume_dist(thd, arg), + Type_handler_hybrid_field_type(&type_handler_longlong), + value(NULL), val_calculated(FALSE), first_call(TRUE), + prev_value(0), order_item(NULL){} + + double val_real() + { + if (get_row_count() == 0 || get_arg(0)->is_null()) + { + null_value= true; + return 0; + } + null_value= false; + return value->val_real(); + } + + longlong val_int() + { + if (get_row_count() == 0 || get_arg(0)->is_null()) + { + null_value= true; + return 0; + } + null_value= false; + return value->val_int(); + } + + my_decimal* val_decimal(my_decimal* dec) + { + if (get_row_count() == 0 || get_arg(0)->is_null()) + { + null_value= true; + return 0; + } + null_value= false; + return value->val_decimal(dec); + } + + String* val_str(String *str) + { + if (get_row_count() == 0 || get_arg(0)->is_null()) + { + null_value= true; + return 0; + } + null_value= false; + return value->val_str(str); + } + + bool add() + { + Item *arg= get_arg(0); + if (arg->is_null()) + return false; + + if (first_call) + { + prev_value= arg->val_real(); + if (prev_value > 1 || prev_value < 0) + { + my_error(ER_ARGUMENT_OUT_OF_RANGE, MYF(0), func_name()); + return true; + } + first_call= false; + } + + double arg_val= arg->val_real(); + + if (prev_value != arg_val) + { + my_error(ER_ARGUMENT_NOT_CONSTANT, MYF(0), func_name()); + return true; + } + + if (val_calculated) + return false; + + value->store(order_item); + value->cache_value(); + if (value->null_value) + return false; + + Item_sum_cume_dist::add(); + double val= Item_sum_cume_dist::val_real(); + + if (val >= prev_value && !val_calculated) + val_calculated= true; + return false; + } + + enum Sumfunctype sum_func() const + { + return PERCENTILE_DISC_FUNC; + } + + void clear() + { + val_calculated= false; + first_call= true; + value->clear(); + Item_sum_cume_dist::clear(); + } + + const char*func_name() const + { + return "percentile_disc"; + } + + void update_field() {} + void set_type_handler(Window_spec *window_spec); + const Type_handler *type_handler() const + {return Type_handler_hybrid_field_type::type_handler();} + + void fix_length_and_dec() + { + decimals = 10; // TODO-cvicentiu find out how many decimals the standard + // requires. + } + + Item *get_copy(THD *thd, MEM_ROOT *mem_root) + { return get_item_copy<Item_sum_percentile_disc>(thd, mem_root, this); } + void setup_window_func(THD *thd, Window_spec *window_spec); + void setup_hybrid(THD *thd, Item *item); + bool fix_fields(THD *thd, Item **ref); + +private: + Item_cache *value; + bool val_calculated; + bool first_call; + double prev_value; + Item *order_item; +}; + +class Item_sum_percentile_cont : public Item_sum_cume_dist, + public Type_handler_hybrid_field_type +{ +public: + Item_sum_percentile_cont(THD *thd, Item* arg) : Item_sum_cume_dist(thd, arg), + Type_handler_hybrid_field_type(&type_handler_double), + floor_value(NULL), ceil_value(NULL), first_call(TRUE),prev_value(0), + ceil_val_calculated(FALSE), floor_val_calculated(FALSE), order_item(NULL){} + + double val_real() + { + if (get_row_count() == 0 || get_arg(0)->is_null()) + { + null_value= true; + return 0; + } + null_value= false; + double val= 1 + prev_value * (get_row_count()-1); + + /* + Applying the formula to get the value + If (CRN = FRN = RN) then the result is (value of expression from row at RN) + Otherwise the result is + (CRN - RN) * (value of expression for row at FRN) + + (RN - FRN) * (value of expression for row at CRN) + */ + + if(ceil(val) == floor(val)) + return floor_value->val_real(); + + double ret_val= ((val - floor(val)) * ceil_value->val_real()) + + ((ceil(val) - val) * floor_value->val_real()); + + return ret_val; + } + + bool add() + { + Item *arg= get_arg(0); + if (arg->is_null()) + return false; + + if (first_call) + { + first_call= false; + prev_value= arg->val_real(); + if (prev_value > 1 || prev_value < 0) + { + my_error(ER_ARGUMENT_OUT_OF_RANGE, MYF(0), func_name()); + return true; + } + } + + double arg_val= arg->val_real(); + if (prev_value != arg_val) + { + my_error(ER_ARGUMENT_NOT_CONSTANT, MYF(0), func_name()); + return true; + } + + if (!floor_val_calculated) + { + floor_value->store(order_item); + floor_value->cache_value(); + if (floor_value->null_value) + return false; + } + if (floor_val_calculated && !ceil_val_calculated) + { + ceil_value->store(order_item); + ceil_value->cache_value(); + if (ceil_value->null_value) + return false; + } + + Item_sum_cume_dist::add(); + double val= 1 + prev_value * (get_row_count()-1); + + if (!floor_val_calculated && get_row_number() == floor(val)) + floor_val_calculated= true; + + if (!ceil_val_calculated && get_row_number() == ceil(val)) + ceil_val_calculated= true; + return false; + } + + enum Sumfunctype sum_func() const + { + return PERCENTILE_CONT_FUNC; + } + + void clear() + { + first_call= true; + floor_value->clear(); + ceil_value->clear(); + floor_val_calculated= false; + ceil_val_calculated= false; + Item_sum_cume_dist::clear(); + } + + const char*func_name() const + { + return "percentile_cont"; + } + void update_field() {} + void set_type_handler(Window_spec *window_spec); + const Type_handler *type_handler() const + {return Type_handler_hybrid_field_type::type_handler();} + + void fix_length_and_dec() + { + decimals = 10; // TODO-cvicentiu find out how many decimals the standard + // requires. + } + + Item *get_copy(THD *thd, MEM_ROOT *mem_root) + { return get_item_copy<Item_sum_percentile_cont>(thd, mem_root, this); } + void setup_window_func(THD *thd, Window_spec *window_spec); + void setup_hybrid(THD *thd, Item *item); + bool fix_fields(THD *thd, Item **ref); + +private: + Item_cache *floor_value; + Item_cache *ceil_value; + bool first_call; + double prev_value; + bool ceil_val_calculated; + bool floor_val_calculated; + Item *order_item; +}; + + + class Item_window_func : public Item_func_or_sum { @@ -747,6 +1027,8 @@ public: case Item_sum::PERCENT_RANK_FUNC: case Item_sum::CUME_DIST_FUNC: case Item_sum::NTILE_FUNC: + case Item_sum::PERCENTILE_CONT_FUNC: + case Item_sum::PERCENTILE_DISC_FUNC: return true; default: return false; @@ -773,6 +1055,8 @@ public: case Item_sum::PERCENT_RANK_FUNC: case Item_sum::CUME_DIST_FUNC: case Item_sum::NTILE_FUNC: + case Item_sum::PERCENTILE_CONT_FUNC: + case Item_sum::PERCENTILE_DISC_FUNC: return true; default: return false; @@ -796,12 +1080,40 @@ public: case Item_sum::DENSE_RANK_FUNC: case Item_sum::PERCENT_RANK_FUNC: case Item_sum::CUME_DIST_FUNC: + case Item_sum::PERCENTILE_CONT_FUNC: + case Item_sum::PERCENTILE_DISC_FUNC: return true; default: return false; } } + bool only_single_element_order_list() const + { + switch (window_func()->sum_func()){ + case Item_sum::PERCENTILE_CONT_FUNC: + case Item_sum::PERCENTILE_DISC_FUNC: + return true; + default: + return false; + } + } + + void setting_handler_for_percentile_functions(Item_result rtype) const + { + switch (window_func()->sum_func()){ + case Item_sum::PERCENTILE_DISC_FUNC: + ((Item_sum_percentile_disc* ) window_func())->set_handler_by_cmp_type(rtype); + break; + default: + return; + } + } + + bool check_result_type_of_order_item(); + + + /* Computation functions. TODO: consoder merging these with class Group_bound_tracker. 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/lex.h b/sql/lex.h index 68c98a95a7b..f0ee16dea57 100644 --- a/sql/lex.h +++ b/sql/lex.h @@ -706,6 +706,7 @@ static SYMBOL symbols[] = { { "WHILE", SYM(WHILE_SYM)}, { "WINDOW", SYM(WINDOW_SYM)}, { "WITH", SYM(WITH)}, + { "WITHIN", SYM(WITHIN)}, { "WITHOUT", SYM(WITHOUT)}, { "WORK", SYM(WORK_SYM)}, { "WRAPPER", SYM(WRAPPER_SYM)}, @@ -742,12 +743,15 @@ static SYMBOL sql_functions[] = { { "LAG", SYM(LAG_SYM)}, { "LEAD", SYM(LEAD_SYM)}, { "MAX", SYM(MAX_SYM)}, + { "MEDIAN", SYM(MEDIAN_SYM)}, { "MID", SYM(SUBSTRING)}, /* unireg function */ { "MIN", SYM(MIN_SYM)}, { "NTH_VALUE", SYM(NTH_VALUE_SYM)}, { "NTILE", SYM(NTILE_SYM)}, { "POSITION", SYM(POSITION_SYM)}, { "PERCENT_RANK", SYM(PERCENT_RANK_SYM)}, + { "PERCENTILE_CONT", SYM(PERCENTILE_CONT_SYM)}, + { "PERCENTILE_DISC", SYM(PERCENTILE_DISC_SYM)}, { "RANK", SYM(RANK_SYM)}, { "ROW_NUMBER", SYM(ROW_NUMBER_SYM)}, { "SESSION_USER", SYM(USER_SYM)}, 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 14cfc7e9e5a..c1b7192d254 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 */ @@ -2167,15 +2168,15 @@ static void mysqld_exit(int exit_code) shutdown_performance_schema(); // we do it as late as possible #endif set_malloc_size_cb(NULL); - if (!opt_debugging && !my_disable_leak_check) + if (opt_endinfo && global_status_var.global_memory_used) + fprintf(stderr, "Warning: Memory not freed: %ld\n", + (long) global_status_var.global_memory_used); + if (!opt_debugging && !my_disable_leak_check && exit_code == 0) { DBUG_SLOW_ASSERT(global_status_var.global_memory_used == 0); } cleanup_tls(); DBUG_LEAVE; - if (opt_endinfo && global_status_var.global_memory_used) - fprintf(stderr, "Warning: Memory not freed: %ld\n", - (long) global_status_var.global_memory_used); sd_notify(0, "STATUS=MariaDB server is down"); exit(exit_code); /* purecov: inspected */ } @@ -4068,6 +4069,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()) @@ -6128,6 +6131,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 @@ -8533,6 +8539,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}, @@ -8623,6 +8630,10 @@ SHOW_VAR status_vars[]= { {"Subquery_cache_miss", (char*) &subquery_cache_miss, SHOW_LONG}, {"Table_locks_immediate", (char*) &locks_immediate, SHOW_LONG}, {"Table_locks_waited", (char*) &locks_waited, SHOW_LONG}, + {"Table_open_cache_active_instances", (char*) &tc_active_instances, SHOW_UINT}, + {"Table_open_cache_hits", (char*) offsetof(STATUS_VAR, table_open_cache_hits), SHOW_LONGLONG_STATUS}, + {"Table_open_cache_misses", (char*) offsetof(STATUS_VAR, table_open_cache_misses), SHOW_LONGLONG_STATUS}, + {"Table_open_cache_overflows", (char*) offsetof(STATUS_VAR, table_open_cache_overflows), SHOW_LONGLONG_STATUS}, #ifdef HAVE_MMAP {"Tc_log_max_pages_used", (char*) &tc_log_max_pages_used, SHOW_LONG}, {"Tc_log_page_size", (char*) &tc_log_page_size, SHOW_LONG_NOFLUSH}, @@ -10181,104 +10192,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}; @@ -10292,6 +10309,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}; @@ -10322,6 +10340,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, @@ -10332,6 +10351,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, @@ -10358,6 +10379,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, @@ -10371,6 +10393,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, @@ -10382,6 +10405,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 6f5550d20ae..34e0aaed687 100644 --- a/sql/mysqld.h +++ b/sql/mysqld.h @@ -461,6 +461,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; @@ -475,6 +476,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; @@ -530,6 +536,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 6dc5e08152c..b6378685268 100644 --- a/sql/opt_subselect.cc +++ b/sql/opt_subselect.cc @@ -1065,6 +1065,8 @@ bool convert_join_subqueries_to_semijoins(JOIN *join) DBUG_RETURN(1); if (subq_sel->handle_derived(thd->lex, DT_MERGE)) DBUG_RETURN(TRUE); + if (subq_sel->join->transform_in_predicates_into_in_subq(thd)) + DBUG_RETURN(TRUE); subq_sel->update_used_tables(); } @@ -1642,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; @@ -1783,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); @@ -1942,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);); @@ -1994,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 a5b8a639b2f..be0c621d2cc 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." @@ -7786,6 +7786,20 @@ ER_COMPRESSED_COLUMN_USED_AS_KEY eng "Compressed column '%-.192s' can't be used in key specification" ER_UNKNOWN_COMPRESSION_METHOD eng "Unknown compression method: %s" +ER_WRONG_NUMBER_OF_VALUES_IN_TVC + eng "The used table value constructor has a different number of values" +ER_FIELD_REFERENCE_IN_TVC + eng "Field reference '%-.192s' can't be used in table value constructor" +ER_NOT_SINGLE_ELEMENT_ORDER_LIST + eng "Incorrect number of elements in the order list for '%s'" +ER_WRONG_TYPE_FOR_PERCENTILE_FUNC + eng "Numeric datatype is required for %s function" +ER_ARGUMENT_NOT_CONSTANT + eng "Argument to the %s function is not a constant for a partition" +ER_ARGUMENT_OUT_OF_RANGE + eng "Argument to the %s function does not belong to the range [0,1]" +ER_WRONG_TYPE_OF_ARGUMENT + eng "%s function only accepts arguments that can be converted to numerical types" # MariaDB error numbers related to System Versioning diff --git a/sql/sp_head.cc b/sql/sp_head.cc index 1fb780528c8..bd02762f5ab 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); @@ -3126,7 +3125,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.cc b/sql/sql_class.cc index 65d9afcf509..076bd40af51 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -1733,6 +1733,9 @@ void add_to_status(STATUS_VAR *to_var, STATUS_VAR *from_var) to_var->binlog_bytes_written+= from_var->binlog_bytes_written; to_var->cpu_time+= from_var->cpu_time; to_var->busy_time+= from_var->busy_time; + to_var->table_open_cache_hits+= from_var->table_open_cache_hits; + to_var->table_open_cache_misses+= from_var->table_open_cache_misses; + to_var->table_open_cache_overflows+= from_var->table_open_cache_overflows; /* Update global_memory_used. We have to do this with atomic_add as the @@ -1784,6 +1787,12 @@ void add_diff_to_status(STATUS_VAR *to_var, STATUS_VAR *from_var, dec_var->binlog_bytes_written; to_var->cpu_time+= from_var->cpu_time - dec_var->cpu_time; to_var->busy_time+= from_var->busy_time - dec_var->busy_time; + to_var->table_open_cache_hits+= from_var->table_open_cache_hits - + dec_var->table_open_cache_hits; + to_var->table_open_cache_misses+= from_var->table_open_cache_misses - + dec_var->table_open_cache_misses; + to_var->table_open_cache_overflows+= from_var->table_open_cache_overflows - + dec_var->table_open_cache_overflows; /* We don't need to accumulate memory_used as these are not reset or used by diff --git a/sql/sql_class.h b/sql/sql_class.h index 1ef3ca21471..8809b35e2de 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; @@ -702,6 +701,7 @@ typedef struct system_variables uint idle_write_transaction_timeout; uint column_compression_threshold; uint column_compression_zlib_level; + ulong in_subquery_conversion_threshold; st_vers_current_time vers_current_time; my_bool vers_force; @@ -829,10 +829,14 @@ typedef struct system_status_var ulonglong rows_sent; ulonglong rows_tmp_read; ulonglong binlog_bytes_written; + ulonglong table_open_cache_hits; + ulonglong table_open_cache_misses; + ulonglong table_open_cache_overflows; double last_query_cost; 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; @@ -2251,12 +2255,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 @@ -6271,6 +6276,64 @@ inline bool lex_string_eq(const LEX_CSTRING *a, return strcasecmp(a->str, b->str) != 0; } +class Type_holder: public Sql_alloc, + public Item_args, + public Type_handler_hybrid_field_type, + public Type_all_attributes, + public Type_geometry_attributes +{ + TYPELIB *m_typelib; + bool m_maybe_null; +public: + Type_holder() + :m_typelib(NULL), + m_maybe_null(false) + { } + + void set_maybe_null(bool maybe_null_arg) { m_maybe_null= maybe_null_arg; } + bool get_maybe_null() const { return m_maybe_null; } + + uint decimal_precision() const + { + /* + Type_holder is not used directly to create fields, so + its virtual decimal_precision() is never called. + We should eventually extend create_result_table() to accept + an array of Type_holders directly, without having to allocate + Item_type_holder's and put them into List<Item>. + */ + DBUG_ASSERT(0); + return 0; + } + void set_geometry_type(uint type) + { + Type_geometry_attributes::set_geometry_type(type); + } + uint uint_geometry_type() const + { + return Type_geometry_attributes::get_geometry_type(); + } + void set_typelib(TYPELIB *typelib) + { + m_typelib= typelib; + } + TYPELIB *get_typelib() const + { + return m_typelib; + } + + bool aggregate_attributes(THD *thd) + { + for (uint i= 0; i < arg_count; i++) + m_maybe_null|= args[i]->maybe_null; + return + type_handler()->Item_hybrid_func_fix_attributes(thd, + "UNION", this, this, + args, arg_count); + } +}; + + class ScopedStatementReplication { public: 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 39502a6637c..ae9322ec256 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -292,6 +292,8 @@ 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); + bool truncate_history= table_list->vers_conditions; if (truncate_history) { @@ -325,7 +327,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; @@ -593,7 +594,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()) { @@ -625,6 +625,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()) { @@ -650,6 +652,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 c8aa8702329..2c75d901f34 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 9debb07aa9f..39bb9fcd48b 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)); @@ -3429,7 +3429,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_lex.cc b/sql/sql_lex.cc index e4b0877e2d7..e70edbe326b 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -1308,7 +1308,7 @@ int MYSQLlex(YYSTYPE *yylval, THD *thd) { Lex_input_stream *lip= & thd->m_parser_state->m_lip; int token; - + if (lip->lookahead_token >= 0) { /* @@ -1374,6 +1374,24 @@ int MYSQLlex(YYSTYPE *yylval, THD *thd) return FOR_SYM; } break; + case VALUES: + if (thd->lex->current_select->parsing_place == IN_UPDATE_ON_DUP_KEY || + thd->lex->current_select->parsing_place == IN_PART_FUNC) + return VALUE_SYM; + token= lex_one_token(yylval, thd); + lip->add_digest_token(token, yylval); + switch(token) { + case LESS_SYM: + return VALUES_LESS_SYM; + case IN_SYM: + return VALUES_IN_SYM; + default: + lip->lookahead_yylval= lip->yylval; + lip->yylval= NULL; + lip->lookahead_token= token; + return VALUES; + } + break; default: break; } @@ -2250,6 +2268,8 @@ void st_select_lex::init_query() m_agg_func_used= false; window_specs.empty(); window_funcs.empty(); + tvc= 0; + in_tvc= false; } void st_select_lex::init_select() @@ -2287,6 +2307,10 @@ void st_select_lex::init_select() with_dep= 0; join= 0; lock_type= TL_READ_DEFAULT; + tvc= 0; + in_funcs.empty(); + curr_tvc_name= 0; + in_tvc= false; vers_import_outer= false; vers_export_outer.empty(); } @@ -4207,6 +4231,22 @@ bool SELECT_LEX::merge_subquery(THD *thd, TABLE_LIST *derived, if (in_subq->emb_on_expr_nest == NO_JOIN_NEST) in_subq->emb_on_expr_nest= derived; } + + uint cnt= sizeof(expr_cache_may_be_used)/sizeof(bool); + for (uint i= 0; i < cnt; i++) + { + if (subq_select->expr_cache_may_be_used[i]) + expr_cache_may_be_used[i]= true; + } + + List_iterator_fast<Item_func_in> it(subq_select->in_funcs); + Item_func_in *in_func; + while ((in_func= it++)) + { + in_funcs.push_back(in_func, thd->mem_root); + if (in_func->emb_on_expr_nest == NO_JOIN_NEST) + in_func->emb_on_expr_nest= derived; + } } /* Walk through child's tables and adjust table map, tablenr, diff --git a/sql/sql_lex.h b/sql/sql_lex.h index 48afd2246bf..6e10bc4df94 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -30,7 +30,7 @@ #include "sql_window.h" #include "sql_trigger.h" #include "sp.h" // enum stored_procedure_type - +#include "sql_tvc.h" /* YACC and LEX Definitions */ @@ -756,7 +756,7 @@ public: { return reinterpret_cast<st_select_lex*>(slave); } - void set_with_clause(With_clause *with_cl); + inline void set_with_clause(With_clause *with_cl); st_select_lex_unit* next_unit() { return reinterpret_cast<st_select_lex_unit*>(next); @@ -882,6 +882,17 @@ public: those converted to jtbm nests. The list is emptied when conversion is done. */ List<Item_in_subselect> sj_subselects; + /* + List of IN-predicates in this st_select_lex that + can be transformed into IN-subselect defined with TVC. + */ + List<Item_func_in> in_funcs; + /* + Number of current derived table made with TVC during the + transformation of IN-predicate into IN-subquery for this + st_select_lex. + */ + uint curr_tvc_name; /* Needed to correctly generate 'PRIMARY' or 'SIMPLE' for select_type column @@ -1018,6 +1029,9 @@ public: /* it is for correct printing SELECT options */ thr_lock_type lock_type; + + table_value_constr *tvc; + bool in_tvc; /* System Versioning */ vers_select_conds_t vers_export_outer; @@ -1201,7 +1215,7 @@ public: void set_non_agg_field_used(bool val) { m_non_agg_field_used= val; } void set_agg_func_used(bool val) { m_agg_func_used= val; } - void set_with_clause(With_clause *with_clause); + inline void set_with_clause(With_clause *with_clause); With_clause *get_with_clause() { return master_unit()->with_clause; @@ -1239,7 +1253,7 @@ public: ORDER *find_common_window_func_partition_fields(THD *thd); bool cond_pushdown_is_allowed() const - { return !olap && !explicit_limit; } + { return !olap && !explicit_limit && !tvc; } private: bool m_non_agg_field_used; @@ -1263,7 +1277,12 @@ typedef class st_select_lex SELECT_LEX; inline bool st_select_lex_unit::is_unit_op () { if (!first_select()->next_select()) - return 0; + { + if (first_select()->tvc) + return 1; + else + return 0; + } enum sub_select_type linkage= first_select()->next_select()->linkage; return linkage == UNION_TYPE || linkage == INTERSECT_TYPE || 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 20c0ea7a528..590fe245d7d 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -2376,7 +2376,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) @@ -6286,10 +6286,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); @@ -6299,12 +6303,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"); @@ -6322,6 +6327,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(); } @@ -6331,6 +6337,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. */ @@ -6358,6 +6365,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; @@ -6641,7 +6650,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_priv.h b/sql/sql_priv.h index db75dc2198b..b3b041a3602 100644 --- a/sql/sql_priv.h +++ b/sql/sql_priv.h @@ -352,6 +352,8 @@ enum enum_parsing_place IN_ON, IN_GROUP_BY, IN_ORDER_BY, + IN_UPDATE_ON_DUP_KEY, + IN_PART_FUNC, PARSING_PLACE_SIZE /* always should be the last */ }; 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 7b537bef53b..e9799a1f98f 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -1605,6 +1605,11 @@ JOIN::optimize_inner() DBUG_RETURN(TRUE); table_count= select_lex->leaf_tables.elements; } + + if (select_lex->first_cond_optimization && + transform_in_predicates_into_in_subq(thd)) + DBUG_RETURN(1); + // Update used tables after all handling derived table procedures select_lex->update_used_tables(); @@ -2664,6 +2669,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 @@ -2693,6 +2768,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; @@ -2879,29 +2955,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 || @@ -2929,6 +2982,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) @@ -3118,60 +3203,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) @@ -14633,7 +14669,7 @@ Item *eliminate_item_equal(THD *thd, COND *cond, COND_EQUAL *upper_levels, equals on top level, or the constant. */ Item *head_item= (!item_const && current_sjm && - current_sjm_head != field_item) ? current_sjm_head: head; + current_sjm_head != field_item) ? current_sjm_head: head; Item *head_real_item= head_item->real_item(); if (head_real_item->type() == Item::FIELD_ITEM) head_item= head_real_item; @@ -26076,6 +26112,12 @@ void TABLE_LIST::print(THD *thd, table_map eliminated_tables, String *str, void st_select_lex::print(THD *thd, String *str, enum_query_type query_type) { DBUG_ASSERT(thd); + + if (tvc) + { + tvc->print(thd, str, query_type); + return; + } if ((query_type & QT_SHOW_SELECT_NUMBER) && thd->lex->all_selects_list && diff --git a/sql/sql_select.h b/sql/sql_select.h index b57452f8934..4902f99e4ec 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; @@ -1676,6 +1678,7 @@ public: bool inject_cond_into_where(Item *injected_cond); bool push_splitting_cond_into_derived(THD *thd, Item *cond); bool improve_chosen_plan(THD *thd); + bool transform_in_predicates_into_in_subq(THD *thd); private: /** Create a temporary table to be used for processing DISTINCT/ORDER @@ -1707,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 4b28b0d18da..d5e0218bfc5 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -95,7 +95,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") }, @@ -1004,7 +1003,7 @@ find_files(THD *thd, Dynamic_array<LEX_CSTRING*> *files, LEX_CSTRING *db, if (ha_discover_table_names(thd, db, dirp, &tl, false)) goto err; } -#if 1 // TODO: MDEV-13049: #if MYSQL_VERSION_ID < 100300 +#if MYSQL_VERSION_ID < 100300 /* incomplete optimization, but a less drastic change in GA version */ if (!thd->lex->select_lex.order_list.elements && !thd->lex->select_lex.group_list.elements) @@ -1012,6 +1011,17 @@ find_files(THD *thd, Dynamic_array<LEX_CSTRING*> *files, LEX_CSTRING *db, if (is_show_command(thd)) #endif tl.sort(); +#ifndef DBUG_OFF + else + { + /* + sort_desc() is used to find easier unstable mtr tests that query + INFORMATION_SCHEMA.{SCHEMATA|TABLES} without a proper ORDER BY. + This can be removed in some release after 10.3 (e.g. in 10.4). + */ + tl.sort_desc(); + } +#endif DBUG_PRINT("info",("found: %zu files", files->elements())); my_dirend(dirp); @@ -3147,17 +3157,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(); } /* @@ -3180,14 +3190,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)) { @@ -4348,14 +4358,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; @@ -4986,8 +4997,11 @@ int get_all_tables(THD *thd, TABLE_LIST *tables, COND *cond) uint table_open_method= tables->table_open_method; bool can_deadlock; Dynamic_array<String> all_archive_tables; + 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 @@ -5023,7 +5037,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, @@ -5052,6 +5066,10 @@ int get_all_tables(THD *thd, TABLE_LIST *tables, COND *cond) if (get_all_archive_tables(thd, all_archive_tables)) 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); @@ -5140,12 +5158,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); } } } @@ -5155,6 +5174,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); } @@ -9184,6 +9204,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 d6b4522fd50..3d0d93d2abd 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -8797,7 +8797,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_tvc.cc b/sql/sql_tvc.cc new file mode 100644 index 00000000000..8c8e132746e --- /dev/null +++ b/sql/sql_tvc.cc @@ -0,0 +1,855 @@ +/* Copyright (c) 2017, MariaDB + + 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 Foundation; version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ + +#include "mariadb.h" +#include "sql_list.h" +#include "sql_tvc.h" +#include "sql_class.h" +#include "opt_range.h" +#include "sql_select.h" +#include "sql_explain.h" +#include "sql_parse.h" +#include "sql_cte.h" + +/** + @brief + Fix fields for TVC values + + @param + @param thd The context of the statement + @param li The iterator on the list of lists + + @details + Call fix_fields procedure for TVC values. + + @retval + true if an error was reported + false otherwise +*/ + +bool fix_fields_for_tvc(THD *thd, List_iterator_fast<List_item> &li) +{ + DBUG_ENTER("fix_fields_for_tvc"); + List_item *lst; + li.rewind(); + + while ((lst= li++)) + { + List_iterator_fast<Item> it(*lst); + Item *item; + + while ((item= it++)) + { + if (item->fix_fields(thd, 0)) + DBUG_RETURN(true); + } + } + DBUG_RETURN(false); +} + + +/** + @brief + Defines types of matrix columns elements where matrix rows are defined by + some lists of values. + + @param + @param thd The context of the statement + @param li The iterator on the list of lists + @param holders The structure where types of matrix columns are stored + @param first_list_el_count Count of the list values. It should be the same + for each list of lists elements. It contains + number of elements of the first list from list of + lists. + + @details + For each list list_a from list of lists the procedure gets its elements + types and aggregates them with the previous ones stored in holders. If + list_a is the first one in the list of lists its elements types are put in + holders. The errors can be reported when count of list_a elements is + different from the first_list_el_count. Also error can be reported whe + n aggregation can't be made. + + @retval + true if an error was reported + false otherwise +*/ + +bool join_type_handlers_for_tvc(THD *thd, List_iterator_fast<List_item> &li, + Type_holder *holders, uint first_list_el_count) +{ + DBUG_ENTER("join_type_handlers_for_tvc"); + List_item *lst; + li.rewind(); + bool first= true; + + while ((lst= li++)) + { + List_iterator_fast<Item> it(*lst); + Item *item; + + if (first_list_el_count != lst->elements) + { + my_message(ER_WRONG_NUMBER_OF_VALUES_IN_TVC, + ER_THD(thd, ER_WRONG_NUMBER_OF_VALUES_IN_TVC), + MYF(0)); + DBUG_RETURN(true); + } + for (uint pos= 0; (item=it++); pos++) + { + const Type_handler *item_type_handler= item->real_type_handler(); + if (first) + holders[pos].set_handler(item_type_handler); + else if (holders[pos].aggregate_for_result(item_type_handler)) + { + my_error(ER_ILLEGAL_PARAMETER_DATA_TYPES2_FOR_OPERATION, MYF(0), + holders[pos].type_handler()->name().ptr(), + item_type_handler->name().ptr(), + "TABLE VALUE CONSTRUCTOR"); + DBUG_RETURN(true); + } + } + first= false; + } + DBUG_RETURN(false); +} + + +/** + @brief + Define attributes of matrix columns elements where matrix rows are defined + by some lists of values. + + @param + @param thd The context of the statement + @param li The iterator on the list of lists + @param holders The structure where names of matrix columns are stored + @param count_of_lists Count of list of lists elements + @param first_list_el_count Count of the list values. It should be the same + for each list of lists elements. It contains + number of elements of the first list from list + of lists. + + @details + For each list list_a from list of lists the procedure gets its elements + attributes and aggregates them with the previous ones stored in holders. + The errors can be reported when aggregation can't be made. + + @retval + true if an error was reported + false otherwise +*/ + +bool get_type_attributes_for_tvc(THD *thd, + List_iterator_fast<List_item> &li, + Type_holder *holders, uint count_of_lists, + uint first_list_el_count) +{ + DBUG_ENTER("get_type_attributes_for_tvc"); + List_item *lst; + li.rewind(); + + for (uint pos= 0; pos < first_list_el_count; pos++) + { + if (holders[pos].alloc_arguments(thd, count_of_lists)) + DBUG_RETURN(true); + } + + while ((lst= li++)) + { + List_iterator_fast<Item> it(*lst); + Item *item; + for (uint holder_pos= 0 ; (item= it++); holder_pos++) + { + DBUG_ASSERT(item->fixed); + holders[holder_pos].add_argument(item); + } + } + + for (uint pos= 0; pos < first_list_el_count; pos++) + { + if (holders[pos].aggregate_attributes(thd)) + DBUG_RETURN(true); + } + DBUG_RETURN(false); +} + + +/** + @brief + Prepare of TVC + + @param + @param thd The context of the statement + @param sl The select where this TVC is defined + @param tmp_result Structure that contains the information + about where to send the result of the query + @param unit_arg The union where sl is defined + + @details + Gets types and attributes of values of this TVC that will be used + for temporary table creation for this TVC. It creates Item_type_holders + for each element of the first list from list of lists (VALUES from tvc), + using its elements name, defined type and attribute. + + @retval + true if an error was reported + false otherwise +*/ + +bool table_value_constr::prepare(THD *thd, SELECT_LEX *sl, + select_result *tmp_result, + st_select_lex_unit *unit_arg) +{ + DBUG_ENTER("table_value_constr::prepare"); + select_lex->in_tvc= true; + List_iterator_fast<List_item> li(lists_of_values); + + List_item *first_elem= li++; + uint cnt= first_elem->elements; + Type_holder *holders; + + if (fix_fields_for_tvc(thd, li)) + DBUG_RETURN(true); + + if (!(holders= new (thd->mem_root) + Type_holder[cnt]) || + join_type_handlers_for_tvc(thd, li, holders, + cnt) || + get_type_attributes_for_tvc(thd, li, holders, + lists_of_values.elements, cnt)) + DBUG_RETURN(true); + + List_iterator_fast<Item> it(*first_elem); + Item *item; + + sl->item_list.empty(); + for (uint pos= 0; (item= it++); pos++) + { + /* Error's in 'new' will be detected after loop */ + Item_type_holder *new_holder= new (thd->mem_root) + Item_type_holder(thd, + &item->name, + holders[pos].type_handler(), + &holders[pos]/*Type_all_attributes*/, + holders[pos].get_maybe_null()); + new_holder->fix_fields(thd, 0); + sl->item_list.push_back(new_holder); + } + + if (thd->is_fatal_error) + DBUG_RETURN(true); // out of memory + + result= tmp_result; + + if (result && result->prepare(sl->item_list, unit_arg)) + DBUG_RETURN(true); + + select_lex->in_tvc= false; + DBUG_RETURN(false); +} + + +/** + Save Query Plan Footprint +*/ + +int table_value_constr::save_explain_data_intern(THD *thd, + Explain_query *output) +{ + const char *message= "No tables used"; + DBUG_ENTER("table_value_constr::save_explain_data_intern"); + DBUG_PRINT("info", ("Select %p, type %s, message %s", + select_lex, select_lex->type, + message)); + DBUG_ASSERT(have_query_plan == QEP_AVAILABLE); + + /* There should be no attempts to save query plans for merged selects */ + DBUG_ASSERT(!select_lex->master_unit()->derived || + select_lex->master_unit()->derived->is_materialized_derived() || + select_lex->master_unit()->derived->is_with_table()); + + explain= new (output->mem_root) Explain_select(output->mem_root, + thd->lex->analyze_stmt); + select_lex->set_explain_type(true); + + explain->select_id= select_lex->select_number; + explain->select_type= select_lex->type; + explain->linkage= select_lex->linkage; + explain->using_temporary= NULL; + explain->using_filesort= NULL; + /* Setting explain->message means that all other members are invalid */ + explain->message= message; + + if (select_lex->master_unit()->derived) + explain->connection_type= Explain_node::EXPLAIN_NODE_DERIVED; + + output->add_node(explain); + + if (select_lex->is_top_level_node()) + output->query_plan_ready(); + + DBUG_RETURN(0); +} + + +/** + Optimization of TVC +*/ + +void table_value_constr::optimize(THD *thd) +{ + create_explain_query_if_not_exists(thd->lex, thd->mem_root); + have_query_plan= QEP_AVAILABLE; + + if (select_lex->select_number != UINT_MAX && + select_lex->select_number != INT_MAX /* this is not a UNION's "fake select */ && + have_query_plan != QEP_NOT_PRESENT_YET && + thd->lex->explain && // for "SET" command in SPs. + (!thd->lex->explain->get_select(select_lex->select_number))) + { + save_explain_data_intern(thd, thd->lex->explain); + } +} + + +/** + Execute of TVC +*/ + +bool table_value_constr::exec(SELECT_LEX *sl) +{ + DBUG_ENTER("table_value_constr::exec"); + List_iterator_fast<List_item> li(lists_of_values); + List_item *elem; + + if (select_options & SELECT_DESCRIBE) + DBUG_RETURN(false); + + if (result->send_result_set_metadata(sl->item_list, + Protocol::SEND_NUM_ROWS | + Protocol::SEND_EOF)) + { + DBUG_RETURN(true); + } + + while ((elem= li++)) + { + result->send_data(*elem); + } + + if (result->send_eof()) + DBUG_RETURN(true); + + DBUG_RETURN(false); +} + + +/** + @brief + Print list + + @param str The reference on the string representation of the list + @param list The list that needed to be print + @param query_type The mode of printing + + @details + The method saves a string representation of list in the + string str. +*/ + +void print_list_item(String *str, List_item *list, + enum_query_type query_type) +{ + bool is_first_elem= true; + List_iterator_fast<Item> it(*list); + Item *item; + + str->append('('); + + while ((item= it++)) + { + if (is_first_elem) + is_first_elem= false; + else + str->append(','); + + item->print(str, query_type); + } + + str->append(')'); +} + + +/** + @brief + Print this TVC + + @param thd The context of the statement + @param str The reference on the string representation of this TVC + @param query_type The mode of printing + + @details + The method saves a string representation of this TVC in the + string str. +*/ + +void table_value_constr::print(THD *thd, String *str, + enum_query_type query_type) +{ + DBUG_ASSERT(thd); + + str->append(STRING_WITH_LEN("values ")); + + bool is_first_elem= true; + List_iterator_fast<List_item> li(lists_of_values); + List_item *list; + + while ((list= li++)) + { + if (is_first_elem) + is_first_elem= false; + else + str->append(','); + + print_list_item(str, list, query_type); + } +} + + +/** + @brief + Create list of lists for TVC from the list of this IN predicate + + @param thd The context of the statement + @param values TVC list of values + + @details + The method uses the list of values of this IN predicate to build + an equivalent list of values that can be used in TVC. + + E.g.: + + <value_list> = 5,2,7 + <transformed_value_list> = (5),(2),(7) + + <value_list> = (5,2),(7,1) + <transformed_value_list> = (5,2),(7,1) + + @retval + false if the method succeeds + true otherwise +*/ + +bool Item_func_in::create_value_list_for_tvc(THD *thd, + List< List<Item> > *values) +{ + bool is_list_of_rows= args[1]->type() == Item::ROW_ITEM; + + for (uint i=1; i < arg_count; i++) + { + List<Item> *tvc_value; + if (!(tvc_value= new (thd->mem_root) List<Item>())) + return true; + + if (is_list_of_rows) + { + Item_row *row_list= (Item_row *)(args[i]); + + for (uint j=0; j < row_list->cols(); j++) + { + if (tvc_value->push_back(row_list->element_index(j), + thd->mem_root)) + return true; + } + } + else if (tvc_value->push_back(args[i])) + return true; + + if (values->push_back(tvc_value, thd->mem_root)) + return true; + } + return false; +} + + +/** + @brief + Create name for the derived table defined by TVC + + @param thd The context of the statement + @param parent_select The SELECT where derived table is used + @param alias The returned created name + + @details + Create name for the derived table using current TVC number + for this parent_select stored in parent_select + + @retval + true if creation fails + false otherwise +*/ + +static bool create_tvc_name(THD *thd, st_select_lex *parent_select, + LEX_CSTRING *alias) +{ + char buff[6]; + + alias->length= my_snprintf(buff, sizeof(buff), + "tvc_%u", parent_select->curr_tvc_name); + alias->str= thd->strmake(buff, alias->length); + if (!alias->str) + return true; + + return false; +} + + +bool Item_subselect::wrap_tvc_in_derived_table(THD *thd, + st_select_lex *tvc_sl) +{ + LEX *lex= thd->lex; + /* SELECT_LEX object where the transformation is performed */ + SELECT_LEX *parent_select= lex->current_select; + uint8 save_derived_tables= lex->derived_tables; + + Query_arena backup; + Query_arena *arena= thd->activate_stmt_arena_if_needed(&backup); + + /* + Create SELECT_LEX of the subquery SQ used in the result of transformation + */ + lex->current_select= tvc_sl; + if (mysql_new_select(lex, 0, NULL)) + goto err; + mysql_init_select(lex); + /* Create item list as '*' for the subquery SQ */ + Item *item; + SELECT_LEX *sq_select; // select for IN subquery; + sq_select= lex->current_select; + sq_select->linkage= tvc_sl->linkage; + sq_select->parsing_place= SELECT_LIST; + item= new (thd->mem_root) Item_field(thd, &sq_select->context, + NULL, NULL, &star_clex_str); + if (item == NULL || add_item_to_list(thd, item)) + goto err; + (sq_select->with_wild)++; + + /* Exclude SELECT with TVC */ + tvc_sl->exclude(); + /* + Create derived table DT that will wrap TVC in the result of transformation + */ + SELECT_LEX *tvc_select; // select for tvc + SELECT_LEX_UNIT *derived_unit; // unit for tvc_select + if (mysql_new_select(lex, 1, tvc_sl)) + goto err; + tvc_select= lex->current_select; + derived_unit= tvc_select->master_unit(); + tvc_select->linkage= DERIVED_TABLE_TYPE; + + lex->current_select= sq_select; + + /* + Create the name of the wrapping derived table and + add it to the FROM list of the subquery SQ + */ + Table_ident *ti; + LEX_CSTRING alias; + TABLE_LIST *derived_tab; + if (!(ti= new (thd->mem_root) Table_ident(derived_unit)) || + create_tvc_name(thd, parent_select, &alias)) + goto err; + if (!(derived_tab= + sq_select->add_table_to_list(thd, + ti, &alias, 0, + TL_READ, MDL_SHARED_READ))) + goto err; + sq_select->add_joined_table(derived_tab); + sq_select->add_where_field(derived_unit->first_select()); + sq_select->context.table_list= sq_select->table_list.first; + sq_select->context.first_name_resolution_table= sq_select->table_list.first; + sq_select->table_list.first->derived_type= DTYPE_TABLE | DTYPE_MATERIALIZE; + lex->derived_tables|= DERIVED_SUBQUERY; + + sq_select->where= 0; + sq_select->set_braces(false); + derived_unit->set_with_clause(0); + + if (engine->engine_type() == subselect_engine::SINGLE_SELECT_ENGINE) + ((subselect_single_select_engine *) engine)->change_select(sq_select); + + if (arena) + thd->restore_active_arena(arena, &backup); + lex->current_select= sq_select; + return false; + +err: + if (arena) + thd->restore_active_arena(arena, &backup); + lex->derived_tables= save_derived_tables; + lex->current_select= parent_select; + return true; +} + + +/** + @brief + Transform IN predicate into IN subquery + + @param thd The context of the statement + @param arg Not used + + @details + The method transforms this IN predicate into in equivalent IN subquery: + + <left_expr> IN (<value_list>) + => + <left_expr> IN (SELECT * FROM (VALUES <transformed_value_list>) AS tvc_#) + + E.g.: + + <value_list> = 5,2,7 + <transformed_value_list> = (5),(2),(7) + + <value_list> = (5,2),(7,1) + <transformed_value_list> = (5,2),(7,1) + + If the transformation succeeds the method returns the result IN subquery, + otherwise this IN predicate is returned. + + @retval + pointer to the result of transformation if succeeded + pointer to this IN predicate otherwise +*/ + +Item *Item_func_in::in_predicate_to_in_subs_transformer(THD *thd, + uchar *arg) +{ + if (!transform_into_subq) + return this; + + transform_into_subq= false; + + List<List_item> values; + + LEX *lex= thd->lex; + /* SELECT_LEX object where the transformation is performed */ + SELECT_LEX *parent_select= lex->current_select; + uint8 save_derived_tables= lex->derived_tables; + + for (uint i=1; i < arg_count; i++) + { + if (!args[i]->const_item()) + return this; + } + + Query_arena backup; + Query_arena *arena= thd->activate_stmt_arena_if_needed(&backup); + + /* + Create SELECT_LEX of the subquery SQ used in the result of transformation + */ + if (mysql_new_select(lex, 1, NULL)) + goto err; + mysql_init_select(lex); + /* Create item list as '*' for the subquery SQ */ + Item *item; + SELECT_LEX *sq_select; // select for IN subquery; + sq_select= lex->current_select; + sq_select->parsing_place= SELECT_LIST; + item= new (thd->mem_root) Item_field(thd, &sq_select->context, + NULL, NULL, &star_clex_str); + if (item == NULL || add_item_to_list(thd, item)) + goto err; + (sq_select->with_wild)++; + /* + Create derived table DT that will wrap TVC in the result of transformation + */ + SELECT_LEX *tvc_select; // select for tvc + SELECT_LEX_UNIT *derived_unit; // unit for tvc_select + if (mysql_new_select(lex, 1, NULL)) + goto err; + mysql_init_select(lex); + tvc_select= lex->current_select; + derived_unit= tvc_select->master_unit(); + tvc_select->linkage= DERIVED_TABLE_TYPE; + + /* Create TVC used in the transformation */ + if (create_value_list_for_tvc(thd, &values)) + goto err; + if (!(tvc_select->tvc= + new (thd->mem_root) + table_value_constr(values, + tvc_select, + tvc_select->options))) + goto err; + + lex->current_select= sq_select; + + /* + Create the name of the wrapping derived table and + add it to the FROM list of the subquery SQ + */ + Table_ident *ti; + LEX_CSTRING alias; + TABLE_LIST *derived_tab; + if (!(ti= new (thd->mem_root) Table_ident(derived_unit)) || + create_tvc_name(thd, parent_select, &alias)) + goto err; + if (!(derived_tab= + sq_select->add_table_to_list(thd, + ti, &alias, 0, + TL_READ, MDL_SHARED_READ))) + goto err; + sq_select->add_joined_table(derived_tab); + sq_select->add_where_field(derived_unit->first_select()); + sq_select->context.table_list= sq_select->table_list.first; + sq_select->context.first_name_resolution_table= sq_select->table_list.first; + sq_select->table_list.first->derived_type= DTYPE_TABLE | DTYPE_MATERIALIZE; + lex->derived_tables|= DERIVED_SUBQUERY; + + sq_select->where= 0; + sq_select->set_braces(false); + derived_unit->set_with_clause(0); + + /* Create IN subquery predicate */ + sq_select->parsing_place= parent_select->parsing_place; + Item_in_subselect *in_subs; + Item *sq; + if (!(in_subs= + new (thd->mem_root) Item_in_subselect(thd, args[0], sq_select))) + goto err; + sq= in_subs; + if (negated) + sq= negate_expression(thd, in_subs); + else + in_subs->emb_on_expr_nest= emb_on_expr_nest; + + if (arena) + thd->restore_active_arena(arena, &backup); + thd->lex->current_select= parent_select; + + if (sq->fix_fields(thd, (Item **)&sq)) + goto err; + + parent_select->curr_tvc_name++; + return sq; + +err: + if (arena) + thd->restore_active_arena(arena, &backup); + lex->derived_tables= save_derived_tables; + thd->lex->current_select= parent_select; + return NULL; +} + + +/** + @brief + Check if this IN-predicate can be transformed in IN-subquery + with TVC + + @param thd The context of the statement + + @details + Compare the number of elements in the list of + values in this IN-predicate with the + in_subquery_conversion_threshold special variable + + @retval + true if transformation can be made + false otherwise +*/ + +bool Item_func_in::to_be_transformed_into_in_subq(THD *thd) +{ + uint values_count= arg_count-1; + + if (args[1]->type() == Item::ROW_ITEM) + values_count*= ((Item_row *)(args[1]))->cols(); + + if (values_count < thd->variables.in_subquery_conversion_threshold) + return false; + + return true; +} + + +/** + @brief + Transform IN predicates into IN subqueries in WHERE and ON expressions + + @param thd The context of the statement + + @details + For each IN predicate from AND parts of the WHERE condition and/or + ON expressions of the SELECT for this join the method performs + the intransformation into an equivalent IN sunquery if it's needed. + + @retval + false always +*/ + +bool JOIN::transform_in_predicates_into_in_subq(THD *thd) +{ + DBUG_ENTER("JOIN::transform_in_predicates_into_in_subq"); + if (!select_lex->in_funcs.elements) + DBUG_RETURN(false); + + SELECT_LEX *save_current_select= thd->lex->current_select; + enum_parsing_place save_parsing_place= select_lex->parsing_place; + thd->lex->current_select= select_lex; + if (conds) + { + select_lex->parsing_place= IN_WHERE; + conds= + conds->transform(thd, + &Item::in_predicate_to_in_subs_transformer, + (uchar*) 0); + if (!conds) + DBUG_RETURN(true); + select_lex->prep_where= conds ? conds->copy_andor_structure(thd) : 0; + select_lex->where= conds; + } + + if (join_list) + { + TABLE_LIST *table; + List_iterator<TABLE_LIST> li(*join_list); + select_lex->parsing_place= IN_ON; + + while ((table= li++)) + { + if (table->on_expr) + { + table->on_expr= + table->on_expr->transform(thd, + &Item::in_predicate_to_in_subs_transformer, + (uchar*) 0); + if (!table->on_expr) + DBUG_RETURN(true); + table->prep_on_expr= table->on_expr ? + table->on_expr->copy_andor_structure(thd) : 0; + } + } + } + + select_lex->in_funcs.empty(); + select_lex->parsing_place= save_parsing_place; + thd->lex->current_select= save_current_select; + DBUG_RETURN(false); +} + diff --git a/sql/sql_tvc.h b/sql/sql_tvc.h new file mode 100644 index 00000000000..b4fca78262b --- /dev/null +++ b/sql/sql_tvc.h @@ -0,0 +1,65 @@ +/* Copyright (c) 2017, MariaDB + + 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 Foundation; version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ + +#ifndef SQL_TVC_INCLUDED +#define SQL_TVC_INCLUDED +#include "sql_type.h" +#include "item.h" + +typedef List<Item> List_item; +class select_result; + +class Explain_select; +class Explain_query; +class Item_func_in; + +/** + @class table_value_constr + @brief Definition of a Table Value Construction(TVC) + + It contains a list of lists of values which this TVC is defined by and + reference on SELECT where this TVC is defined. +*/ +class table_value_constr : public Sql_alloc +{ +public: + List<List_item> lists_of_values; + select_result *result; + SELECT_LEX *select_lex; + + enum { QEP_NOT_PRESENT_YET, QEP_AVAILABLE} have_query_plan; + + Explain_select *explain; + ulonglong select_options; + + table_value_constr(List<List_item> tvc_values, SELECT_LEX *sl, + ulonglong select_options_arg) : + lists_of_values(tvc_values), result(0), select_lex(sl), + have_query_plan(QEP_NOT_PRESENT_YET), explain(0), + select_options(select_options_arg) + { }; + + bool prepare(THD *thd_arg, SELECT_LEX *sl, + select_result *tmp_result, + st_select_lex_unit *unit_arg); + + int save_explain_data_intern(THD *thd_arg, + Explain_query *output); + void optimize(THD *thd_arg); + bool exec(SELECT_LEX *sl); + + void print(THD *thd_arg, String *str, enum_query_type query_type); +}; +#endif /* SQL_TVC_INCLUDED */ diff --git a/sql/sql_union.cc b/sql/sql_union.cc index 362837834f2..8cce7f33057 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -693,64 +693,6 @@ bool st_select_lex_unit::prepare_join(THD *thd_arg, SELECT_LEX *sl, } -class Type_holder: public Sql_alloc, - public Item_args, - public Type_handler_hybrid_field_type, - public Type_all_attributes, - public Type_geometry_attributes -{ - TYPELIB *m_typelib; - bool m_maybe_null; -public: - Type_holder() - :m_typelib(NULL), - m_maybe_null(false) - { } - - void set_maybe_null(bool maybe_null_arg) { m_maybe_null= maybe_null_arg; } - bool get_maybe_null() const { return m_maybe_null; } - - uint decimal_precision() const - { - /* - Type_holder is not used directly to create fields, so - its virtual decimal_precision() is never called. - We should eventually extend create_result_table() to accept - an array of Type_holders directly, without having to allocate - Item_type_holder's and put them into List<Item>. - */ - DBUG_ASSERT(0); - return 0; - } - void set_geometry_type(uint type) - { - Type_geometry_attributes::set_geometry_type(type); - } - uint uint_geometry_type() const - { - return Type_geometry_attributes::get_geometry_type(); - } - void set_typelib(TYPELIB *typelib) - { - m_typelib= typelib; - } - TYPELIB *get_typelib() const - { - return m_typelib; - } - - bool aggregate_attributes(THD *thd) - { - for (uint i= 0; i < arg_count; i++) - m_maybe_null|= args[i]->maybe_null; - return - type_handler()->Item_hybrid_func_fix_attributes(thd, - "UNION", this, this, - args, arg_count); - } -}; - - /** Aggregate data type handlers for the "count" leftmost UNION parts. */ @@ -771,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), @@ -889,6 +825,7 @@ bool st_select_lex_unit::prepare(THD *thd_arg, select_result *sel_result, bool is_union_select; bool have_except= FALSE, have_intersect= FALSE; bool instantiate_tmp_table= false; + bool single_tvc= !first_sl->next_select() && first_sl->tvc; DBUG_ENTER("st_select_lex_unit::prepare"); DBUG_ASSERT(thd == thd_arg); DBUG_ASSERT(thd == current_thd); @@ -915,16 +852,26 @@ bool st_select_lex_unit::prepare(THD *thd_arg, select_result *sel_result, /* fast reinit for EXPLAIN */ for (sl= first_sl; sl; sl= sl->next_select()) { - sl->join->result= result; - select_limit_cnt= HA_POS_ERROR; - offset_limit_cnt= 0; - if (!sl->join->procedure && - result->prepare(sl->join->fields_list, this)) + if (sl->tvc) { - DBUG_RETURN(TRUE); + sl->tvc->result= result; + if (result->prepare(sl->item_list, this)) + DBUG_RETURN(TRUE); + sl->tvc->select_options|= SELECT_DESCRIBE; + } + else + { + sl->join->result= result; + select_limit_cnt= HA_POS_ERROR; + offset_limit_cnt= 0; + if (!sl->join->procedure && + result->prepare(sl->join->fields_list, this)) + { + DBUG_RETURN(TRUE); + } + sl->join->select_options|= SELECT_DESCRIBE; + sl->join->reinit(); } - sl->join->select_options|= SELECT_DESCRIBE; - sl->join->reinit(); } } DBUG_RETURN(FALSE); @@ -934,7 +881,7 @@ bool st_select_lex_unit::prepare(THD *thd_arg, select_result *sel_result, thd_arg->lex->current_select= sl= first_sl; found_rows_for_union= first_sl->options & OPTION_FOUND_ROWS; - is_union_select= is_unit_op() || fake_select_lex; + is_union_select= is_unit_op() || fake_select_lex || single_tvc; for (SELECT_LEX *s= first_sl; s; s= s->next_select()) { @@ -954,8 +901,8 @@ bool st_select_lex_unit::prepare(THD *thd_arg, select_result *sel_result, if (is_union_select || is_recursive) { - if (is_unit_op() && !union_needs_tmp_table() && - !have_except && !have_intersect) + if ((is_unit_op() && !union_needs_tmp_table() && + !have_except && !have_intersect) || single_tvc) { SELECT_LEX *last= first_select(); while (last->next_select()) @@ -990,7 +937,12 @@ bool st_select_lex_unit::prepare(THD *thd_arg, select_result *sel_result, if (!is_union_select && !is_recursive) { - if (prepare_join(thd_arg, first_sl, tmp_result, additional_options, + if (sl->tvc) + { + if (sl->tvc->prepare(thd_arg, sl, tmp_result, this)) + goto err; + } + else if (prepare_join(thd_arg, first_sl, tmp_result, additional_options, is_union_select)) goto err; types= first_sl->item_list; @@ -999,8 +951,13 @@ bool st_select_lex_unit::prepare(THD *thd_arg, select_result *sel_result, for (;sl; sl= sl->next_select(), union_part_count++) { - if (prepare_join(thd_arg, sl, tmp_result, additional_options, - is_union_select)) + if (sl->tvc) + { + if (sl->tvc->prepare(thd_arg, sl, tmp_result, this)) + goto err; + } + else if (prepare_join(thd_arg, sl, tmp_result, additional_options, + is_union_select)) goto err; /* @@ -1025,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)) @@ -1296,11 +1263,11 @@ bool st_select_lex_unit::optimize() { item->assigned(0); // We will reinit & rexecute unit item->reset(); - if (table->is_created()) - { - table->file->ha_delete_all_rows(); - table->file->info(HA_STATUS_VARIABLE); - } + } + if (table->is_created()) + { + table->file->ha_delete_all_rows(); + table->file->info(HA_STATUS_VARIABLE); } /* re-enabling indexes for next subselect iteration */ if (union_distinct && table->file->ha_enable_indexes(HA_KEY_SWITCH_ALL)) @@ -1310,6 +1277,14 @@ bool st_select_lex_unit::optimize() } for (SELECT_LEX *sl= select_cursor; sl; sl= sl->next_select()) { + if (sl->tvc) + { + sl->tvc->select_options= + (select_limit_cnt == HA_POS_ERROR || sl->braces) ? + sl->options & ~OPTION_FOUND_ROWS : sl->options | found_rows_for_union; + sl->tvc->optimize(thd); + continue; + } thd->lex->current_select= sl; if (optimized) @@ -1333,7 +1308,7 @@ bool st_select_lex_unit::optimize() we don't calculate found_rows() per union part. Otherwise, SQL_CALC_FOUND_ROWS should be done on all sub parts. */ - sl->join->select_options= + sl->join->select_options= (select_limit_cnt == HA_POS_ERROR || sl->braces) ? sl->options & ~OPTION_FOUND_ROWS : sl->options | found_rows_for_union; @@ -1417,15 +1392,28 @@ bool st_select_lex_unit::exec() we don't calculate found_rows() per union part. Otherwise, SQL_CALC_FOUND_ROWS should be done on all sub parts. */ - sl->join->select_options= - (select_limit_cnt == HA_POS_ERROR || sl->braces) ? - sl->options & ~OPTION_FOUND_ROWS : sl->options | found_rows_for_union; - saved_error= sl->join->optimize(); + if (sl->tvc) + { + sl->tvc->select_options= + (select_limit_cnt == HA_POS_ERROR || sl->braces) ? + sl->options & ~OPTION_FOUND_ROWS : sl->options | found_rows_for_union; + sl->tvc->optimize(thd); + } + else + { + sl->join->select_options= + (select_limit_cnt == HA_POS_ERROR || sl->braces) ? + sl->options & ~OPTION_FOUND_ROWS : sl->options | found_rows_for_union; + saved_error= sl->join->optimize(); + } } if (!saved_error) { records_at_start= table->file->stats.records; - sl->join->exec(); + if (sl->tvc) + sl->tvc->exec(sl); + else + sl->join->exec(); if (sl == union_distinct && !(with_element && with_element->is_recursive)) { // This is UNION DISTINCT, so there should be a fake_select_lex @@ -1434,7 +1422,8 @@ bool st_select_lex_unit::exec() DBUG_RETURN(TRUE); table->no_keyread=1; } - saved_error= sl->join->error; + if (!sl->tvc) + saved_error= sl->join->error; offset_limit_cnt= (ha_rows)(sl->offset_limit ? sl->offset_limit->val_uint() : 0); @@ -1664,8 +1653,13 @@ bool st_select_lex_unit::exec_recursive() for (st_select_lex *sl= start ; sl != end; sl= sl->next_select()) { thd->lex->current_select= sl; - sl->join->exec(); - saved_error= sl->join->error; + if (sl->tvc) + sl->tvc->exec(sl); + else + { + sl->join->exec(); + saved_error= sl->join->error; + } if (!saved_error) { examined_rows+= thd->get_examined_row_count(); diff --git a/sql/sql_update.cc b/sql/sql_update.cc index e019d0f6ac4..e6a906a43c1 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -323,12 +323,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()) @@ -730,7 +730,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(); @@ -758,6 +757,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) { if (table->versioned() && !table->vers_end_field()->is_max()) diff --git a/sql/sql_view.cc b/sql/sql_view.cc index 0b7f8f50ea3..9fc64761d72 100644 --- a/sql/sql_view.cc +++ b/sql/sql_view.cc @@ -847,7 +847,6 @@ expli_table_err: 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/sql_window.cc b/sql/sql_window.cc index d22fff9d486..4bcdca3ca11 100644 --- a/sql/sql_window.cc +++ b/sql/sql_window.cc @@ -321,6 +321,12 @@ setup_windows(THD *thd, Ref_ptr_array ref_pointer_array, TABLE_LIST *tables, win_func_item->update_used_tables(); } + li.rewind(); + while ((win_func_item= li++)) + { + if (win_func_item->check_result_type_of_order_item()) + DBUG_RETURN(1); + } DBUG_RETURN(0); } @@ -968,6 +974,8 @@ private: bool end_of_partition; }; + + ///////////////////////////////////////////////////////////////////////////// /* @@ -1735,7 +1743,17 @@ public: /* Walk to the end of the partition, find how many rows there are. */ while (!cursor.next()) num_rows_in_partition++; + set_win_funcs_row_count(num_rows_in_partition); + } + ha_rows get_curr_rownum() const + { + return cursor.get_rownum(); + } + +protected: + void set_win_funcs_row_count(ha_rows num_rows_in_partition) + { List_iterator_fast<Item_sum> it(sum_functions); Item_sum* item; while ((item= it++)) @@ -1745,11 +1763,43 @@ public: item_with_row_count->set_row_count(num_rows_in_partition); } } +}; + +class Frame_unbounded_following_set_count_no_nulls: + public Frame_unbounded_following_set_count +{ + +public: + Frame_unbounded_following_set_count_no_nulls(THD *thd, + SQL_I_List<ORDER> *partition_list, + SQL_I_List<ORDER> *order_list) : + Frame_unbounded_following_set_count(thd,partition_list, order_list) + { + order_item= order_list->first->item[0]; + } + void next_partition(ha_rows rownum) + { + ha_rows num_rows_in_partition= 0; + if (cursor.fetch()) + return; + + /* Walk to the end of the partition, find how many rows there are. */ + do + { + if (!order_item->is_null()) + num_rows_in_partition++; + } while (!cursor.next()); + + set_win_funcs_row_count(num_rows_in_partition); + } ha_rows get_curr_rownum() const { return cursor.get_rownum(); } + +private: + Item* order_item; }; ///////////////////////////////////////////////////////////////////////////// @@ -2490,6 +2540,21 @@ void add_special_frame_cursors(THD *thd, Cursor_manager *cursor_manager, cursor_manager->add_cursor(fc); break; } + case Item_sum::PERCENTILE_CONT_FUNC: + case Item_sum::PERCENTILE_DISC_FUNC: + { + fc= new Frame_unbounded_preceding(thd, + spec->partition_list, + spec->order_list); + fc->add_sum_func(item_sum); + cursor_manager->add_cursor(fc); + fc= new Frame_unbounded_following(thd, + spec->partition_list, + spec->order_list); + fc->add_sum_func(item_sum); + cursor_manager->add_cursor(fc); + break; + } default: fc= new Frame_unbounded_preceding( thd, spec->partition_list, spec->order_list); @@ -2514,6 +2579,8 @@ static bool is_computed_with_remove(Item_sum::Sumfunctype sum_func) case Item_sum::NTILE_FUNC: case Item_sum::FIRST_VALUE_FUNC: case Item_sum::LAST_VALUE_FUNC: + case Item_sum::PERCENTILE_CONT_FUNC: + case Item_sum::PERCENTILE_DISC_FUNC: return false; default: return true; @@ -2544,9 +2611,18 @@ void get_window_functions_required_cursors( */ if (item_win_func->requires_partition_size()) { - fc= new Frame_unbounded_following_set_count(thd, + if (item_win_func->only_single_element_order_list()) + { + fc= new Frame_unbounded_following_set_count_no_nulls(thd, + item_win_func->window_spec->partition_list, + item_win_func->window_spec->order_list); + } + else + { + fc= new Frame_unbounded_following_set_count(thd, item_win_func->window_spec->partition_list, item_win_func->window_spec->order_list); + } fc->add_sum_func(sum_func); cursor_manager->add_cursor(fc); } @@ -2727,6 +2803,13 @@ bool compute_window_func(THD *thd, { cursor_manager->notify_cursors_next_row(); } + + /* Check if we found any error in the window function while adding values + through cursors. */ + if (thd->is_error() || thd->is_killed()) + break; + + /* Return to current row after notifying cursors for each window function. */ tbl->file->ha_rnd_pos(tbl->record[0], rowid_buf); diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 22dfacc59d8..ce4af53d995 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -67,6 +67,7 @@ #include "lex_token.h" #include "sql_lex.h" #include "sql_sequence.h" +#include "sql_tvc.h" #include "vers_utils.h" /* this is to get the bison compilation windows warnings out */ @@ -1244,6 +1245,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize); %token MAX_STATEMENT_TIME_SYM %token MAX_USER_CONNECTIONS_SYM %token MAXVALUE_SYM /* SQL-2003-N */ +%token MEDIAN_SYM %token MEDIUMBLOB %token MEDIUMINT %token MEDIUMTEXT @@ -1336,6 +1338,8 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize); %token PARTITIONING_SYM %token PASSWORD_SYM %token PERCENT_RANK_SYM +%token PERCENTILE_CONT_SYM +%token PERCENTILE_DISC_SYM %token PERIOD_SYM /* 32N2439 */ %token PERSISTENT_SYM %token PHASE_SYM @@ -1565,6 +1569,8 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize); %token UTC_TIMESTAMP_SYM %token UTC_TIME_SYM %token VALUES /* SQL-2003-R */ +%token VALUES_IN_SYM +%token VALUES_LESS_SYM %token VALUE_SYM /* SQL-2003-R */ %token VARBINARY %token VARCHAR /* SQL-2003-R */ @@ -1586,6 +1592,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize); %token WINDOW_SYM %token WHILE_SYM %token WITH /* SQL-2003-R */ +%token WITHIN %token WITHOUT /* SQL-2003-R */ %token WITH_CUBE_SYM /* INTERNAL */ %token WITH_ROLLUP_SYM /* INTERNAL */ @@ -1747,6 +1754,9 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize); window_func_expr window_func simple_window_func + inverse_distribution_function + percentile_function + inverse_distribution_function_def function_call_keyword function_call_nonkeyword function_call_generic @@ -1797,7 +1807,9 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize); table_primary_ident table_primary_derived select_derived derived_table_list select_derived_union + derived_simple_table derived_query_specification + derived_table_value_constructor %type <date_time_type> date_time_type; %type <interval> interval @@ -1838,11 +1850,13 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize); %type <select_lex> subselect get_select_lex get_select_lex_derived + simple_table query_specification query_term_union_not_ready query_term_union_ready query_expression_body select_paren_derived + table_value_constructor %type <boolfunc2creator> comp_op @@ -1967,7 +1981,6 @@ END_OF_INPUT %type <spvar_definition> row_field_name row_field_definition %type <spvar_definition_list> row_field_definition_list row_type_body - %type <NONE> opt_window_clause window_def_list window_def window_spec %type <lex_str_ptr> window_name %type <NONE> opt_window_ref opt_window_frame_clause @@ -4973,8 +4986,15 @@ part_type_def: { Lex->part_info->part_type= RANGE_PARTITION; } | RANGE_SYM part_column_list { Lex->part_info->part_type= RANGE_PARTITION; } - | LIST_SYM part_func - { Lex->part_info->part_type= LIST_PARTITION; } + | LIST_SYM + { + Select->parsing_place= IN_PART_FUNC; + } + part_func + { + Lex->part_info->part_type= LIST_PARTITION; + Select->parsing_place= NO_MATTER; + } | LIST_SYM part_column_list { Lex->part_info->part_type= LIST_PARTITION; } | SYSTEM_TIME_SYM @@ -5229,7 +5249,7 @@ opt_part_values: else part_info->part_type= HASH_PARTITION; } - | VALUES LESS_SYM THAN_SYM + | VALUES_LESS_SYM THAN_SYM { LEX *lex= Lex; partition_info *part_info= lex->part_info; @@ -5243,7 +5263,7 @@ opt_part_values: part_info->part_type= RANGE_PARTITION; } part_func_max {} - | VALUES IN_SYM + | VALUES_IN_SYM { LEX *lex= Lex; partition_info *part_info= lex->part_info; @@ -8727,6 +8747,9 @@ select: select_init: SELECT_SYM select_options_and_item_list select_init3 + | table_value_constructor + | table_value_constructor union_list + | table_value_constructor union_order_or_limit | '(' select_paren ')' | '(' select_paren ')' union_list | '(' select_paren ')' union_order_or_limit @@ -8734,6 +8757,9 @@ select_init: union_list_part2: SELECT_SYM select_options_and_item_list select_init3_union_query_term + | table_value_constructor + | table_value_constructor union_list + | table_value_constructor union_order_or_limit | '(' select_paren_union_query_term ')' | '(' select_paren_union_query_term ')' union_list | '(' select_paren_union_query_term ')' union_order_or_limit @@ -8741,6 +8767,14 @@ union_list_part2: select_paren: { + Lex->current_select->set_braces(true); + } + table_value_constructor + { + DBUG_ASSERT(Lex->current_select->braces); + } + | + { /* In order to correctly parse UNION's global ORDER BY we need to set braces before parsing the clause. @@ -8792,6 +8826,15 @@ select_paren_derived: { Lex->current_select->set_braces(true); } + table_value_constructor + { + DBUG_ASSERT(Lex->current_select->braces); + $$= Lex->current_select->master_unit()->first_select(); + } + | + { + Lex->current_select->set_braces(true); + } SELECT_SYM select_part2_derived opt_table_expression opt_order_clause @@ -9704,6 +9747,7 @@ column_default_non_parenthesized_expr: | variable | sum_expr | window_func_expr + | inverse_distribution_function | ROW_SYM '(' expr ',' expr_list ')' { $5->push_front($3, thd->mem_root); @@ -9788,7 +9832,7 @@ column_default_non_parenthesized_expr: if ($$ == NULL) MYSQL_YYABORT; } - | VALUES '(' simple_ident_nospvar ')' + | VALUE_SYM '(' simple_ident_nospvar ')' { $$= new (thd->mem_root) Item_insert_value(thd, Lex->current_context(), $3); @@ -10562,6 +10606,11 @@ geometry_function: Geometry::wkb_polygon, Geometry::wkb_linestring)); } + | WITHIN '(' expr ',' expr ')' + { + $$= GEOM_NEW(thd, Item_func_spatial_precise_rel(thd, $3, $5, + Item_func::SP_WITHIN_FUNC)); + } ; /* @@ -11023,6 +11072,71 @@ simple_window_func: } ; + + +inverse_distribution_function: + percentile_function OVER_SYM + '(' opt_window_partition_clause ')' + { + LEX *lex= Lex; + if (Select->add_window_spec(thd, lex->win_ref, + Select->group_list, + Select->order_list, + NULL)) + MYSQL_YYABORT; + $$= new (thd->mem_root) Item_window_func(thd, (Item_sum *) $1, + thd->lex->win_spec); + if ($$ == NULL) + MYSQL_YYABORT; + if (Select->add_window_func((Item_window_func *) $$)) + MYSQL_YYABORT; + } + ; + +percentile_function: + inverse_distribution_function_def WITHIN GROUP_SYM '(' + { Select->prepare_add_window_spec(thd); } + order_by_single_element_list ')' + { + $$= $1; + } + | MEDIAN_SYM '(' expr ')' + { + Item *args= new (thd->mem_root) Item_decimal(thd, "0.5", 3, + thd->charset()); + if (($$ == NULL) || (thd->is_error())) + { + MYSQL_YYABORT; + } + if (add_order_to_list(thd, $3,FALSE)) MYSQL_YYABORT; + + $$= new (thd->mem_root) Item_sum_percentile_cont(thd, args); + if ($$ == NULL) + MYSQL_YYABORT; + } + ; + +inverse_distribution_function_def: + PERCENTILE_CONT_SYM '(' expr ')' + { + $$= new (thd->mem_root) Item_sum_percentile_cont(thd, $3); + if ($$ == NULL) + MYSQL_YYABORT; + } + | PERCENTILE_DISC_SYM '(' expr ')' + { + $$= new (thd->mem_root) Item_sum_percentile_disc(thd, $3); + if ($$ == NULL) + MYSQL_YYABORT; + } + ; + +order_by_single_element_list: + ORDER_SYM BY order_ident order_dir + { if (add_order_to_list(thd, $3,(bool) $4)) MYSQL_YYABORT; } + ; + + window_name: ident { @@ -11591,9 +11705,9 @@ select_derived_union: } } union_list_derived_part2 - | derived_query_specification opt_select_lock_type - | derived_query_specification order_or_limit opt_select_lock_type - | derived_query_specification opt_select_lock_type union_list_derived + | derived_simple_table opt_select_lock_type + | derived_simple_table order_or_limit opt_select_lock_type + | derived_simple_table opt_select_lock_type union_list_derived ; union_list_derived_part2: @@ -11648,6 +11762,10 @@ select_derived: } ; +derived_simple_table: + derived_query_specification { $$= $1; } + | derived_table_value_constructor { $$= $1; } + ; /* Similar to query_specification, but for derived tables. Example: the inner parenthesized SELECT in this query: @@ -11662,6 +11780,41 @@ derived_query_specification: } ; +derived_table_value_constructor: + VALUES + { + LEX *lex=Lex; + lex->field_list.empty(); + lex->many_values.empty(); + lex->insert_list=0; + } + values_list + { + LEX *lex= Lex; + lex->derived_tables|= DERIVED_SUBQUERY; + if (!lex->expr_allows_subselect || + lex->sql_command == (int)SQLCOM_PURGE) + { + thd->parse_error(); + MYSQL_YYABORT; + } + if (lex->current_select->linkage == GLOBAL_OPTIONS_TYPE || + mysql_new_select(lex, 1, NULL)) + MYSQL_YYABORT; + mysql_init_select(lex); + lex->current_select->linkage= DERIVED_TABLE_TYPE; + + if (!(lex->current_select->tvc= + new (lex->thd->mem_root) table_value_constr(lex->many_values, + lex->current_select, + lex->current_select->options))) + MYSQL_YYABORT; + lex->many_values.empty(); + $$= NULL; + } + ; + + select_derived2: { LEX *lex= Lex; @@ -12967,7 +13120,14 @@ expr_or_default: opt_insert_update: /* empty */ | ON DUPLICATE_SYM { Lex->duplicates= DUP_UPDATE; } - KEY_SYM UPDATE_SYM insert_update_list + KEY_SYM UPDATE_SYM + { + Select->parsing_place= IN_UPDATE_ON_DUP_KEY; + } + insert_update_list + { + Select->parsing_place= NO_MATTER; + } ; /* Update rows in a table */ @@ -14936,6 +15096,7 @@ keyword: | UNICODE_SYM {} | UNINSTALL_SYM {} | UNBOUNDED_SYM {} + | WITHIN {} | WRAPPER_SYM {} | XA_SYM {} | UPGRADE_SYM {} @@ -16603,6 +16764,31 @@ union_option: | ALL { $$=0; } ; +simple_table: + query_specification { $$= $1; } + | table_value_constructor { $$= $1; } + ; + +table_value_constructor: + VALUES + { + LEX *lex=Lex; + lex->field_list.empty(); + lex->many_values.empty(); + lex->insert_list=0; + } + values_list + { + LEX *lex=Lex; + $$= lex->current_select; + mysql_init_select(Lex); + if (!($$->tvc= + new (lex->thd->mem_root) table_value_constr(lex->many_values, $$, $$->options))) + MYSQL_YYABORT; + lex->many_values.empty(); + } + ; + /* Corresponds to the SQL Standard <query specification> ::= @@ -16620,12 +16806,12 @@ query_specification: ; query_term_union_not_ready: - query_specification order_or_limit opt_select_lock_type { $$= $1; } + simple_table order_or_limit opt_select_lock_type { $$= $1; } | '(' select_paren_derived ')' union_order_or_limit { $$= $2; } ; query_term_union_ready: - query_specification opt_select_lock_type { $$= $1; } + simple_table opt_select_lock_type { $$= $1; } | '(' select_paren_derived ')' { $$= $2; } ; @@ -16836,6 +17022,9 @@ view_select: */ query_expression_body_view: SELECT_SYM select_options_and_item_list select_init3_view + | table_value_constructor + | table_value_constructor union_order_or_limit + | table_value_constructor union_list_view | '(' select_paren_view ')' | '(' select_paren_view ')' union_order_or_limit | '(' select_paren_view ')' union_list_view diff --git a/sql/sql_yacc_ora.yy b/sql/sql_yacc_ora.yy index b8c60ff8830..945f2e33028 100644 --- a/sql/sql_yacc_ora.yy +++ b/sql/sql_yacc_ora.yy @@ -646,6 +646,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize); %token MAX_STATEMENT_TIME_SYM %token MAX_USER_CONNECTIONS_SYM %token MAXVALUE_SYM /* SQL-2003-N */ +%token MEDIAN_SYM %token MEDIUMBLOB %token MEDIUMINT %token MEDIUMTEXT @@ -738,6 +739,8 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize); %token PARTITIONING_SYM %token PASSWORD_SYM %token PERCENT_RANK_SYM +%token PERCENTILE_CONT_SYM +%token PERCENTILE_DISC_SYM %token PERIOD_SYM /* 32N2439 */ %token PERSISTENT_SYM %token PHASE_SYM @@ -967,6 +970,8 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize); %token UTC_TIMESTAMP_SYM %token UTC_TIME_SYM %token VALUES /* SQL-2003-R */ +%token VALUES_IN_SYM +%token VALUES_LESS_SYM %token VALUE_SYM /* SQL-2003-R */ %token VARBINARY %token VARCHAR /* SQL-2003-R */ @@ -988,6 +993,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize); %token WINDOW_SYM %token WHILE_SYM %token WITH /* SQL-2003-R */ +%token WITHIN %token WITHOUT /* SQL-2003-R */ %token WITH_CUBE_SYM /* INTERNAL */ %token WITH_ROLLUP_SYM /* INTERNAL */ @@ -1154,6 +1160,9 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize); window_func_expr window_func simple_window_func + inverse_distribution_function + percentile_function + inverse_distribution_function_def explicit_cursor_attr function_call_keyword function_call_nonkeyword @@ -4839,8 +4848,15 @@ part_type_def: { Lex->part_info->part_type= RANGE_PARTITION; } | RANGE_SYM part_column_list { Lex->part_info->part_type= RANGE_PARTITION; } - | LIST_SYM part_func - { Lex->part_info->part_type= LIST_PARTITION; } + | LIST_SYM + { + Select->parsing_place= IN_PART_FUNC; + } + part_func + { + Lex->part_info->part_type= LIST_PARTITION; + Select->parsing_place= NO_MATTER; + } | LIST_SYM part_column_list { Lex->part_info->part_type= LIST_PARTITION; } ; @@ -5090,7 +5106,7 @@ opt_part_values: else part_info->part_type= HASH_PARTITION; } - | VALUES LESS_SYM THAN_SYM + | VALUES_LESS_SYM THAN_SYM { LEX *lex= Lex; partition_info *part_info= lex->part_info; @@ -5104,7 +5120,7 @@ opt_part_values: part_info->part_type= RANGE_PARTITION; } part_func_max {} - | VALUES IN_SYM + | VALUES_IN_SYM { LEX *lex= Lex; partition_info *part_info= lex->part_info; @@ -9396,6 +9412,7 @@ column_default_non_parenthesized_expr: | variable | sum_expr | window_func_expr + | inverse_distribution_function | ROW_SYM '(' expr ',' expr_list ')' { $5->push_front($3, thd->mem_root); @@ -9498,7 +9515,7 @@ column_default_non_parenthesized_expr: if ($$ == NULL) MYSQL_YYABORT; } - | VALUES '(' simple_ident_nospvar ')' + | VALUE_SYM '(' simple_ident_nospvar ')' { $$= new (thd->mem_root) Item_insert_value(thd, Lex->current_context(), $3); @@ -10724,6 +10741,67 @@ simple_window_func: MYSQL_YYABORT; } ; +inverse_distribution_function: + percentile_function OVER_SYM + '(' opt_window_partition_clause ')' + { + LEX *lex= Lex; + if (Select->add_window_spec(thd, lex->win_ref, + Select->group_list, + Select->order_list, + NULL)) + MYSQL_YYABORT; + $$= new (thd->mem_root) Item_window_func(thd, (Item_sum *) $1, + thd->lex->win_spec); + if ($$ == NULL) + MYSQL_YYABORT; + if (Select->add_window_func((Item_window_func *) $$)) + MYSQL_YYABORT; + } + ; + +percentile_function: + inverse_distribution_function_def WITHIN GROUP_SYM '(' + { Select->prepare_add_window_spec(thd); } + order_by_single_element_list ')' + { + $$= $1; + } + | MEDIAN_SYM '(' expr ')' + { + Item *args= new (thd->mem_root) Item_decimal(thd, "0.5", 3, + thd->charset()); + if (($$ == NULL) || (thd->is_error())) + { + MYSQL_YYABORT; + } + if (add_order_to_list(thd, $3,FALSE)) MYSQL_YYABORT; + + $$= new (thd->mem_root) Item_sum_percentile_cont(thd, args); + if ($$ == NULL) + MYSQL_YYABORT; + } + ; + +inverse_distribution_function_def: + PERCENTILE_CONT_SYM '(' expr ')' + { + $$= new (thd->mem_root) Item_sum_percentile_cont(thd, $3); + if ($$ == NULL) + MYSQL_YYABORT; + } + | PERCENTILE_DISC_SYM '(' expr ')' + { + $$= new (thd->mem_root) Item_sum_percentile_disc(thd, $3); + if ($$ == NULL) + MYSQL_YYABORT; + } + ; + +order_by_single_element_list: + ORDER_SYM BY order_ident order_dir + { if (add_order_to_list(thd, $3,(bool) $4)) MYSQL_YYABORT; } + ; window_name: ident @@ -12688,7 +12766,14 @@ expr_or_default: opt_insert_update: /* empty */ | ON DUPLICATE_SYM { Lex->duplicates= DUP_UPDATE; } - KEY_SYM UPDATE_SYM insert_update_list + KEY_SYM UPDATE_SYM + { + Select->parsing_place= IN_UPDATE_ON_DUP_KEY; + } + insert_update_list + { + Select->parsing_place= NO_MATTER; + } ; /* Update rows in a table */ @@ -14710,6 +14795,7 @@ keyword_directly_assignable: | UNICODE_SYM {} | UNINSTALL_SYM {} | UNBOUNDED_SYM {} + | WITHIN {} | WRAPPER_SYM {} | XA_SYM {} | UPGRADE_SYM {} diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index afa4e30ba81..a677c115334 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -1343,8 +1343,8 @@ static bool update_cached_long_query_time(sys_var *self, THD *thd, static Sys_var_double Sys_long_query_time( "long_query_time", "Log all queries that have taken more than long_query_time seconds " - "to execute to file. The argument will be treated as a decimal value " - "with microsecond precision", + "to execute to the slow query log file. The argument will be treated " + "as a decimal value with microsecond precision", SESSION_VAR(long_query_time_double), CMD_LINE(REQUIRED_ARG), VALID_RANGE(0, LONG_TIMEOUT), DEFAULT(10), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), @@ -5825,3 +5825,11 @@ static Sys_var_mybool Sys_session_track_state_change( ON_UPDATE(update_session_track_state_change)); #endif //EMBEDDED_LIBRARY + +static Sys_var_ulong Sys_in_subquery_conversion_threshold( + "in_subquery_conversion_threshold", + "The minimum number of scalar elements in the value list of " + "IN predicate that triggers its conversion to IN subquery", + SESSION_VAR(in_subquery_conversion_threshold), CMD_LINE(OPT_ARG), + VALID_RANGE(0, ULONG_MAX), DEFAULT(1000), BLOCK_SIZE(1)); + diff --git a/sql/sys_vars.ic b/sql/sys_vars.ic index a302bbaa837..a42a8bcf4cf 100644 --- a/sql/sys_vars.ic +++ b/sql/sys_vars.ic @@ -2723,9 +2723,9 @@ public: { DBUG_ASSERT(false); } void global_save_default(THD *thd, set_var *var) { DBUG_ASSERT(false); } - uchar *session_value_ptr(THD *thd, const LEX_STRING *base) + uchar *session_value_ptr(THD *thd, const LEX_CSTRING *base) { return valptr(thd, session_var(thd, st_vers_current_time)); } - uchar *global_value_ptr(THD *thd, const LEX_STRING *base) + uchar *global_value_ptr(THD *thd, const LEX_CSTRING *base) { return valptr(thd, global_var(st_vers_current_time)); } uchar *default_value_ptr(THD *thd) { return (uchar *)option.def_value; } diff --git a/sql/table_cache.cc b/sql/table_cache.cc index 6067ecb059d..f55e24f3b04 100644 --- a/sql/table_cache.cc +++ b/sql/table_cache.cc @@ -56,7 +56,7 @@ ulong tdc_size; /**< Table definition cache threshold for LRU eviction. */ ulong tc_size; /**< Table cache threshold for LRU eviction. */ uint32 tc_instances; -static uint32 tc_active_instances= 1; +uint32 tc_active_instances= 1; static uint32 tc_contention_warning_reported; /** Data collections. */ @@ -369,18 +369,30 @@ void tc_add_table(THD *thd, TABLE *table) mysql_mutex_unlock(&element->LOCK_table_share); mysql_mutex_lock(&tc[i].LOCK_table_cache); - if (tc[i].records == tc_size && (LRU_table= tc[i].free_tables.pop_front())) + if (tc[i].records == tc_size) { - LRU_table->s->tdc->free_tables[i].list.remove(LRU_table); - /* Needed if MDL deadlock detector chimes in before tc_remove_table() */ - LRU_table->in_use= thd; + if ((LRU_table= tc[i].free_tables.pop_front())) + { + LRU_table->s->tdc->free_tables[i].list.remove(LRU_table); + /* Needed if MDL deadlock detector chimes in before tc_remove_table() */ + LRU_table->in_use= thd; + mysql_mutex_unlock(&tc[i].LOCK_table_cache); + /* Keep out of locked LOCK_table_cache */ + tc_remove_table(LRU_table); + } + else + { + tc[i].records++; + mysql_mutex_unlock(&tc[i].LOCK_table_cache); + } + /* Keep out of locked LOCK_table_cache */ + status_var_increment(thd->status_var.table_open_cache_overflows); } else + { tc[i].records++; - mysql_mutex_unlock(&tc[i].LOCK_table_cache); - - if (LRU_table) - tc_remove_table(LRU_table); + mysql_mutex_unlock(&tc[i].LOCK_table_cache); + } } @@ -841,7 +853,10 @@ retry: tdc_purge(false); if (out_table) + { + status_var_increment(thd->status_var.table_open_cache_misses); *out_table= 0; + } share->m_psi= PSI_CALL_get_table_share(false, share); goto end; } @@ -858,8 +873,10 @@ retry: DBUG_ASSERT(element->share); DBUG_ASSERT(!element->share->error); DBUG_ASSERT(!element->share->is_view); + status_var_increment(thd->status_var.table_open_cache_hits); DBUG_RETURN(element->share); } + status_var_increment(thd->status_var.table_open_cache_misses); } mysql_mutex_lock(&element->LOCK_table_share); diff --git a/sql/table_cache.h b/sql/table_cache.h index 2e5bb3428dc..b41665258c9 100644 --- a/sql/table_cache.h +++ b/sql/table_cache.h @@ -71,6 +71,7 @@ enum enum_tdc_remove_table_type extern ulong tdc_size; extern ulong tc_size; extern uint32 tc_instances; +extern uint32 tc_active_instances; extern bool tdc_init(void); extern void tdc_start_shutdown(void); 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/mysql-test/connect/r/infoschema-9739.result b/storage/connect/mysql-test/connect/r/infoschema-9739.result index 992f4ed0d58..2d54b578521 100644 --- a/storage/connect/mysql-test/connect/r/infoschema-9739.result +++ b/storage/connect/mysql-test/connect/r/infoschema-9739.result @@ -1,10 +1,8 @@ create table t1 (i int) engine=Connect table_type=XML option_list='xmlsup=domdoc'; Warnings: Warning 1105 No file name. Table will use t1.xml -select * from information_schema.tables where create_options like '%table_type=XML%'; +select * from information_schema.tables where table_schema='test' and create_options like '%table_type=XML%'; TABLE_CATALOG TABLE_SCHEMA TABLE_NAME TABLE_TYPE ENGINE VERSION ROW_FORMAT TABLE_ROWS AVG_ROW_LENGTH DATA_LENGTH MAX_DATA_LENGTH INDEX_LENGTH DATA_FREE AUTO_INCREMENT CREATE_TIME UPDATE_TIME CHECK_TIME TABLE_COLLATION CHECKSUM CREATE_OPTIONS TABLE_COMMENT Warnings: -Warning 1286 Unknown storage engine 'InnoDB' -Warning 1286 Unknown storage engine 'InnoDB' Warning 1296 Got error 174 'File t1.xml not found' from CONNECT drop table t1; diff --git a/storage/connect/mysql-test/connect/r/infoschema2-9739.result b/storage/connect/mysql-test/connect/r/infoschema2-9739.result index 7d8a6839ea5..0372874862d 100644 --- a/storage/connect/mysql-test/connect/r/infoschema2-9739.result +++ b/storage/connect/mysql-test/connect/r/infoschema2-9739.result @@ -3,10 +3,8 @@ Warning 1105 No file name. Table will use t1.xml create table t1 (i int) engine=Connect table_type=XML option_list='xmlsup=libxml2'; Warnings: Warning 1105 No file name. Table will use t1.xml -select * from information_schema.tables where create_options like '%table_type=XML%'; +select * from information_schema.tables where table_schema='test' and create_options like '%table_type=XML%'; TABLE_CATALOG TABLE_SCHEMA TABLE_NAME TABLE_TYPE ENGINE VERSION ROW_FORMAT TABLE_ROWS AVG_ROW_LENGTH DATA_LENGTH MAX_DATA_LENGTH INDEX_LENGTH DATA_FREE AUTO_INCREMENT CREATE_TIME UPDATE_TIME CHECK_TIME TABLE_COLLATION CHECKSUM CREATE_OPTIONS TABLE_COMMENT Warnings: -Warning 1286 Unknown storage engine 'InnoDB' -Warning 1286 Unknown storage engine 'InnoDB' Warning 1296 Got error 174 'File t1.xml not found' from CONNECT drop table t1; diff --git a/storage/connect/mysql-test/connect/t/infoschema-9739.test b/storage/connect/mysql-test/connect/t/infoschema-9739.test index de61164d10d..16f837cafcc 100644 --- a/storage/connect/mysql-test/connect/t/infoschema-9739.test +++ b/storage/connect/mysql-test/connect/t/infoschema-9739.test @@ -5,5 +5,5 @@ --source windows.inc create table t1 (i int) engine=Connect table_type=XML option_list='xmlsup=domdoc'; -select * from information_schema.tables where create_options like '%table_type=XML%'; +select * from information_schema.tables where table_schema='test' and create_options like '%table_type=XML%'; drop table t1; diff --git a/storage/connect/mysql-test/connect/t/infoschema2-9739.test b/storage/connect/mysql-test/connect/t/infoschema2-9739.test index 345274b0577..76681bc91ed 100644 --- a/storage/connect/mysql-test/connect/t/infoschema2-9739.test +++ b/storage/connect/mysql-test/connect/t/infoschema2-9739.test @@ -5,5 +5,5 @@ --source have_libxml2.inc create table t1 (i int) engine=Connect table_type=XML option_list='xmlsup=libxml2'; -select * from information_schema.tables where create_options like '%table_type=XML%'; +select * from information_schema.tables where table_schema='test' and create_options like '%table_type=XML%'; drop table t1; 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 09b0aa1996d..46a08099ee2 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -8361,7 +8361,7 @@ no_commit: innobase_srv_conc_enter_innodb(m_prebuilt); - vers_set_fields = (table->versioned() && !is_innopart() && + vers_set_fields = (table->versioned() && (sql_command != SQLCOM_CREATE_TABLE || table->s->vtmd)) ? ROW_INS_VERSIONED : @@ -9173,7 +9173,7 @@ ha_innobase::update_row( if (!table->versioned()) m_prebuilt->upd_node->versioned = false; - if (m_prebuilt->upd_node->versioned && !is_innopart()) { + if (m_prebuilt->upd_node->versioned) { vers_set_fields = true; if (thd_sql_command(m_user_thd) == SQLCOM_ALTER_TABLE && !table->s->vtmd) { @@ -9306,7 +9306,6 @@ ha_innobase::delete_row( bool vers_set_fields = table->versioned() && - !is_innopart() && table->vers_end_field()->is_max(); error = row_update_for_mysql(m_prebuilt, vers_set_fields); @@ -19722,7 +19721,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)); @@ -19866,7 +19865,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/ha_innodb.h b/storage/innobase/handler/ha_innodb.h index 90a9c0becc4..064015812e9 100644 --- a/storage/innobase/handler/ha_innodb.h +++ b/storage/innobase/handler/ha_innodb.h @@ -523,11 +523,6 @@ protected: /** If mysql has locked with external_lock() */ bool m_mysql_has_locked; - - bool is_innopart() - { - return m_share == NULL; - } }; diff --git a/storage/innobase/handler/handler0alter.cc b/storage/innobase/handler/handler0alter.cc index b8106122261..b2dca973586 100644 --- a/storage/innobase/handler/handler0alter.cc +++ b/storage/innobase/handler/handler0alter.cc @@ -77,7 +77,7 @@ static const Alter_inplace_info::HA_ALTER_FLAGS INNOBASE_ALTER_REBUILD = Alter_inplace_info::ADD_PK_INDEX | Alter_inplace_info::DROP_PK_INDEX | Alter_inplace_info::CHANGE_CREATE_OPTION - /* CHANGE_CREATE_OPTION needs to check innobase_need_rebuild() */ + /* CHANGE_CREATE_OPTION needs to check create_option_need_rebuild() */ | Alter_inplace_info::ALTER_COLUMN_NULLABLE | Alter_inplace_info::ALTER_COLUMN_NOT_NULLABLE | Alter_inplace_info::ALTER_STORED_COLUMN_ORDER @@ -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 */ @@ -445,33 +465,61 @@ innobase_spatial_exist( return(false); } -/*******************************************************************//** -Determine if ALTER TABLE needs to rebuild the table. -@param ha_alter_info the DDL operation -@param altered_table MySQL original table -@return whether it is necessary to rebuild the table */ +/** Determine if CHANGE_CREATE_OPTION requires rebuilding the table. +@param[in] ha_alter_info the ALTER TABLE operation +@param[in] table metadata before ALTER TABLE +@return whether it is mandatory to rebuild the table */ +static bool create_option_need_rebuild( + const Alter_inplace_info* ha_alter_info, + const TABLE* table) +{ + DBUG_ASSERT((ha_alter_info->handler_flags & ~INNOBASE_INPLACE_IGNORE) + == Alter_inplace_info::CHANGE_CREATE_OPTION); + + if (ha_alter_info->create_info->used_fields + & (HA_CREATE_USED_ROW_FORMAT + | HA_CREATE_USED_KEY_BLOCK_SIZE)) { + /* Specifying ROW_FORMAT or KEY_BLOCK_SIZE requires + rebuilding the table. (These attributes in the .frm + file may disagree with the InnoDB data dictionary, and + the interpretation of thse attributes depends on + InnoDB parameters. That is why we for now always + require a rebuild when these attributes are specified.) */ + return true; + } + + const ha_table_option_struct& alt_opt= + *ha_alter_info->create_info->option_struct; + const ha_table_option_struct& opt= *table->s->option_struct; + + if (alt_opt.page_compressed != opt.page_compressed + || alt_opt.page_compression_level + != opt.page_compression_level + || alt_opt.encryption != opt.encryption + || alt_opt.encryption_key_id != opt.encryption_key_id) { + return(true); + } + + return false; +} + +/** Determine if ALTER TABLE needs to rebuild the table +(or perform instant operation). +@param[in] ha_alter_info the ALTER TABLE operation +@param[in] table metadata before ALTER TABLE +@return whether it is necessary to rebuild the table or to alter columns */ static MY_ATTRIBUTE((nonnull, warn_unused_result)) bool innobase_need_rebuild( -/*==================*/ const Alter_inplace_info* ha_alter_info, - const TABLE* altered_table) + const TABLE* table) { - Alter_inplace_info::HA_ALTER_FLAGS alter_inplace_flags = - ha_alter_info->handler_flags & ~(INNOBASE_INPLACE_IGNORE); - - if (alter_inplace_flags - == Alter_inplace_info::CHANGE_CREATE_OPTION - && !(ha_alter_info->create_info->used_fields - & (HA_CREATE_USED_ROW_FORMAT - | HA_CREATE_USED_KEY_BLOCK_SIZE))) { - /* Any other CHANGE_CREATE_OPTION than changing - ROW_FORMAT or KEY_BLOCK_SIZE can be done without - rebuilding the table. */ - return(false); + if ((ha_alter_info->handler_flags & ~INNOBASE_INPLACE_IGNORE) + == Alter_inplace_info::CHANGE_CREATE_OPTION) { + return create_option_need_rebuild(ha_alter_info, table); } - return(!!(ha_alter_info->handler_flags & INNOBASE_ALTER_REBUILD)); + return !!(ha_alter_info->handler_flags & INNOBASE_ALTER_REBUILD); } /** Check if virtual column in old and new table are in order, excluding @@ -574,6 +622,53 @@ check_v_col_in_order( return(true); } +/** Determine if an instant operation is possible for altering columns. +@param[in] ha_alter_info the ALTER TABLE operation +@param[in] table table definition before ALTER TABLE */ +static +bool +instant_alter_column_possible( + const Alter_inplace_info* ha_alter_info, + const TABLE* table) +{ + if (ha_alter_info->create_info->vers_info.with_system_versioning) + return false; + + + if (~ha_alter_info->handler_flags + & Alter_inplace_info::ADD_STORED_BASE_COLUMN) { + return false; + } + + /* At the moment, we disallow ADD [UNIQUE] INDEX together with + instant ADD COLUMN. + + The main reason is that the work of instant ADD must be done + in commit_inplace_alter_table(). For the rollback_instant() + to work, we must add the columns to dict_table_t beforehand, + and roll back those changes in case the transaction is rolled + back. + + If we added the columns to the dictionary cache already in the + prepare_inplace_alter_table(), we would have to deal with + column number mismatch in ha_innobase::open(), write_row() and + other functions. */ + + /* FIXME: allow instant ADD COLUMN together with + INNOBASE_ONLINE_CREATE (ADD [UNIQUE] INDEX) on pre-existing + columns. */ + if (ha_alter_info->handler_flags + & ((INNOBASE_ALTER_REBUILD | INNOBASE_ONLINE_CREATE) + & ~Alter_inplace_info::ADD_STORED_BASE_COLUMN + & ~Alter_inplace_info::CHANGE_CREATE_OPTION)) { + return false; + } + + return !(ha_alter_info->handler_flags + & Alter_inplace_info::CHANGE_CREATE_OPTION) + || !create_option_need_rebuild(ha_alter_info, table); +} + /** Check if InnoDB supports a particular alter table in-place @param altered_table TABLE object for new version of table. @param ha_alter_info Structure describing changes to be done @@ -626,33 +721,6 @@ ha_innobase::check_if_supported_inplace_alter( update_thd(); - // FIXME: Construct ha_innobase_inplace_ctx here and determine - // if instant ALTER TABLE is possible. If yes, we will be able to - // allow ADD COLUMN even if SPATIAL INDEX, FULLTEXT INDEX or - // virtual columns exist, also together with adding virtual columns. - - /* Change on engine specific table options require rebuild of the - table */ - if (ha_alter_info->handler_flags - & Alter_inplace_info::CHANGE_CREATE_OPTION) { - ha_table_option_struct *new_options= ha_alter_info->create_info->option_struct; - ha_table_option_struct *old_options= table->s->option_struct; - - if (new_options->page_compressed != old_options->page_compressed || - new_options->page_compression_level != old_options->page_compression_level) { - ha_alter_info->unsupported_reason = innobase_get_err_msg( - ER_ALTER_OPERATION_NOT_SUPPORTED_REASON); - DBUG_RETURN(HA_ALTER_INPLACE_NOT_SUPPORTED); - } - - if (new_options->encryption != old_options->encryption || - new_options->encryption_key_id != old_options->encryption_key_id) { - ha_alter_info->unsupported_reason = innobase_get_err_msg( - ER_ALTER_OPERATION_NOT_SUPPORTED_REASON); - DBUG_RETURN(HA_ALTER_INPLACE_NOT_SUPPORTED); - } - } - if (ha_alter_info->handler_flags & ~(INNOBASE_INPLACE_IGNORE | INNOBASE_ALTER_NOREBUILD @@ -967,76 +1035,14 @@ ha_innobase::check_if_supported_inplace_alter( m_prebuilt->trx->will_lock++; - if (!online) { - /* We already determined that only a non-locking - operation is possible. */ - } else if (((ha_alter_info->handler_flags - & Alter_inplace_info::ADD_PK_INDEX) - || innobase_need_rebuild(ha_alter_info, table)) - && (innobase_fulltext_exist(altered_table) - || innobase_spatial_exist(altered_table))) { - /* Refuse to rebuild the table online, if - FULLTEXT OR SPATIAL indexes are to survive the rebuild. */ - online = false; - /* If the table already contains fulltext indexes, - refuse to rebuild the table natively altogether. */ - if (m_prebuilt->table->fts) { - ha_alter_info->unsupported_reason = innobase_get_err_msg( - ER_INNODB_FT_LIMIT); - DBUG_RETURN(HA_ALTER_INPLACE_NOT_SUPPORTED); - } - - if (innobase_spatial_exist(altered_table)) { - ha_alter_info->unsupported_reason = - innobase_get_err_msg( - ER_ALTER_OPERATION_NOT_SUPPORTED_REASON_GIS); - } else { - ha_alter_info->unsupported_reason = - innobase_get_err_msg( - ER_ALTER_OPERATION_NOT_SUPPORTED_REASON_FTS); - } - } else if ((ha_alter_info->handler_flags - & Alter_inplace_info::ADD_INDEX)) { - /* ADD FULLTEXT|SPATIAL INDEX requires a lock. - - We could do ADD FULLTEXT INDEX without a lock if the - table already contains an FTS_DOC_ID column, but in - that case we would have to apply the modification log - to the full-text indexes. - - We could also do ADD SPATIAL INDEX by implementing - row_log_apply() for it. */ - - for (uint i = 0; i < ha_alter_info->index_add_count; i++) { - const KEY* key = - &ha_alter_info->key_info_buffer[ - ha_alter_info->index_add_buffer[i]]; - if (key->flags & HA_FULLTEXT) { - DBUG_ASSERT(!(key->flags & HA_KEYFLAG_MASK - & ~(HA_FULLTEXT - | HA_PACK_KEY - | HA_GENERATED_KEY - | HA_BINARY_PACK_KEY))); - ha_alter_info->unsupported_reason = innobase_get_err_msg( - ER_ALTER_OPERATION_NOT_SUPPORTED_REASON_FTS); - online = false; - break; - } - if (key->flags & HA_SPATIAL) { - ha_alter_info->unsupported_reason = innobase_get_err_msg( - ER_ALTER_OPERATION_NOT_SUPPORTED_REASON_GIS); - online = false; - break; - } - } - } - /* When changing a NULL column to NOT NULL and specifying a DEFAULT value, ensure that the DEFAULT expression is a constant. Also, in ADD COLUMN, for now we only support a constant DEFAULT expression. */ cf_it.rewind(); Field **af = altered_table->field; + bool add_column_not_last = false; + uint n_stored_cols = 0, n_add_cols = 0; while (Create_field* cf = cf_it++) { DBUG_ASSERT(cf->field @@ -1098,6 +1104,11 @@ ha_innobase::check_if_supported_inplace_alter( } else if (!(*af)->default_value || !((*af)->default_value->flags & ~(VCOL_SESSION_FUNC | VCOL_TIME_FUNC))) { + n_add_cols++; + + if (af < &altered_table->field[table_share->fields]) { + add_column_not_last = true; + } /* The added NOT NULL column lacks a DEFAULT value, or the DEFAULT is the same for all rows. (Time functions, such as CURRENT_TIMESTAMP(), @@ -1122,10 +1133,92 @@ ha_innobase::check_if_supported_inplace_alter( DBUG_RETURN(HA_ALTER_INPLACE_NOT_SUPPORTED); next_column: - af++; + n_stored_cols += (*af++)->stored_in_db(); } - cf_it.rewind(); + if (!add_column_not_last + && uint(m_prebuilt->table->n_cols) - DATA_N_SYS_COLS + n_add_cols + == n_stored_cols + && m_prebuilt->table->supports_instant() + && instant_alter_column_possible(ha_alter_info, table)) { + /* We can perform instant ADD COLUMN, because all + columns are going to be added after existing ones + (and not after hidden InnoDB columns, such as FTS_DOC_ID). */ + + /* MDEV-14246 FIXME: return HA_ALTER_INPLACE_NO_LOCK and + perform all work in ha_innobase::commit_inplace_alter_table(), + to avoid an unnecessary MDL upgrade/downgrade cycle. */ + DBUG_RETURN(HA_ALTER_INPLACE_NO_LOCK_AFTER_PREPARE); + } + + if (!online) { + /* We already determined that only a non-locking + operation is possible. */ + } else if (((ha_alter_info->handler_flags + & Alter_inplace_info::ADD_PK_INDEX) + || innobase_need_rebuild(ha_alter_info, table)) + && (innobase_fulltext_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; + /* If the table already contains fulltext indexes, + refuse to rebuild the table natively altogether. */ + if (m_prebuilt->table->fts) { + ha_alter_info->unsupported_reason = innobase_get_err_msg( + ER_INNODB_FT_LIMIT); + DBUG_RETURN(HA_ALTER_INPLACE_NOT_SUPPORTED); + } + + if (innobase_spatial_exist(altered_table)) { + 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( + ER_ALTER_OPERATION_NOT_SUPPORTED_REASON_FTS); + } + } else if ((ha_alter_info->handler_flags + & Alter_inplace_info::ADD_INDEX)) { + /* ADD FULLTEXT|SPATIAL INDEX requires a lock. + + We could do ADD FULLTEXT INDEX without a lock if the + table already contains an FTS_DOC_ID column, but in + that case we would have to apply the modification log + to the full-text indexes. + + We could also do ADD SPATIAL INDEX by implementing + row_log_apply() for it. */ + + for (uint i = 0; i < ha_alter_info->index_add_count; i++) { + const KEY* key = + &ha_alter_info->key_info_buffer[ + ha_alter_info->index_add_buffer[i]]; + if (key->flags & HA_FULLTEXT) { + DBUG_ASSERT(!(key->flags & HA_KEYFLAG_MASK + & ~(HA_FULLTEXT + | HA_PACK_KEY + | HA_GENERATED_KEY + | HA_BINARY_PACK_KEY))); + ha_alter_info->unsupported_reason = innobase_get_err_msg( + ER_ALTER_OPERATION_NOT_SUPPORTED_REASON_FTS); + online = false; + break; + } + if (key->flags & HA_SPATIAL) { + ha_alter_info->unsupported_reason = innobase_get_err_msg( + ER_ALTER_OPERATION_NOT_SUPPORTED_REASON_GIS); + online = false; + break; + } + } + } DBUG_RETURN(online ? HA_ALTER_INPLACE_NO_LOCK_AFTER_PREPARE @@ -4705,29 +4798,6 @@ prepare_inplace_alter_table_dict( new_clustered = DICT_CLUSTERED & index_defs[0].ind_type; - if (num_fts_index > 1) { - my_error(ER_INNODB_FT_LIMIT, MYF(0)); - goto error_handled; - } - - if (!ctx->online) { - /* This is not an online operation (LOCK=NONE). */ - } else if (ctx->add_autoinc == ULINT_UNDEFINED - && num_fts_index == 0 - && (!innobase_need_rebuild(ha_alter_info, old_table) - || !innobase_fulltext_exist(altered_table))) { - /* InnoDB can perform an online operation (LOCK=NONE). */ - } else { - size_t query_length; - /* This should have been blocked in - check_if_supported_inplace_alter(). */ - ut_ad(0); - my_error(ER_NOT_SUPPORTED_YET, MYF(0), - innobase_get_stmt_unsafe(ctx->prebuilt->trx->mysql_thd, - &query_length)); - goto error_handled; - } - /* The primary index would be rebuilt if a FTS Doc ID column is to be added, and the primary index definition is just copied from old table and stored in indexdefs[0] */ @@ -5080,24 +5150,8 @@ new_clustered_failed: == !!new_clustered); } - if (ctx->need_rebuild() && ctx->new_table->supports_instant()) { - if (~ha_alter_info->handler_flags - & Alter_inplace_info::ADD_STORED_BASE_COLUMN) { - goto not_instant_add_column; - } - - if (ha_alter_info->handler_flags - & (INNOBASE_ALTER_REBUILD - & ~Alter_inplace_info::ADD_STORED_BASE_COLUMN - & ~Alter_inplace_info::CHANGE_CREATE_OPTION)) { - goto not_instant_add_column; - } - - if ((ha_alter_info->handler_flags - & Alter_inplace_info::CHANGE_CREATE_OPTION) - && (ha_alter_info->create_info->used_fields - & (HA_CREATE_USED_ROW_FORMAT - | HA_CREATE_USED_KEY_BLOCK_SIZE))) { + if (ctx->need_rebuild() && user_table->supports_instant()) { + if (!instant_alter_column_possible(ha_alter_info, old_table)) { goto not_instant_add_column; } @@ -5110,28 +5164,6 @@ new_clustered_failed: DBUG_ASSERT(ctx->new_table->n_cols > ctx->old_table->n_cols); - if (ha_alter_info->handler_flags & INNOBASE_ONLINE_CREATE) { - /* At the moment, we disallow ADD [UNIQUE] INDEX - together with instant ADD COLUMN. - - The main reason is that the work of instant - ADD must be done in commit_inplace_alter_table(). - For the rollback_instant() to work, we must - add the columns to dict_table_t beforehand, - and roll back those changes in case the - transaction is rolled back. - - If we added the columns to the dictionary cache - already in the prepare_inplace_alter_table(), - we would have to deal with column number - mismatch in ha_innobase::open(), write_row() - and other functions. */ - - /* FIXME: allow instant ADD COLUMN together - with ADD INDEX on pre-existing columns. */ - goto not_instant_add_column; - } - for (uint a = 0; a < ctx->num_to_add_index; a++) { error = dict_index_add_to_cache_w_vcol( ctx->new_table, ctx->add_index[a], add_v, @@ -5139,8 +5171,15 @@ new_clustered_failed: ut_a(error == DB_SUCCESS); } DBUG_ASSERT(ha_alter_info->key_count + /* hidden GEN_CLUST_INDEX in InnoDB */ + dict_index_is_auto_gen_clust( dict_table_get_first_index(ctx->new_table)) + /* hidden FTS_DOC_ID_INDEX in InnoDB */ + + (ctx->old_table->fts_doc_id_index + && innobase_fts_check_doc_id_index_in_def( + altered_table->s->keys, + altered_table->key_info) + != FTS_EXIST_DOC_ID_INDEX) == ctx->num_to_add_index); ctx->num_to_add_index = 0; ctx->add_index = NULL; @@ -5258,6 +5297,33 @@ new_clustered_failed: ctx->prepare_instant(); } + if (!ctx->is_instant()) { + if (num_fts_index > 1) { + my_error(ER_INNODB_FT_LIMIT, MYF(0)); + goto error_handled; + } + + if (!ctx->online) { + /* This is not an online operation (LOCK=NONE). */ + } else if (ctx->add_autoinc == ULINT_UNDEFINED + && num_fts_index == 0 + && (!innobase_need_rebuild(ha_alter_info, old_table) + || !innobase_fulltext_exist(altered_table))) { + /* InnoDB can perform an online operation + (LOCK=NONE). */ + } else { + size_t query_length; + /* This should have been blocked in + check_if_supported_inplace_alter(). */ + ut_ad(0); + my_error(ER_NOT_SUPPORTED_YET, MYF(0), + innobase_get_stmt_unsafe( + ctx->prebuilt->trx->mysql_thd, + &query_length)); + goto error_handled; + } + } + if (ctx->need_rebuild()) { not_instant_add_column: uint32_t key_id = FIL_DEFAULT_ENCRYPTION_KEY; @@ -5271,6 +5337,20 @@ not_instant_add_column: fil_space_release(s); } + if (ha_alter_info->handler_flags + & Alter_inplace_info::CHANGE_CREATE_OPTION) { + const ha_table_option_struct& alt_opt= + *ha_alter_info->create_info->option_struct; + const ha_table_option_struct& opt= + *old_table->s->option_struct; + if (alt_opt.encryption != opt.encryption + || alt_opt.encryption_key_id + != opt.encryption_key_id) { + key_id = uint32_t(alt_opt.encryption_key_id); + mode = fil_encryption_t(alt_opt.encryption); + } + } + if (dict_table_get_low(ctx->new_table->name.m_name)) { my_error(ER_TABLE_EXISTS_ERROR, MYF(0), ctx->new_table->name.m_name); @@ -6616,7 +6696,7 @@ err_exit: if (!(ha_alter_info->handler_flags & INNOBASE_ALTER_DATA) || ((ha_alter_info->handler_flags & ~INNOBASE_INPLACE_IGNORE) == Alter_inplace_info::CHANGE_CREATE_OPTION - && !innobase_need_rebuild(ha_alter_info, table))) { + && !create_option_need_rebuild(ha_alter_info, table))) { if (heap) { ha_alter_info->handler_ctx @@ -6901,7 +6981,7 @@ ok_exit: if ((ha_alter_info->handler_flags & ~INNOBASE_INPLACE_IGNORE) == Alter_inplace_info::CHANGE_CREATE_OPTION - && !innobase_need_rebuild(ha_alter_info, table)) { + && !create_option_need_rebuild(ha_alter_info, table)) { goto ok_exit; } @@ -9664,47 +9744,6 @@ foreign_fail: } -/** Helper class for in-place alter, see handler.h */ -class ha_innopart_inplace_ctx : public inplace_alter_handler_ctx -{ -/* Only used locally in this file, so have everything public for -conveniance. */ -public: - /** Total number of partitions. */ - uint m_tot_parts; - /** Array of inplace contexts for all partitions. */ - inplace_alter_handler_ctx** ctx_array; - /** Array of prebuilt for all partitions. */ - row_prebuilt_t** prebuilt_array; - - ha_innopart_inplace_ctx(THD *thd, uint tot_parts) - : inplace_alter_handler_ctx(), - m_tot_parts(tot_parts), - ctx_array(), - prebuilt_array() - {} - - ~ha_innopart_inplace_ctx() - { - if (ctx_array) { - for (uint i = 0; i < m_tot_parts; i++) { - delete ctx_array[i]; - } - ut_free(ctx_array); - } - if (prebuilt_array) { - /* First entry is the original prebuilt! */ - for (uint i = 1; i < m_tot_parts; i++) { - /* Don't close the tables. */ - prebuilt_array[i]->table = NULL; - row_prebuilt_free(prebuilt_array[i], false); - } - ut_free(prebuilt_array); - } - } -}; - - /** @param thd the session @param start_value the lower bound diff --git a/storage/innobase/handler/i_s.cc b/storage/innobase/handler/i_s.cc index b47ec19261c..837d4e8c01e 100644 --- a/storage/innobase/handler/i_s.cc +++ b/storage/innobase/handler/i_s.cc @@ -8050,7 +8050,6 @@ i_s_dict_fill_sys_tablespaces( { Field** fields; ulint atomic_blobs = FSP_FLAGS_HAS_ATOMIC_BLOBS(flags); - const char* file_format; const char* row_format; DBUG_ENTER("i_s_dict_fill_sys_tablespaces"); 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 1822523a3fb..8163ae186cd 100644 --- a/storage/innobase/row/row0ins.cc +++ b/storage/innobase/row/row0ins.cc @@ -2616,8 +2616,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(); @@ -2842,7 +2841,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); } @@ -2903,7 +2902,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 fb417eb4d59..29fabd9a1ad 100644 --- a/storage/innobase/row/row0mysql.cc +++ b/storage/innobase/row/row0mysql.cc @@ -2127,7 +2127,6 @@ run_again: node->cascade_upd_nodes = cascade_upd_nodes; cascade_upd_nodes->pop_front(); thr->fk_cascade_depth++; - prebuilt->m_mysql_table = NULL; vers_set_fields = DICT_TF2_FLAG_IS_SET(node->table, DICT_TF2_VERSIONED) && (node->is_delete || node->versioned); @@ -2601,10 +2600,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 " @@ -3273,9 +3269,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; @@ -3640,8 +3633,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 fd40b93173b..c37663b34f9 100644 --- a/storage/innobase/row/row0upd.cc +++ b/storage/innobase/row/row0upd.cc @@ -2918,18 +2918,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 383410849af..e7553713096 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/rocksdb/mysql-test/rocksdb/t/statistics.test b/storage/rocksdb/mysql-test/rocksdb/t/statistics.test index 70fc2f72b7e..25a1224c393 100644 --- a/storage/rocksdb/mysql-test/rocksdb/t/statistics.test +++ b/storage/rocksdb/mysql-test/rocksdb/t/statistics.test @@ -45,15 +45,19 @@ while ($i<100000) --enable_query_log # should have some statistics before the memtable flush +--sorted_result SELECT table_name, table_rows FROM information_schema.tables WHERE table_schema = DATABASE() and table_name <> 't1'; # due to inconsistencies in when the memtable is flushed, just verify t1 has fewer # than the expected number of rows. +--sorted_result SELECT CASE WHEN table_rows < 100000 then 'true' else 'false' end from information_schema.tables where table_name = 't1'; # flush and get even better statistics set global rocksdb_force_flush_memtable_now = true; +--sorted_result SELECT table_name, table_rows FROM information_schema.tables WHERE table_schema = DATABASE(); +--sorted_result SELECT table_name, data_length>0, index_length>0 FROM information_schema.tables WHERE table_schema = DATABASE(); # restart the server, check the stats @@ -62,13 +66,17 @@ SELECT table_name, data_length>0, index_length>0 FROM information_schema.tables # give the server a chance to load in statistics --sleep 5 +--sorted_result SELECT table_name, table_rows FROM information_schema.tables WHERE table_schema = DATABASE(); +--sorted_result SELECT table_name, data_length>0, index_length>0 FROM information_schema.tables WHERE table_schema = DATABASE(); analyze table t1,t2,t3,t4,t5; # make sure that stats do not change after calling analyze table +--sorted_result SELECT table_name, table_rows FROM information_schema.tables WHERE table_schema = DATABASE(); +--sorted_result SELECT table_name, data_length>0, index_length>0 FROM information_schema.tables WHERE table_schema = DATABASE(); drop table t1, t2, t3; 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; |