Merge branch 'merge-perfschema-5.6' into 10.0

5.6.26

mysql-test/r/mysqld--help.result

@@ -634,6 +634,9 @@ The following options may be given as the first argument:
  --performance-schema-max-cond-instances=# 
  Maximum number of instrumented condition objects. Use 0
  to disable, -1 for automated sizing.
+ --performance-schema-max-digest-length=# 
+ Maximum length considered for digest text, when stored in
+ performance_schema tables.
  --performance-schema-max-file-classes=# 
  Maximum number of file instruments.
  --performance-schema-max-file-handles=# 
@@ -1242,6 +1245,7 @@ performance-schema-hosts-size -1
 performance-schema-instrument 
 performance-schema-max-cond-classes 80
 performance-schema-max-cond-instances -1
+performance-schema-max-digest-length 1024
 performance-schema-max-file-classes 50
 performance-schema-max-file-handles 32768
 performance-schema-max-file-instances -1

mysql-test/suite/perfschema/r/digest_null_literal.result

@@ -16,12 +16,12 @@ NULL	NULL	NULL	1	2	3	NULL	NULL
 SELECT SCHEMA_NAME, DIGEST_TEXT, COUNT_STAR
 FROM performance_schema.events_statements_summary_by_digest;
 SCHEMA_NAME	DIGEST_TEXT	COUNT_STAR
-test	TRUNCATE TABLE performance_schema . events_statements_summary_by_digest 	1
+test	TRUNCATE TABLE `performance_schema` . `events_statements_summary_by_digest` 	1
 test	SELECT ? 	1
 test	SELECT ? FROM DUAL 	1
 test	SELECT ?, ... 	2
 test	SELECT ? IS NULL 	1
 test	SELECT ? IS NOT NULL 	1
 test	SELECT ? IS NULL , ? IS NULL , ? IS NOT NULL , ? IS NOT NULL 	1
-test	CREATE TABLE foo ( a INTEGER DEFAULT ? , b INTEGER NOT NULL DEFAULT ? , c INTEGER NOT NULL ) 	1
-test	DROP TABLE foo 	1
+test	CREATE TABLE `foo` ( `a` INTEGER DEFAULT ? , `b` INTEGER NOT NULL DEFAULT ? , `c` INTEGER NOT NULL ) 	1
+test	DROP TABLE `foo` 	1

mysql-test/suite/perfschema/r/digest_table_full.result

@@ -113,7 +113,7 @@ SELECT SCHEMA_NAME, DIGEST, DIGEST_TEXT, COUNT_STAR, SUM_ROWS_AFFECTED, SUM_WARN
 SUM_ERRORS FROM performance_schema.events_statements_summary_by_digest;
 SCHEMA_NAME	DIGEST	DIGEST_TEXT	COUNT_STAR	SUM_ROWS_AFFECTED	SUM_WARNINGS	SUM_ERRORS
 NULL	NULL	NULL	55	32	1	2
-statements_digest	8de787d0e3e3a062aea121ff528fcfce	TRUNCATE TABLE performance_schema . events_statements_summary_by_digest 	1	0	0	0
+statements_digest	b12e7d0f2ac88c8fad9ac8dabb347b09	TRUNCATE TABLE `performance_schema` . `events_statements_summary_by_digest` 	1	0	0	0
 SHOW VARIABLES LIKE "performance_schema_digests_size";
 Variable_name	Value
 performance_schema_digests_size	2

mysql-test/suite/perfschema/r/global_read_lock.result

@@ -20,11 +20,13 @@ lock tables performance_schema.setup_instruments write;
 connection default;
 select event_name,
 left(source, locate(":", source)) as short_source,
-timer_end, timer_wait, operation
+if(timer_end IS NULL, NULL, "SET") as timer_end,
+if(timer_wait IS NULL, NULL, "SET") as timer_wait,
+operation
 from performance_schema.events_waits_current
 where event_name like "wait/synch/cond/sql/MDL_context::COND_wait_status";
 event_name	short_source	timer_end	timer_wait	operation
-wait/synch/cond/sql/MDL_context::COND_wait_status	mdl.cc:	NULL	NULL	timed_wait
+wait/synch/cond/sql/MDL_context::COND_wait_status	mdl.cc:	SET	SET	timed_wait
 unlock tables;
 update performance_schema.setup_instruments set enabled='NO';
 update performance_schema.setup_instruments set enabled='YES';

mysql-test/suite/perfschema/r/ortho_iter.result

@@ -110,6 +110,7 @@ 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

mysql-test/suite/perfschema/r/privilege_table_io.result

@@ -38,6 +38,7 @@ 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

mysql-test/suite/perfschema/r/rpl_gtid_func.result

@@ -37,7 +37,7 @@ select digest, digest_text, count_star
 from performance_schema.events_statements_summary_by_digest
 where digest_text like "%in_%_digest%";
 digest	digest_text	count_star
-f1cd3e758822a4ef0e1502ec30818476	SELECT ? AS in_master_digest 	1
+1281ed1e23aaa2e5528e90ebf98cfbdd	SELECT ? AS `in_master_digest` 	1
 insert into test.marker values (2);
 **** On Slave ****
 select * from test.marker;
@@ -64,7 +64,7 @@ select digest, digest_text, count_star
 from performance_schema.events_statements_summary_by_digest
 where digest_text like "%in_%_digest%";
 digest	digest_text	count_star
-c1cef2eb67ca48bb5d81d2e5e68aaf35	SELECT ? AS in_slave_digest 	1
+e0d84aed3bfac675887b38c4902f057f	SELECT ? AS `in_slave_digest` 	1
 **** On Master ****
 delete from performance_schema.setup_objects
 where object_schema='master';

mysql-test/suite/perfschema/r/rpl_statements.result

@@ -98,20 +98,20 @@ drop database marker2_db;
 select thread_id, event_id, rpad(event_name, 28, ' ') event_name, rpad(current_schema, 10, ' ') current_schema, rpad(digest_text, 72, ' ') digest_text, sql_text from performance_schema.events_statements_history_long
 where sql_text like '%marker%' order by event_id;
 thread_id	event_id	event_name	current_schema	digest_text	sql_text
-[THREAD_ID]	[EVENT_ID]	statement/sql/create_db     	test      	CREATE SCHEMA marker1_db                                                	create database marker1_db
-[THREAD_ID]	[EVENT_ID]	statement/sql/create_db     	test      	CREATE SCHEMA marker2_db                                                	create database marker2_db
-[THREAD_ID]	[EVENT_ID]	statement/sql/create_table  	test      	CREATE TABLE marker1_db . table1 ( s1 INTEGER ) ENGINE = innodb         	create table marker1_db.table1 (s1 int) engine=innodb
-[THREAD_ID]	[EVENT_ID]	statement/sql/create_table  	test      	CREATE TABLE marker2_db . table1 ( s1 INTEGER ) ENGINE = innodb         	create table marker2_db.table1 (s1 int) engine=innodb
-[THREAD_ID]	[EVENT_ID]	statement/sql/create_table  	test      	CREATE TABLE marker2_db . table2 ( s1 INTEGER ) ENGINE = innodb         	create table marker2_db.table2 (s1 int) engine=innodb
-[THREAD_ID]	[EVENT_ID]	statement/sql/insert        	test      	INSERT INTO marker1_db . table1 VALUES (?) /* , ... */                  	insert into marker1_db.table1 values (1), (2), (3)
-[THREAD_ID]	[EVENT_ID]	statement/sql/insert        	test      	INSERT INTO marker2_db . table1 VALUES (?) /* , ... */                  	insert into marker2_db.table1 values (1), (2), (3)
-[THREAD_ID]	[EVENT_ID]	statement/sql/alter_table   	test      	ALTER TABLE marker1_db . table1 ADD COLUMN ( s2 VARCHARACTER (?) )      	alter table marker1_db.table1 add column (s2 varchar(32))
-[THREAD_ID]	[EVENT_ID]	statement/sql/insert        	test      	INSERT INTO marker1_db . table1 VALUES (...) /* , ... */                	insert into marker1_db.table1 values (4, 'four'), (5, 'five'), (6, 'six')
-[THREAD_ID]	[EVENT_ID]	statement/sql/update        	test      	UPDATE marker1_db . table1 SET s1 = s1 + ?                              	update marker1_db.table1 set s1 = s1 + 1
-[THREAD_ID]	[EVENT_ID]	statement/sql/insert        	test      	INSERT INTO marker1_db . table1 VALUES (...) /* , ... */                	insert into marker1_db.table1 values (7, 'seven'), (8, 'eight'), (9, 'nine')
-[THREAD_ID]	[EVENT_ID]	statement/sql/delete        	test      	DELETE FROM marker1_db . table1 WHERE s1 > ?                            	delete from marker1_db.table1 where s1 > 4
-[THREAD_ID]	[EVENT_ID]	statement/sql/drop_table    	test      	DROP TABLE marker2_db . table1                                          	drop table marker2_db.table1
-[THREAD_ID]	[EVENT_ID]	statement/sql/drop_db       	test      	DROP SCHEMA marker2_db                                                  	drop database marker2_db
+[THREAD_ID]	[EVENT_ID]	statement/sql/create_db     	test      	CREATE SCHEMA `marker1_db`                                              	create database marker1_db
+[THREAD_ID]	[EVENT_ID]	statement/sql/create_db     	test      	CREATE SCHEMA `marker2_db`                                              	create database marker2_db
+[THREAD_ID]	[EVENT_ID]	statement/sql/create_table  	test      	CREATE TABLE `marker1_db` . `table1` ( `s1` INTEGER ) ENGINE = `innodb` 	create table marker1_db.table1 (s1 int) engine=innodb
+[THREAD_ID]	[EVENT_ID]	statement/sql/create_table  	test      	CREATE TABLE `marker2_db` . `table1` ( `s1` INTEGER ) ENGINE = `innodb` 	create table marker2_db.table1 (s1 int) engine=innodb
+[THREAD_ID]	[EVENT_ID]	statement/sql/create_table  	test      	CREATE TABLE `marker2_db` . `table2` ( `s1` INTEGER ) ENGINE = `innodb` 	create table marker2_db.table2 (s1 int) engine=innodb
+[THREAD_ID]	[EVENT_ID]	statement/sql/insert        	test      	INSERT INTO `marker1_db` . `table1` VALUES (?) /* , ... */              	insert into marker1_db.table1 values (1), (2), (3)
+[THREAD_ID]	[EVENT_ID]	statement/sql/insert        	test      	INSERT INTO `marker2_db` . `table1` VALUES (?) /* , ... */              	insert into marker2_db.table1 values (1), (2), (3)
+[THREAD_ID]	[EVENT_ID]	statement/sql/alter_table   	test      	ALTER TABLE `marker1_db` . `table1` ADD COLUMN ( `s2` VARCHARACTER (?) )	alter table marker1_db.table1 add column (s2 varchar(32))
+[THREAD_ID]	[EVENT_ID]	statement/sql/insert        	test      	INSERT INTO `marker1_db` . `table1` VALUES (...) /* , ... */            	insert into marker1_db.table1 values (4, 'four'), (5, 'five'), (6, 'six')
+[THREAD_ID]	[EVENT_ID]	statement/sql/update        	test      	UPDATE `marker1_db` . `table1` SET `s1` = `s1` + ?                      	update marker1_db.table1 set s1 = s1 + 1
+[THREAD_ID]	[EVENT_ID]	statement/sql/insert        	test      	INSERT INTO `marker1_db` . `table1` VALUES (...) /* , ... */            	insert into marker1_db.table1 values (7, 'seven'), (8, 'eight'), (9, 'nine')
+[THREAD_ID]	[EVENT_ID]	statement/sql/delete        	test      	DELETE FROM `marker1_db` . `table1` WHERE `s1` > ?                      	delete from marker1_db.table1 where s1 > 4
+[THREAD_ID]	[EVENT_ID]	statement/sql/drop_table    	test      	DROP TABLE `marker2_db` . `table1`                                      	drop table marker2_db.table1
+[THREAD_ID]	[EVENT_ID]	statement/sql/drop_db       	test      	DROP SCHEMA `marker2_db`                                                	drop database marker2_db
 
 #
 # STEP 4 - REPLICATE STATEMENT EVENTS ON MASTER TO SLAVE
@@ -138,39 +138,39 @@ where (thread_id=@my_thread_id and digest_text like '%marker%'));
 
 select thread_id, event_id, rpad(event_name, 28, ' ') event_name, rpad(current_schema, 10, ' ') current_schema, rpad(digest_text, 72, ' ') digest_text, sql_text from master_events_statements_history_long order by event_id;
 thread_id	event_id	event_name	current_schema	digest_text	sql_text
-[THREAD_ID]	[EVENT_ID]	statement/sql/create_db     	test      	CREATE SCHEMA marker1_db                                                	create database marker1_db
-[THREAD_ID]	[EVENT_ID]	statement/sql/create_db     	test      	CREATE SCHEMA marker2_db                                                	create database marker2_db
-[THREAD_ID]	[EVENT_ID]	statement/sql/create_table  	test      	CREATE TABLE marker1_db . table1 ( s1 INTEGER ) ENGINE = innodb         	create table marker1_db.table1 (s1 int) engine=innodb
-[THREAD_ID]	[EVENT_ID]	statement/sql/create_table  	test      	CREATE TABLE marker2_db . table1 ( s1 INTEGER ) ENGINE = innodb         	create table marker2_db.table1 (s1 int) engine=innodb
-[THREAD_ID]	[EVENT_ID]	statement/sql/create_table  	test      	CREATE TABLE marker2_db . table2 ( s1 INTEGER ) ENGINE = innodb         	create table marker2_db.table2 (s1 int) engine=innodb
-[THREAD_ID]	[EVENT_ID]	statement/sql/insert        	test      	INSERT INTO marker1_db . table1 VALUES (?) /* , ... */                  	insert into marker1_db.table1 values (1), (2), (3)
-[THREAD_ID]	[EVENT_ID]	statement/sql/insert        	test      	INSERT INTO marker2_db . table1 VALUES (?) /* , ... */                  	insert into marker2_db.table1 values (1), (2), (3)
-[THREAD_ID]	[EVENT_ID]	statement/sql/alter_table   	test      	ALTER TABLE marker1_db . table1 ADD COLUMN ( s2 VARCHARACTER (?) )      	alter table marker1_db.table1 add column (s2 varchar(32))
-[THREAD_ID]	[EVENT_ID]	statement/sql/insert        	test      	INSERT INTO marker1_db . table1 VALUES (...) /* , ... */                	insert into marker1_db.table1 values (4, 'four'), (5, 'five'), (6, 'six')
-[THREAD_ID]	[EVENT_ID]	statement/sql/update        	test      	UPDATE marker1_db . table1 SET s1 = s1 + ?                              	update marker1_db.table1 set s1 = s1 + 1
-[THREAD_ID]	[EVENT_ID]	statement/sql/insert        	test      	INSERT INTO marker1_db . table1 VALUES (...) /* , ... */                	insert into marker1_db.table1 values (7, 'seven'), (8, 'eight'), (9, 'nine')
-[THREAD_ID]	[EVENT_ID]	statement/sql/delete        	test      	DELETE FROM marker1_db . table1 WHERE s1 > ?                            	delete from marker1_db.table1 where s1 > 4
-[THREAD_ID]	[EVENT_ID]	statement/sql/drop_table    	test      	DROP TABLE marker2_db . table1                                          	drop table marker2_db.table1
-[THREAD_ID]	[EVENT_ID]	statement/sql/drop_db       	test      	DROP SCHEMA marker2_db                                                  	drop database marker2_db
+[THREAD_ID]	[EVENT_ID]	statement/sql/create_db     	test      	CREATE SCHEMA `marker1_db`                                              	create database marker1_db
+[THREAD_ID]	[EVENT_ID]	statement/sql/create_db     	test      	CREATE SCHEMA `marker2_db`                                              	create database marker2_db
+[THREAD_ID]	[EVENT_ID]	statement/sql/create_table  	test      	CREATE TABLE `marker1_db` . `table1` ( `s1` INTEGER ) ENGINE = `innodb` 	create table marker1_db.table1 (s1 int) engine=innodb
+[THREAD_ID]	[EVENT_ID]	statement/sql/create_table  	test      	CREATE TABLE `marker2_db` . `table1` ( `s1` INTEGER ) ENGINE = `innodb` 	create table marker2_db.table1 (s1 int) engine=innodb
+[THREAD_ID]	[EVENT_ID]	statement/sql/create_table  	test      	CREATE TABLE `marker2_db` . `table2` ( `s1` INTEGER ) ENGINE = `innodb` 	create table marker2_db.table2 (s1 int) engine=innodb
+[THREAD_ID]	[EVENT_ID]	statement/sql/insert        	test      	INSERT INTO `marker1_db` . `table1` VALUES (?) /* , ... */              	insert into marker1_db.table1 values (1), (2), (3)
+[THREAD_ID]	[EVENT_ID]	statement/sql/insert        	test      	INSERT INTO `marker2_db` . `table1` VALUES (?) /* , ... */              	insert into marker2_db.table1 values (1), (2), (3)
+[THREAD_ID]	[EVENT_ID]	statement/sql/alter_table   	test      	ALTER TABLE `marker1_db` . `table1` ADD COLUMN ( `s2` VARCHARACTER (?) )	alter table marker1_db.table1 add column (s2 varchar(32))
+[THREAD_ID]	[EVENT_ID]	statement/sql/insert        	test      	INSERT INTO `marker1_db` . `table1` VALUES (...) /* , ... */            	insert into marker1_db.table1 values (4, 'four'), (5, 'five'), (6, 'six')
+[THREAD_ID]	[EVENT_ID]	statement/sql/update        	test      	UPDATE `marker1_db` . `table1` SET `s1` = `s1` + ?                      	update marker1_db.table1 set s1 = s1 + 1
+[THREAD_ID]	[EVENT_ID]	statement/sql/insert        	test      	INSERT INTO `marker1_db` . `table1` VALUES (...) /* , ... */            	insert into marker1_db.table1 values (7, 'seven'), (8, 'eight'), (9, 'nine')
+[THREAD_ID]	[EVENT_ID]	statement/sql/delete        	test      	DELETE FROM `marker1_db` . `table1` WHERE `s1` > ?                      	delete from marker1_db.table1 where s1 > 4
+[THREAD_ID]	[EVENT_ID]	statement/sql/drop_table    	test      	DROP TABLE `marker2_db` . `table1`                                      	drop table marker2_db.table1
+[THREAD_ID]	[EVENT_ID]	statement/sql/drop_db       	test      	DROP SCHEMA `marker2_db`                                                	drop database marker2_db
 
 *** List statement events on slave
 
 select thread_id, event_id, rpad(event_name, 28, ' ') event_name, rpad(current_schema, 10, ' ') current_schema, rpad(digest_text, 72, ' ') digest_text, sql_text from performance_schema.events_statements_history_long
 where thread_id = @slave_thread_id and sql_text like '%marker%' order by event_id;
 thread_id	event_id	event_name	current_schema	digest_text	sql_text
-[THREAD_ID]	[EVENT_ID]	statement/sql/create_db     	marker1_db	CREATE SCHEMA marker1_db                                                	create database marker1_db
-[THREAD_ID]	[EVENT_ID]	statement/sql/create_db     	marker2_db	CREATE SCHEMA marker2_db                                                	create database marker2_db
-[THREAD_ID]	[EVENT_ID]	statement/sql/create_table  	test      	CREATE TABLE marker1_db . table1 ( s1 INTEGER ) ENGINE = innodb         	create table marker1_db.table1 (s1 int) engine=innodb
-[THREAD_ID]	[EVENT_ID]	statement/sql/create_table  	test      	CREATE TABLE marker2_db . table1 ( s1 INTEGER ) ENGINE = innodb         	create table marker2_db.table1 (s1 int) engine=innodb
-[THREAD_ID]	[EVENT_ID]	statement/sql/create_table  	test      	CREATE TABLE marker2_db . table2 ( s1 INTEGER ) ENGINE = innodb         	create table marker2_db.table2 (s1 int) engine=innodb
-[THREAD_ID]	[EVENT_ID]	statement/sql/insert        	test      	INSERT INTO marker1_db . table1 VALUES (?) /* , ... */                  	insert into marker1_db.table1 values (1), (2), (3)
-[THREAD_ID]	[EVENT_ID]	statement/sql/insert        	test      	INSERT INTO marker2_db . table1 VALUES (?) /* , ... */                  	insert into marker2_db.table1 values (1), (2), (3)
-[THREAD_ID]	[EVENT_ID]	statement/sql/alter_table   	test      	ALTER TABLE marker1_db . table1 ADD COLUMN ( s2 VARCHARACTER (?) )      	alter table marker1_db.table1 add column (s2 varchar(32))
-[THREAD_ID]	[EVENT_ID]	statement/sql/insert        	test      	INSERT INTO marker1_db . table1 VALUES (...) /* , ... */                	insert into marker1_db.table1 values (4, 'four'), (5, 'five'), (6, 'six')
-[THREAD_ID]	[EVENT_ID]	statement/sql/update        	test      	UPDATE marker1_db . table1 SET s1 = s1 + ?                              	update marker1_db.table1 set s1 = s1 + 1
-[THREAD_ID]	[EVENT_ID]	statement/sql/delete        	test      	DELETE FROM marker1_db . table1 WHERE s1 > ?                            	delete from marker1_db.table1 where s1 > 4
+[THREAD_ID]	[EVENT_ID]	statement/sql/create_db     	marker1_db	CREATE SCHEMA `marker1_db`                                              	create database marker1_db
+[THREAD_ID]	[EVENT_ID]	statement/sql/create_db     	marker2_db	CREATE SCHEMA `marker2_db`                                              	create database marker2_db
+[THREAD_ID]	[EVENT_ID]	statement/sql/create_table  	test      	CREATE TABLE `marker1_db` . `table1` ( `s1` INTEGER ) ENGINE = `innodb` 	create table marker1_db.table1 (s1 int) engine=innodb
+[THREAD_ID]	[EVENT_ID]	statement/sql/create_table  	test      	CREATE TABLE `marker2_db` . `table1` ( `s1` INTEGER ) ENGINE = `innodb` 	create table marker2_db.table1 (s1 int) engine=innodb
+[THREAD_ID]	[EVENT_ID]	statement/sql/create_table  	test      	CREATE TABLE `marker2_db` . `table2` ( `s1` INTEGER ) ENGINE = `innodb` 	create table marker2_db.table2 (s1 int) engine=innodb
+[THREAD_ID]	[EVENT_ID]	statement/sql/insert        	test      	INSERT INTO `marker1_db` . `table1` VALUES (?) /* , ... */              	insert into marker1_db.table1 values (1), (2), (3)
+[THREAD_ID]	[EVENT_ID]	statement/sql/insert        	test      	INSERT INTO `marker2_db` . `table1` VALUES (?) /* , ... */              	insert into marker2_db.table1 values (1), (2), (3)
+[THREAD_ID]	[EVENT_ID]	statement/sql/alter_table   	test      	ALTER TABLE `marker1_db` . `table1` ADD COLUMN ( `s2` VARCHARACTER (?) )	alter table marker1_db.table1 add column (s2 varchar(32))
+[THREAD_ID]	[EVENT_ID]	statement/sql/insert        	test      	INSERT INTO `marker1_db` . `table1` VALUES (...) /* , ... */            	insert into marker1_db.table1 values (4, 'four'), (5, 'five'), (6, 'six')
+[THREAD_ID]	[EVENT_ID]	statement/sql/update        	test      	UPDATE `marker1_db` . `table1` SET `s1` = `s1` + ?                      	update marker1_db.table1 set s1 = s1 + 1
+[THREAD_ID]	[EVENT_ID]	statement/sql/delete        	test      	DELETE FROM `marker1_db` . `table1` WHERE `s1` > ?                      	delete from marker1_db.table1 where s1 > 4
 [THREAD_ID]	[EVENT_ID]	statement/sql/drop_table    	test      	DROP TABLE `marker2_db` . `table1`                                      	DROP TABLE `marker2_db`.`table1` /* generated by server */
-[THREAD_ID]	[EVENT_ID]	statement/sql/drop_db       	marker2_db	DROP SCHEMA marker2_db                                                  	drop database marker2_db
+[THREAD_ID]	[EVENT_ID]	statement/sql/drop_db       	marker2_db	DROP SCHEMA `marker2_db`                                                	drop database marker2_db
 
 *** Compare master and slave events
 
@@ -190,7 +190,6 @@ where t1.thread_id = @slave_thread_id and
 sql_text like '%marker%' and
 not exists (select * from master_events_statements_history_long t2 where t2.digest = t1.digest);
 thread_id	event_id	event_name	digest	digest_text	sql_text
-[THREAD_ID]	[EVENT_ID]	statement/sql/drop_table	[DIGEST]	DROP TABLE `marker2_db` . `table1` 	DROP TABLE `marker2_db`.`table1` /* generated by server */
 
 #
 # STEP 6 - DISABLE REPLICATED STATEMENT EVENTS ON SLAVE

mysql-test/suite/perfschema/r/sizing_default.result

@@ -23,6 +23,7 @@ performance_schema_events_waits_history_size	10
 performance_schema_hosts_size	100
 performance_schema_max_cond_classes	80
 performance_schema_max_cond_instances	3504
+performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	50
 performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	7693

mysql-test/suite/perfschema/r/sizing_high.result

@@ -23,6 +23,7 @@ performance_schema_events_waits_history_size	10
 performance_schema_hosts_size	100
 performance_schema_max_cond_classes	80
 performance_schema_max_cond_instances	10900
+performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	50
 performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	23385

mysql-test/suite/perfschema/r/sizing_low.result

@@ -23,6 +23,7 @@ performance_schema_events_waits_history_size	5
 performance_schema_hosts_size	20
 performance_schema_max_cond_classes	80
 performance_schema_max_cond_instances	612
+performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	50
 performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	1556

mysql-test/suite/perfschema/r/sizing_med.result

@@ -23,6 +23,7 @@ performance_schema_events_waits_history_size	10
 performance_schema_hosts_size	100
 performance_schema_max_cond_classes	80
 performance_schema_max_cond_instances	1079
+performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	50
 performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	1754

mysql-test/suite/perfschema/r/sizing_off.result

@@ -14,6 +14,7 @@ performance_schema_events_waits_history_size	-1
 performance_schema_hosts_size	-1
 performance_schema_max_cond_classes	80
 performance_schema_max_cond_instances	-1
+performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	50
 performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	-1

mysql-test/suite/perfschema/r/start_server_disable_idle.result

@@ -85,6 +85,7 @@ 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

mysql-test/suite/perfschema/r/start_server_disable_stages.result

@@ -85,6 +85,7 @@ 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

mysql-test/suite/perfschema/r/start_server_disable_statements.result

@@ -85,6 +85,7 @@ 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

mysql-test/suite/perfschema/r/start_server_disable_waits.result

@@ -85,6 +85,7 @@ 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

mysql-test/suite/perfschema/r/start_server_innodb.result

@@ -85,6 +85,7 @@ 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

mysql-test/suite/perfschema/r/start_server_no_account.result

@@ -85,6 +85,7 @@ 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

mysql-test/suite/perfschema/r/start_server_no_cond_class.result

@@ -85,6 +85,7 @@ 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

mysql-test/suite/perfschema/r/start_server_no_cond_inst.result

@@ -85,6 +85,7 @@ 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

mysql-test/suite/perfschema/r/start_server_no_file_class.result

@@ -85,6 +85,7 @@ 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

mysql-test/suite/perfschema/r/start_server_no_file_inst.result

@@ -85,6 +85,7 @@ 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

mysql-test/suite/perfschema/r/start_server_no_host.result

@@ -85,6 +85,7 @@ 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

mysql-test/suite/perfschema/r/start_server_no_mutex_class.result

@@ -85,6 +85,7 @@ 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

mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result

@@ -85,6 +85,7 @@ 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

mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result

@@ -85,6 +85,7 @@ 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

mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result

@@ -85,6 +85,7 @@ 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

mysql-test/suite/perfschema/r/start_server_no_setup_actors.result

@@ -85,6 +85,7 @@ 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

mysql-test/suite/perfschema/r/start_server_no_setup_objects.result

@@ -85,6 +85,7 @@ 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

mysql-test/suite/perfschema/r/start_server_no_socket_class.result

@@ -85,6 +85,7 @@ 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

mysql-test/suite/perfschema/r/start_server_no_socket_inst.result

@@ -85,6 +85,7 @@ 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

mysql-test/suite/perfschema/r/start_server_no_stage_class.result

@@ -85,6 +85,7 @@ 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

mysql-test/suite/perfschema/r/start_server_no_stages_history.result

@@ -85,6 +85,7 @@ 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

mysql-test/suite/perfschema/r/start_server_no_stages_history_long.result

@@ -85,6 +85,7 @@ 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

mysql-test/suite/perfschema/r/start_server_no_statement_class.result

@@ -85,6 +85,7 @@ 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

mysql-test/suite/perfschema/r/start_server_no_statements_history.result

@@ -85,6 +85,7 @@ 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

mysql-test/suite/perfschema/r/start_server_no_statements_history_long.result

@@ -85,6 +85,7 @@ 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

mysql-test/suite/perfschema/r/start_server_no_table_hdl.result

@@ -85,6 +85,7 @@ 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

mysql-test/suite/perfschema/r/start_server_no_table_inst.result

@@ -85,6 +85,7 @@ 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

mysql-test/suite/perfschema/r/start_server_no_thread_class.result

@@ -85,6 +85,7 @@ 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

mysql-test/suite/perfschema/r/start_server_no_thread_inst.result

@@ -85,6 +85,7 @@ 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

mysql-test/suite/perfschema/r/start_server_no_user.result

@@ -85,6 +85,7 @@ 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

mysql-test/suite/perfschema/r/start_server_no_waits_history.result

@@ -85,6 +85,7 @@ 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

mysql-test/suite/perfschema/r/start_server_no_waits_history_long.result

@@ -85,6 +85,7 @@ 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

mysql-test/suite/perfschema/r/start_server_nothing.result

@@ -85,6 +85,7 @@ 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
@@ -119,6 +120,7 @@ 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

mysql-test/suite/perfschema/r/start_server_off.result

@@ -85,6 +85,7 @@ 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

mysql-test/suite/perfschema/r/start_server_on.result

@@ -85,6 +85,7 @@ 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

mysql-test/suite/perfschema/r/statement_digest.result

@@ -112,42 +112,41 @@ DROP TRIGGER trg;
 SELECT SCHEMA_NAME, DIGEST, DIGEST_TEXT, COUNT_STAR, SUM_ROWS_AFFECTED, SUM_WARNINGS,
 SUM_ERRORS FROM performance_schema.events_statements_summary_by_digest;
 SCHEMA_NAME	DIGEST	DIGEST_TEXT	COUNT_STAR	SUM_ROWS_AFFECTED	SUM_WARNINGS	SUM_ERRORS
-statements_digest	8de787d0e3e3a062aea121ff528fcfce	TRUNCATE TABLE performance_schema . events_statements_summary_by_digest 	1	0	0	0
-statements_digest	a871edd1a65606b404c0b6e65c1f142c	SELECT ? FROM t1 	1	0	0	0
-statements_digest	d60830f376a7724280dfc422224bb475	SELECT ? FROM `t1` 	1	0	0	0
-statements_digest	09309c60c199a727b7ebed40975e8764	SELECT ?, ... FROM t1 	2	0	0	0
-statements_digest	dc0dcaefa9a12455ffed04ac6f89e65d	SELECT ? FROM t2 	1	0	0	0
-statements_digest	d274a288509eae2cd7febf2f7fe36274	SELECT ?, ... FROM t2 	2	0	0	0
-statements_digest	ec913f89e0d8be99014bf78e73228c48	INSERT INTO t1 VALUES (?) 	2	2	0	0
-statements_digest	b919ecf2d5544bcdf95e76eb22231c42	INSERT INTO t2 VALUES (?) 	1	1	0	0
-statements_digest	d9030eddb8dca8ee5fcaf79e6f254b41	INSERT INTO t3 VALUES (...) 	4	4	0	0
-statements_digest	2ad6d8279781b0fb40bdc8647dc94216	INSERT INTO t4 VALUES (...) 	1	1	0	0
-statements_digest	3248c16dc70111225fcffa99641e312b	INSERT INTO t5 VALUES (...) 	1	1	0	0
-statements_digest	152b6c84a0cbfadcbecde01050eddd66	INSERT INTO t1 VALUES (?) /* , ... */ 	2	7	0	0
-statements_digest	c4cbce33b636e448c29e041b1d5c0eb1	INSERT INTO t3 VALUES (...) /* , ... */ 	1	3	0	0
-statements_digest	0bfac9fb577995b116e52ff4aaeaa5b8	INSERT INTO t5 VALUES (...) /* , ... */ 	1	3	0	0
-statements_digest	819acce11785e12f2f73964115632db6	INSERT INTO t6 VALUES (...) 	5	5	0	0
+statements_digest	b12e7d0f2ac88c8fad9ac8dabb347b09	TRUNCATE TABLE `performance_schema` . `events_statements_summary_by_digest` 	1	0	0	0
+statements_digest	390f3ff3444c4de44fcbd052b11caf4e	SELECT ? FROM `t1` 	2	0	0	0
+statements_digest	8726524372f6e4924bbe1393b772498e	SELECT ?, ... FROM `t1` 	2	0	0	0
+statements_digest	5b06fb13fa9af5e8a4ec26bac8f994cd	SELECT ? FROM `t2` 	1	0	0	0
+statements_digest	82201946968b4baca616292f96e933a7	SELECT ?, ... FROM `t2` 	2	0	0	0
+statements_digest	35d365779571257e8837f01b39dd9df5	INSERT INTO `t1` VALUES (?) 	2	2	0	0
+statements_digest	eaaf6c26e98130ec21cfae1389e3eb94	INSERT INTO `t2` VALUES (?) 	1	1	0	0
+statements_digest	28f3cfdcfffeff3219bdd255ed15e6ac	INSERT INTO `t3` VALUES (...) 	4	4	0	0
+statements_digest	166a9591b81371a6ea389f27cfc1e5fd	INSERT INTO `t4` VALUES (...) 	1	1	0	0
+statements_digest	fb25b9f9146120fb72c3c732e79dcc82	INSERT INTO `t5` VALUES (...) 	1	1	0	0
+statements_digest	58bb7798d974224ff08742502eed1aae	INSERT INTO `t1` VALUES (?) /* , ... */ 	2	7	0	0
+statements_digest	3352b44dcaf21f59141ea76b5cace5c0	INSERT INTO `t3` VALUES (...) /* , ... */ 	1	3	0	0
+statements_digest	1905c012e5d6a3a12e39b0b3ce13b22a	INSERT INTO `t5` VALUES (...) /* , ... */ 	1	3	0	0
+statements_digest	981d682c1e63b437c33230eb558d0f64	INSERT INTO `t6` VALUES (...) 	5	5	0	0
 statements_digest	aeb185ab9b6e9d5a49e47c8741b8acdf	SELECT ? + ? 	3	0	0	0
 statements_digest	d3804664eeee11407f3fcbd5c29a1f73	SELECT ? 	1	0	0	0
-statements_digest	3b085ab0d2063dfca1a39212e3ea1831	CREATE SCHEMA statements_digest_temp 	2	2	0	0
-statements_digest	09f9fabef2feb9a54ba01455e5ae83b9	DROP SCHEMA statements_digest_temp 	2	0	0	0
-statements_digest	ff0bb1dfc399aa3bef6a0f3fccd3ef94	SELECT ? FROM no_such_table 	1	0	0	1
-statements_digest	590a245c84e63eb100e1ef463f477f1a	CREATE TABLE dup_table ( c CHARACTER (?) ) 	2	0	0	1
-statements_digest	74078b0776d8333e356b271551587d53	DROP TABLE dup_table 	1	0	0	0
-statements_digest	f23641c5ab7e1dd6e0146f66b3fff5c4	INSERT INTO t11 VALUES (?) 	1	1	1	0
+statements_digest	6382c1dfc79755af2dd46113acea142b	CREATE SCHEMA `statements_digest_temp` 	2	2	0	0
+statements_digest	256f8dfc97d90a79103ebd6616b8d7aa	DROP SCHEMA `statements_digest_temp` 	2	0	0	0
+statements_digest	5315d33e7ef87b104b73912d484af6a3	SELECT ? FROM `no_such_table` 	1	0	0	1
+statements_digest	dcde8f720a419aa5d52246207268cf6c	CREATE TABLE `dup_table` ( `c` CHARACTER (?) ) 	2	0	0	1
+statements_digest	b4b4abab3f030642444fb32c44f28058	DROP TABLE `dup_table` 	1	0	0	0
+statements_digest	a34ed519fdeb4fe4460038db92ea0c20	INSERT INTO `t11` VALUES (?) 	1	1	1	0
 statements_digest	d3eda26b379bd56340ce84fe395dfff7	SHOW WARNINGS 	1	0	0	0
-statements_digest	6bb42dec3094486d5a9e8b0bf460e382	PREPARE stmt FROM ? 	1	0	0	0
-statements_digest	3ab1e87eabd9688edf919754cce6348b	EXECUTE stmt 	2	0	0	0
-statements_digest	f9438ab7b8eec604338c28a04e5d650f	DEALLOCATE PREPARE stmt 	1	0	0	0
-statements_digest	072d6c57d3fe4f0c6a7dabba96f0ccf8	CREATE PROCEDURE p1 ( ) BEGIN SELECT * FROM t12 ; END 	1	0	0	0
-statements_digest	84554971243e91106214dcb8f4eaa89b	CALL p1 ( ) 	2	0	0	0
-statements_digest	2bd1e1e6eb445f32e1d4b290c1961e6b	DROP PROCEDURE p1 	1	0	0	0
-statements_digest	5799522044ce9a4fa48dce5f4a3b047a	CREATE FUNCTION `func` ( a INTEGER , b INTEGER ) RETURNS INTEGER (?) RETURN a + b 	1	0	0	0
-statements_digest	59cbdd7ffc78a23bc2f650f8158067c6	SELECT func (...) 	2	0	0	0
-statements_digest	0b5a5297689c5036def6af8e8a8ce113	DROP FUNCTION func 	1	0	0	0
-statements_digest	10c7a2262748aa15496375d99f876fb2	CREATE TRIGGER trg BEFORE INSERT ON t12 FOR EACH ROW SET @? := ? 	1	0	0	0
-statements_digest	bb0154f3d32233f696b95d4127d29a3b	INSERT INTO t12 VALUES (?) 	2	2	0	0
-statements_digest	a975545baf024e8a173be77032d8fd01	DROP TRIGGER trg 	1	0	0	0
+statements_digest	e6aa634cf5a630087fefe9868b018329	PREPARE `stmt` FROM ? 	1	0	0	0
+statements_digest	4de34527c0dfef6ad8387d4359f78c78	EXECUTE `stmt` 	2	0	0	0
+statements_digest	54592849b6cf7386568c88e7fb20f61e	DEALLOCATE PREPARE `stmt` 	1	0	0	0
+statements_digest	ee90db91a06cedfbcccf80f951dc58cd	CREATE PROCEDURE `p1` ( ) BEGIN SELECT * FROM `t12` ; END 	1	0	0	0
+statements_digest	f964655a0037d2f194030bd024eab748	CALL `p1` ( ) 	2	0	0	0
+statements_digest	788d8223f67ba10d1b97fcaa42fec081	DROP PROCEDURE `p1` 	1	0	0	0
+statements_digest	5146273ef7d98ee1954d23fd98a35d68	CREATE FUNCTION `func` ( `a` INTEGER , `b` INTEGER ) RETURNS INTEGER (?) RETURN `a` + `b` 	1	0	0	0
+statements_digest	2c9b8e1e7f2ad3ca3c49abb2ea30e871	SELECT `func` (...) 	2	0	0	0
+statements_digest	f48e30910f8e7758b818c088916424cd	DROP FUNCTION `func` 	1	0	0	0
+statements_digest	53ccf1d241eeb749f1e1b7becc65006f	CREATE TRIGGER `trg` BEFORE INSERT ON `t12` FOR EACH ROW SET @? := ? 	1	0	0	0
+statements_digest	a9722a0717a57275431575c7204d71c1	INSERT INTO `t12` VALUES (?) 	2	2	0	0
+statements_digest	2d48809e6899f63ec304776466a63eef	DROP TRIGGER `trg` 	1	0	0	0
 ####################################
 # CLEANUP
 ####################################

mysql-test/suite/perfschema/r/statement_digest_consumers.result

@@ -125,42 +125,41 @@ DROP TRIGGER trg;
 ####################################
 SELECT schema_name, digest, digest_text, count_star FROM performance_schema.events_statements_summary_by_digest;
 schema_name	digest	digest_text	count_star
-statements_digest	8de787d0e3e3a062aea121ff528fcfce	TRUNCATE TABLE performance_schema . events_statements_summary_by_digest 	1
-statements_digest	a871edd1a65606b404c0b6e65c1f142c	SELECT ? FROM t1 	1
-statements_digest	d60830f376a7724280dfc422224bb475	SELECT ? FROM `t1` 	1
-statements_digest	09309c60c199a727b7ebed40975e8764	SELECT ?, ... FROM t1 	2
-statements_digest	dc0dcaefa9a12455ffed04ac6f89e65d	SELECT ? FROM t2 	1
-statements_digest	d274a288509eae2cd7febf2f7fe36274	SELECT ?, ... FROM t2 	2
-statements_digest	ec913f89e0d8be99014bf78e73228c48	INSERT INTO t1 VALUES (?) 	2
-statements_digest	b919ecf2d5544bcdf95e76eb22231c42	INSERT INTO t2 VALUES (?) 	1
-statements_digest	d9030eddb8dca8ee5fcaf79e6f254b41	INSERT INTO t3 VALUES (...) 	4
-statements_digest	2ad6d8279781b0fb40bdc8647dc94216	INSERT INTO t4 VALUES (...) 	1
-statements_digest	3248c16dc70111225fcffa99641e312b	INSERT INTO t5 VALUES (...) 	1
-statements_digest	152b6c84a0cbfadcbecde01050eddd66	INSERT INTO t1 VALUES (?) /* , ... */ 	2
-statements_digest	c4cbce33b636e448c29e041b1d5c0eb1	INSERT INTO t3 VALUES (...) /* , ... */ 	1
-statements_digest	0bfac9fb577995b116e52ff4aaeaa5b8	INSERT INTO t5 VALUES (...) /* , ... */ 	1
-statements_digest	819acce11785e12f2f73964115632db6	INSERT INTO t6 VALUES (...) 	5
+statements_digest	b12e7d0f2ac88c8fad9ac8dabb347b09	TRUNCATE TABLE `performance_schema` . `events_statements_summary_by_digest` 	1
+statements_digest	390f3ff3444c4de44fcbd052b11caf4e	SELECT ? FROM `t1` 	2
+statements_digest	8726524372f6e4924bbe1393b772498e	SELECT ?, ... FROM `t1` 	2
+statements_digest	5b06fb13fa9af5e8a4ec26bac8f994cd	SELECT ? FROM `t2` 	1
+statements_digest	82201946968b4baca616292f96e933a7	SELECT ?, ... FROM `t2` 	2
+statements_digest	35d365779571257e8837f01b39dd9df5	INSERT INTO `t1` VALUES (?) 	2
+statements_digest	eaaf6c26e98130ec21cfae1389e3eb94	INSERT INTO `t2` VALUES (?) 	1
+statements_digest	28f3cfdcfffeff3219bdd255ed15e6ac	INSERT INTO `t3` VALUES (...) 	4
+statements_digest	166a9591b81371a6ea389f27cfc1e5fd	INSERT INTO `t4` VALUES (...) 	1
+statements_digest	fb25b9f9146120fb72c3c732e79dcc82	INSERT INTO `t5` VALUES (...) 	1
+statements_digest	58bb7798d974224ff08742502eed1aae	INSERT INTO `t1` VALUES (?) /* , ... */ 	2
+statements_digest	3352b44dcaf21f59141ea76b5cace5c0	INSERT INTO `t3` VALUES (...) /* , ... */ 	1
+statements_digest	1905c012e5d6a3a12e39b0b3ce13b22a	INSERT INTO `t5` VALUES (...) /* , ... */ 	1
+statements_digest	981d682c1e63b437c33230eb558d0f64	INSERT INTO `t6` VALUES (...) 	5
 statements_digest	aeb185ab9b6e9d5a49e47c8741b8acdf	SELECT ? + ? 	3
 statements_digest	d3804664eeee11407f3fcbd5c29a1f73	SELECT ? 	1
-statements_digest	3b085ab0d2063dfca1a39212e3ea1831	CREATE SCHEMA statements_digest_temp 	2
-statements_digest	09f9fabef2feb9a54ba01455e5ae83b9	DROP SCHEMA statements_digest_temp 	2
-statements_digest	ff0bb1dfc399aa3bef6a0f3fccd3ef94	SELECT ? FROM no_such_table 	1
-statements_digest	590a245c84e63eb100e1ef463f477f1a	CREATE TABLE dup_table ( c CHARACTER (?) ) 	2
-statements_digest	74078b0776d8333e356b271551587d53	DROP TABLE dup_table 	1
-statements_digest	f23641c5ab7e1dd6e0146f66b3fff5c4	INSERT INTO t11 VALUES (?) 	1
+statements_digest	6382c1dfc79755af2dd46113acea142b	CREATE SCHEMA `statements_digest_temp` 	2
+statements_digest	256f8dfc97d90a79103ebd6616b8d7aa	DROP SCHEMA `statements_digest_temp` 	2
+statements_digest	5315d33e7ef87b104b73912d484af6a3	SELECT ? FROM `no_such_table` 	1
+statements_digest	dcde8f720a419aa5d52246207268cf6c	CREATE TABLE `dup_table` ( `c` CHARACTER (?) ) 	2
+statements_digest	b4b4abab3f030642444fb32c44f28058	DROP TABLE `dup_table` 	1
+statements_digest	a34ed519fdeb4fe4460038db92ea0c20	INSERT INTO `t11` VALUES (?) 	1
 statements_digest	d3eda26b379bd56340ce84fe395dfff7	SHOW WARNINGS 	1
-statements_digest	6bb42dec3094486d5a9e8b0bf460e382	PREPARE stmt FROM ? 	1
-statements_digest	3ab1e87eabd9688edf919754cce6348b	EXECUTE stmt 	2
-statements_digest	f9438ab7b8eec604338c28a04e5d650f	DEALLOCATE PREPARE stmt 	1
-statements_digest	072d6c57d3fe4f0c6a7dabba96f0ccf8	CREATE PROCEDURE p1 ( ) BEGIN SELECT * FROM t12 ; END 	1
-statements_digest	84554971243e91106214dcb8f4eaa89b	CALL p1 ( ) 	2
-statements_digest	2bd1e1e6eb445f32e1d4b290c1961e6b	DROP PROCEDURE p1 	1
-statements_digest	5799522044ce9a4fa48dce5f4a3b047a	CREATE FUNCTION `func` ( a INTEGER , b INTEGER ) RETURNS INTEGER (?) RETURN a + b 	1
-statements_digest	59cbdd7ffc78a23bc2f650f8158067c6	SELECT func (...) 	2
-statements_digest	0b5a5297689c5036def6af8e8a8ce113	DROP FUNCTION func 	1
-statements_digest	10c7a2262748aa15496375d99f876fb2	CREATE TRIGGER trg BEFORE INSERT ON t12 FOR EACH ROW SET @? := ? 	1
-statements_digest	bb0154f3d32233f696b95d4127d29a3b	INSERT INTO t12 VALUES (?) 	2
-statements_digest	a975545baf024e8a173be77032d8fd01	DROP TRIGGER trg 	1
+statements_digest	e6aa634cf5a630087fefe9868b018329	PREPARE `stmt` FROM ? 	1
+statements_digest	4de34527c0dfef6ad8387d4359f78c78	EXECUTE `stmt` 	2
+statements_digest	54592849b6cf7386568c88e7fb20f61e	DEALLOCATE PREPARE `stmt` 	1
+statements_digest	ee90db91a06cedfbcccf80f951dc58cd	CREATE PROCEDURE `p1` ( ) BEGIN SELECT * FROM `t12` ; END 	1
+statements_digest	f964655a0037d2f194030bd024eab748	CALL `p1` ( ) 	2
+statements_digest	788d8223f67ba10d1b97fcaa42fec081	DROP PROCEDURE `p1` 	1
+statements_digest	5146273ef7d98ee1954d23fd98a35d68	CREATE FUNCTION `func` ( `a` INTEGER , `b` INTEGER ) RETURNS INTEGER (?) RETURN `a` + `b` 	1
+statements_digest	2c9b8e1e7f2ad3ca3c49abb2ea30e871	SELECT `func` (...) 	2
+statements_digest	f48e30910f8e7758b818c088916424cd	DROP FUNCTION `func` 	1
+statements_digest	53ccf1d241eeb749f1e1b7becc65006f	CREATE TRIGGER `trg` BEFORE INSERT ON `t12` FOR EACH ROW SET @? := ? 	1
+statements_digest	a9722a0717a57275431575c7204d71c1	INSERT INTO `t12` VALUES (?) 	2
+statements_digest	2d48809e6899f63ec304776466a63eef	DROP TRIGGER `trg` 	1
 SELECT digest, digest_text FROM performance_schema.events_statements_current;
 digest	digest_text
 ####################################

mysql-test/suite/perfschema/r/statement_digest_long_query.result

@@ -8,5 +8,5 @@ SELECT 1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1
 ####################################
 SELECT schema_name, digest, digest_text, count_star FROM events_statements_summary_by_digest;
 schema_name	digest	digest_text	count_star
-performance_schema	7536ab4a65b991a0b1a8b9851e8457c3	TRUNCATE TABLE events_statements_summary_by_digest 	1
+performance_schema	b6650e3f746acc31ef465aede8087e93	TRUNCATE TABLE `events_statements_summary_by_digest` 	1
 performance_schema	63f9aaeed7859671c6a42c75fcd43785	SELECT ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? 	1

mysql-test/suite/perfschema/r/table_aggregate_global_2u_2t.result

@@ -55,6 +55,7 @@ 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

mysql-test/suite/perfschema/r/table_aggregate_global_2u_3t.result

@@ -54,6 +54,7 @@ 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

mysql-test/suite/perfschema/r/table_aggregate_global_4u_2t.result

@@ -55,6 +55,7 @@ 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

mysql-test/suite/perfschema/r/table_aggregate_global_4u_3t.result

@@ -54,6 +54,7 @@ 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

mysql-test/suite/perfschema/r/table_aggregate_hist_2u_2t.result

@@ -53,6 +53,7 @@ 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

mysql-test/suite/perfschema/r/table_aggregate_hist_2u_3t.result

@@ -52,6 +52,7 @@ 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

mysql-test/suite/perfschema/r/table_aggregate_hist_4u_2t.result

@@ -53,6 +53,7 @@ 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

mysql-test/suite/perfschema/r/table_aggregate_hist_4u_3t.result

@@ -52,6 +52,7 @@ 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

mysql-test/suite/perfschema/r/table_aggregate_off.result

@@ -54,6 +54,7 @@ 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

mysql-test/suite/perfschema/r/table_aggregate_thread_2u_2t.result

@@ -55,6 +55,7 @@ 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

mysql-test/suite/perfschema/r/table_aggregate_thread_2u_3t.result

@@ -54,6 +54,7 @@ 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

mysql-test/suite/perfschema/r/table_aggregate_thread_4u_2t.result

@@ -55,6 +55,7 @@ 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

mysql-test/suite/perfschema/r/table_aggregate_thread_4u_3t.result

@@ -54,6 +54,7 @@ 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

mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_2t.result

@@ -57,6 +57,7 @@ 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

mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_3t.result

@@ -56,6 +56,7 @@ 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

mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_2t.result

@@ -57,6 +57,7 @@ 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

mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_3t.result

@@ -56,6 +56,7 @@ 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

mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_2t.result

@@ -55,6 +55,7 @@ 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

mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_3t.result

@@ -54,6 +54,7 @@ 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

mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_2t.result

@@ -55,6 +55,7 @@ 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

mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_3t.result

@@ -54,6 +54,7 @@ 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

mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_2t.result

@@ -57,6 +57,7 @@ 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

mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_3t.result

@@ -56,6 +56,7 @@ 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

mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_2t.result

@@ -57,6 +57,7 @@ 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

mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_3t.result

@@ -56,6 +56,7 @@ 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

mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_2t.result

@@ -57,6 +57,7 @@ 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

mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_3t.result

@@ -56,6 +56,7 @@ 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

mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_2t.result

@@ -57,6 +57,7 @@ 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

mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_3t.result

@@ -56,6 +56,7 @@ 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

mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_2t.result

@@ -55,6 +55,7 @@ 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

mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_3t.result

@@ -54,6 +54,7 @@ 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

mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_2t.result

@@ -55,6 +55,7 @@ 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

mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_3t.result

@@ -54,6 +54,7 @@ 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

mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_2t.result

@@ -57,6 +57,7 @@ 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

mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_3t.result

@@ -56,6 +56,7 @@ 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

mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_2t.result

@@ -57,6 +57,7 @@ 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

mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_3t.result

@@ -56,6 +56,7 @@ 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

mysql-test/suite/perfschema/r/unary_digest.result

@@ -39,9 +39,9 @@ ERROR 42S02: Table 'test.expect_unchanged' doesn't exist
 SELECT SCHEMA_NAME, DIGEST_TEXT, COUNT_STAR
 FROM performance_schema.events_statements_summary_by_digest;
 SCHEMA_NAME	DIGEST_TEXT	COUNT_STAR
-test	TRUNCATE TABLE performance_schema . events_statements_summary_by_digest 	1
-test	SELECT ? FROM expect_unary 	5
-test	SELECT ? + ? FROM expect_binary 	2
-test	SELECT ? - ? FROM expect_binary 	2
-test	INSERT INTO expect_full_reduce VALUES (...) 	27
-test	SELECT a - b , a + b , - a , - b , + a , + b FROM expect_unchanged 	1
+test	TRUNCATE TABLE `performance_schema` . `events_statements_summary_by_digest` 	1
+test	SELECT ? FROM `expect_unary` 	5
+test	SELECT ? + ? FROM `expect_binary` 	2
+test	SELECT ? - ? FROM `expect_binary` 	2
+test	INSERT INTO `expect_full_reduce` VALUES (...) 	27
+test	SELECT `a` - `b` , `a` + `b` , - `a` , - `b` , + `a` , + `b` FROM `expect_unchanged` 	1

mysql-test/suite/perfschema/t/global_read_lock.test

@@ -56,7 +56,9 @@ let $wait_condition= select 1 from performance_schema.events_waits_current where
 # Observe the blocked thread in the performance schema :)
 select event_name,
   left(source, locate(":", source)) as short_source,
-  timer_end, timer_wait, operation
+  if(timer_end IS NULL, NULL, "SET") as timer_end,
+  if(timer_wait IS NULL, NULL, "SET") as timer_wait,
+  operation
   from performance_schema.events_waits_current
   where event_name like "wait/synch/cond/sql/MDL_context::COND_wait_status";
 

mysql-test/suite/sys_vars/r/all_vars.result

@@ -11,5 +11,6 @@ select distinct variable_name as `there should be *no* variables listed below:`
 left join t1 on variable_name=test_name where test_name is null;
 there should be *no* variables listed below:
 max_digest_length
+pfs_max_digest_length
 drop table t1;
 drop table t2;

sql/gen_lex_token.cc

@@ -56,6 +56,7 @@ int tok_row_single_value= 0;
 int tok_row_single_value_list= 0;
 int tok_row_multiple_value= 0;
 int tok_row_multiple_value_list= 0;
+int tok_ident= 0;
 int tok_unused= 0;
 
 void set_token(int tok, const char *str)
@@ -212,6 +213,10 @@ void compute_tokens()
   tok_row_multiple_value_list= max_token_seen;
   set_token(tok_row_multiple_value_list, "(...) /* , ... */");
 
+  max_token_seen++;
+  tok_ident= max_token_seen;
+  set_token(tok_ident, "(tok_id)");
+
   max_token_seen++;
   tok_unused= max_token_seen;
   set_token(tok_unused, "UNUSED");
@@ -323,6 +328,7 @@ void print_tokens()
   printf("#define TOK_ROW_SINGLE_VALUE_LIST %d\n", tok_row_single_value_list);
   printf("#define TOK_ROW_MULTIPLE_VALUE %d\n", tok_row_multiple_value);
   printf("#define TOK_ROW_MULTIPLE_VALUE_LIST %d\n", tok_row_multiple_value_list);
+  printf("#define TOK_IDENT %d\n", tok_ident);
   printf("#define TOK_UNUSED %d\n", tok_unused);
 }
 

sql/mysqld.cc

@@ -5276,8 +5276,6 @@ int mysqld_main(int argc, char **argv)
       pfs_param.m_hints.m_table_open_cache= tc_size;
       pfs_param.m_hints.m_max_connections= max_connections;
       pfs_param.m_hints.m_open_files_limit= open_files_limit;
-      /* the performance schema digest size is the same as the SQL layer */
-      pfs_param.m_max_digest_length= max_digest_length;
       PSI_hook= initialize_performance_schema(&pfs_param);
       if (PSI_hook == NULL)
       {

sql/sql_digest.cc

@@ -223,6 +223,7 @@ void compute_digest_text(const sql_digest_storage* digest_storage,
     /* All identifiers are printed with their name. */
     case IDENT:
     case IDENT_QUOTED:
+    case TOK_IDENT:
       {
         char *id_ptr= NULL;
         int id_len= 0;
@@ -258,13 +259,10 @@ void compute_digest_text(const sql_digest_storage* digest_storage,
           break;
         }
         /* Copy the converted identifier into the digest string. */
-        if (tok == IDENT_QUOTED)
-          digest_output->append("`", 1);
+        digest_output->append("`", 1);
         if (id_length > 0)
           digest_output->append(id_string, id_length);
-        if (tok == IDENT_QUOTED)
-          digest_output->append("`", 1);
-        digest_output->append(" ", 1);
+        digest_output->append("` ", 2);
       }
       break;
 
@@ -574,6 +572,15 @@ sql_digest_state* digest_add_token(sql_digest_state *state,
       char *yytext= lex_token->lex_str.str;
       size_t yylen= lex_token->lex_str.length;
 
+      /*
+        REDUCE:
+          TOK_IDENT := IDENT | IDENT_QUOTED
+        The parser gives IDENT or IDENT_TOKEN for the same text,
+        depending on the character set used.
+        We unify both to always print the same digest text,
+        and always have the same digest hash.
+      */
+      token= TOK_IDENT;
       /* Add this token and identifier string to digest storage. */
       store_token_identifier(digest_storage, token, yylen, yytext);
 

sql/sys_vars.cc

@@ -325,6 +325,14 @@ static Sys_var_long Sys_pfs_digest_size(
        DEFAULT(-1),
        BLOCK_SIZE(1));
 
+static Sys_var_long Sys_pfs_max_digest_length(
+       "performance_schema_max_digest_length",
+       "Maximum length considered for digest text, when stored in performance_schema tables.",
+       PARSED_EARLY READ_ONLY GLOBAL_VAR(pfs_param.m_max_digest_length),
+       CMD_LINE(REQUIRED_ARG), VALID_RANGE(0, 1024 * 1024),
+       DEFAULT(1024),
+       BLOCK_SIZE(1));
+
 static Sys_var_long Sys_pfs_connect_attrs_size(
        "performance_schema_session_connect_attrs_size",
        "Size of session attribute string buffer per thread."
@@ -1315,7 +1323,7 @@ static Sys_var_ulong Sys_max_connect_errors(
 
 static Sys_var_long Sys_max_digest_length(
        "max_digest_length", "Maximum length considered for digest text.",
-       PARSED_EARLY READ_ONLY GLOBAL_VAR(max_digest_length),
+       READ_ONLY GLOBAL_VAR(max_digest_length),
        CMD_LINE(REQUIRED_ARG),
        VALID_RANGE(0, 1024 * 1024), DEFAULT(1024), BLOCK_SIZE(1));
 

storage/perfschema/ha_perfschema.cc

@@ -205,7 +205,7 @@ maria_declare_plugin(perfschema)
   0x0001,
   pfs_status_vars,
   NULL,
-  "5.6.25",
+  "5.6.26",
   MariaDB_PLUGIN_MATURITY_STABLE
 }
 maria_declare_plugin_end;

storage/perfschema/pfs_account.cc

@@ -69,8 +69,8 @@ int init_account(const PFS_global_param *param)
 
   if (account_max > 0)
   {
-    account_array= PFS_MALLOC_ARRAY(account_max, PFS_account,
-                                      MYF(MY_ZEROFILL));
+    account_array= PFS_MALLOC_ARRAY(account_max, sizeof(PFS_account), PFS_account,
+                                    MYF(MY_ZEROFILL));
     if (unlikely(account_array == NULL))
       return 1;
   }

storage/perfschema/pfs_con_slice.cc

@@ -1,4 +1,4 @@
-/* Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
 
   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
@@ -39,7 +39,8 @@ PFS_connection_slice::alloc_waits_slice(uint sizing)
 
   if (sizing > 0)
   {
-    slice= PFS_MALLOC_ARRAY(sizing, PFS_single_stat, MYF(MY_ZEROFILL));
+    slice= PFS_MALLOC_ARRAY(sizing, sizeof(PFS_single_stat), PFS_single_stat,
+                            MYF(MY_ZEROFILL));
     if (unlikely(slice == NULL))
       return NULL;
 
@@ -58,7 +59,8 @@ PFS_connection_slice::alloc_stages_slice(uint sizing)
 
   if (sizing > 0)
   {
-    slice= PFS_MALLOC_ARRAY(sizing, PFS_stage_stat, MYF(MY_ZEROFILL));
+    slice= PFS_MALLOC_ARRAY(sizing, sizeof(PFS_stage_stat), PFS_stage_stat,
+                            MYF(MY_ZEROFILL));
     if (unlikely(slice == NULL))
       return NULL;
 
@@ -77,7 +79,8 @@ PFS_connection_slice::alloc_statements_slice(uint sizing)
 
   if (sizing > 0)
   {
-    slice= PFS_MALLOC_ARRAY(sizing, PFS_statement_stat, MYF(MY_ZEROFILL));
+    slice= PFS_MALLOC_ARRAY(sizing, sizeof(PFS_statement_stat), PFS_statement_stat,
+                            MYF(MY_ZEROFILL));
     if (unlikely(slice == NULL))
       return NULL;
 

storage/perfschema/pfs_digest.cc

@@ -33,7 +33,7 @@
 #include "sql_string.h"
 #include <string.h>
 
-ulong digest_max= 0;
+size_t digest_max= 0;
 ulong digest_lost= 0;
 
 /** EVENTS_STATEMENTS_HISTORY_LONG circular buffer. */
@@ -57,8 +57,6 @@ static bool digest_hash_inited= false;
 */
 int init_digest(const PFS_global_param *param)
 {
-  unsigned int index;
-
   /*
     Allocate memory for statements_digest_stat_array based on
     performance_schema_digests_size values
@@ -73,6 +71,7 @@ int init_digest(const PFS_global_param *param)
 
   statements_digest_stat_array=
     PFS_MALLOC_ARRAY(digest_max,
+                     sizeof(PFS_statements_digest_stat),
                      PFS_statements_digest_stat,
                      MYF(MY_ZEROFILL));
 
@@ -84,8 +83,12 @@ int init_digest(const PFS_global_param *param)
 
   if (pfs_max_digest_length > 0)
   {
+    /* Size of each digest array. */
+    size_t digest_memory_size= pfs_max_digest_length * sizeof(unsigned char);
+
     statements_digest_token_array=
-      PFS_MALLOC_ARRAY(digest_max * pfs_max_digest_length,
+      PFS_MALLOC_ARRAY(digest_max,
+                       digest_memory_size,
                        unsigned char,
                        MYF(MY_ZEROFILL));
 
@@ -96,7 +99,7 @@ int init_digest(const PFS_global_param *param)
     }
   }
 
-  for (index= 0; index < digest_max; index++)
+  for (size_t index= 0; index < digest_max; index++)
   {
     statements_digest_stat_array[index].reset_data(statements_digest_token_array
                                                    + index * pfs_max_digest_length, pfs_max_digest_length);
@@ -334,8 +337,6 @@ void PFS_statements_digest_stat::reset_index(PFS_thread *thread)
 
 void reset_esms_by_digest()
 {
-  uint index;
-
   if (statements_digest_stat_array == NULL)
     return;
 
@@ -344,7 +345,7 @@ void reset_esms_by_digest()
     return;
 
   /* Reset statements_digest_stat_array. */
-  for (index= 0; index < digest_max; index++)
+  for (size_t index= 0; index < digest_max; index++)
   {
     statements_digest_stat_array[index].reset_index(thread);
     statements_digest_stat_array[index].reset_data(statements_digest_token_array + index * pfs_max_digest_length, pfs_max_digest_length);

storage/perfschema/pfs_digest.h

@@ -27,7 +27,7 @@
 #include "sql_digest.h"
 
 extern bool flag_statements_digest;
-extern ulong digest_max;
+extern size_t digest_max;
 extern ulong digest_lost;
 struct PFS_thread;