Merge branch 'mysql-5.6' into mysql-5.7

Author: Rahul Malik

mysql-test/suite/innodb/r/events-merge-tmp-path.result

@@ -1,10 +1,7 @@
-update performance_schema.setup_instruments set enabled='yes';
-update performance_schema.setup_consumers set enabled='yes';
+update  performance_schema.setup_instruments set enabled='YES' where name like '%innodb_temp%';
+update performance_schema.setup_consumers set enabled='YES';
 use test;
-drop table if exists t1;
-Warnings:
-Note	1051	Unknown table 'test.t1'
-CREATE TABLE `t1`(`id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, `name1` varchar(250) NOT NULL, `name2` varchar(250) DEFAULT NULL, `name3` varchar(250) DEFAULT NULL, `name4` varchar(250) DEFAULT NULL, PRIMARY KEY (`id`,`name1`(10)) ) engine=InnoDB;
+CREATE TABLE `t1`(`id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, `name1` varchar(180) NOT NULL, `name2` varchar(180) DEFAULT NULL, `name3` varchar(180) DEFAULT NULL, `name4` varchar(180) DEFAULT NULL, PRIMARY KEY (`id`,`name1`(10)) ) engine=InnoDB;
 set @id:=0;
 insert into t1 values
 (@id:=@id+1,md5(rand()*1000000),md5(rand()*1000000),md5(rand()*1000000),md5(rand()*1000000))
@@ -13,9 +10,10 @@ insert into t1 values
 , (@id:=@id+1,md5(rand()*1000000),md5(rand()*1000000),md5(rand()*1000000),md5(rand()*1000000));
 insert into `t1`(`id`,`name1`,`name2`,`name3`,`name4`)
 select  @id:=@id+1,md5(rand()*1000000),md5(rand()*1000000),md5(rand()*1000000),md5(rand()*1000000)  from
-`t1` k1, `t1` k2, `t1` k3, `t1` k4,`t1` k5,`t1` k6,`t1` k7,`t1` k8,`t1` k9;
-create index i_dtyp_big on `t1`(name1) algorithm=inplace;;
-select distinct object_name from performance_schema.events_waits_history_long where event_name like '%wait%io%file%innodb%innodb_temp_file%';
+`t1` k1, `t1` k2, `t1` k3, `t1` k4,`t1` k5,`t1` k6;
+create index i_dtyp_big on `t1`(name1) algorithm=inplace;
+select distinct object_name from performance_schema.events_waits_history_long where event_name like '%wait%io%file%innodb%innodb_temp_file%'
+and object_name like '%Innodb Merge Temp File%';
 object_name
 MYSQL_TEST_DIR#Innodb Merge Temp File
 drop table t1;

mysql-test/suite/innodb/t/events-merge-tmp-path-master.opt

@@ -1 +1 @@
---innodb_sort_buffer_size=64k --innodb-buffer-pool-size=8M --tmpdir=$MYSQLTEST_VARDIR_ABS
+--performance_schema_events_waits_history_long_size=100000 --innodb_sort_buffer_size=64k --innodb-buffer-pool-size=8M --tmpdir=$MYSQLTEST_VARDIR_ABS

mysql-test/suite/innodb/t/events-merge-tmp-path.test

@@ -1,13 +1,12 @@
 ### test to check if performance_schema.events_waits_history_long
 ### reflects correct data
---connect (con1, localhost, root,,)
---connect (con2, localhost, root,,)
---connection con1
-update performance_schema.setup_instruments set enabled='yes';
-update performance_schema.setup_consumers set enabled='yes';
+
+### disable for embedded server
+--source include/not_embedded.inc
+update  performance_schema.setup_instruments set enabled='YES' where name like '%innodb_temp%';
+update performance_schema.setup_consumers set enabled='YES';
 use test;
-drop table if exists t1;
-CREATE TABLE `t1`(`id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, `name1` varchar(250) NOT NULL, `name2` varchar(250) DEFAULT NULL, `name3` varchar(250) DEFAULT NULL, `name4` varchar(250) DEFAULT NULL, PRIMARY KEY (`id`,`name1`(10)) ) engine=InnoDB;
+CREATE TABLE `t1`(`id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, `name1` varchar(180) NOT NULL, `name2` varchar(180) DEFAULT NULL, `name3` varchar(180) DEFAULT NULL, `name4` varchar(180) DEFAULT NULL, PRIMARY KEY (`id`,`name1`(10)) ) engine=InnoDB;
  set @id:=0;
 
 ### populate random data
@@ -18,19 +17,15 @@ CREATE TABLE `t1`(`id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, `name1` varc
 , (@id:=@id+1,md5(rand()*1000000),md5(rand()*1000000),md5(rand()*1000000),md5(rand()*1000000));
 insert into `t1`(`id`,`name1`,`name2`,`name3`,`name4`)
 select  @id:=@id+1,md5(rand()*1000000),md5(rand()*1000000),md5(rand()*1000000),md5(rand()*1000000)  from
-`t1` k1, `t1` k2, `t1` k3, `t1` k4,`t1` k5,`t1` k6,`t1` k7,`t1` k8,`t1` k9;
+`t1` k1, `t1` k2, `t1` k3, `t1` k4,`t1` k5,`t1` k6;
 
 #create inplace index and check if data is mention in events_waits_h
---send create index i_dtyp_big on `t1`(name1) algorithm=inplace;
+create index i_dtyp_big on `t1`(name1) algorithm=inplace;
 
---connection con2
---real_sleep 2
 --replace_regex /[\\\/]Innodb Merge Temp File/#Innodb Merge Temp File/
 --replace_result $MYSQLTEST_VARDIR_ABS MYSQL_TEST_DIR
-select distinct object_name from performance_schema.events_waits_history_long where event_name like '%wait%io%file%innodb%innodb_temp_file%';
+
+select distinct object_name from performance_schema.events_waits_history_long where event_name like '%wait%io%file%innodb%innodb_temp_file%'
+and object_name like '%Innodb Merge Temp File%';
 drop table t1;
---connection con1
---reap
---disconnect con1
---disconnect con2