WL#7899 after-fix: Move some innodb_zip tests to innodb.

innodb.temp_table: Renamed from innodb_zip.wl6470_1.

innodb.temp_table_savepoint: Renamed from innodb_zip.wl6470_2.

Also, remove some unnecessary statements.
Since WL#7899, innodb_file_per_table has no effect on temporary tables.

Reviewed-by: Debarun Banerjee <debarun.banerjee@oracle.com>
RB: 12984

Author: Marko Mäkelä

mysql-test/suite/innodb_zip/include/innodb_dml_ops.inc renamed to mysql-test/suite/innodb/include/dml_ops.inc

@@ -194,8 +194,7 @@ count(*)
 drop procedure populate_t1;
 drop procedure populate_t1_small;
 drop procedure populate_t1_small2;
-drop table t1;
-drop table t2;
+drop temporary table t1,t2;
 create temporary table t1
 (keyc int, c1 char(100), c2 char(100),
 primary key(keyc), index sec_index(c1)
@@ -210,7 +209,7 @@ create temporary table t2
 (keyc int, c1 char(100), c2 char(100),
 primary key(keyc), index sec_index(c1)
 ) engine = innodb key_block_size = 8;
-set innodb_strict_mode=default;
+set innodb_strict_mode=on;
 create procedure populate_t1()
 begin
 declare i int default 1;
@@ -399,9 +398,7 @@ count(*)
 drop procedure populate_t1;
 drop procedure populate_t1_small;
 drop procedure populate_t1_small2;
-drop table t1;
-drop table t2;
-set global innodb_file_per_table = 0;
+drop temporary table t1, t2;
 create temporary table t1
 (keyc int, c1 char(100), c2 char(100),
 primary key(keyc), index sec_index(c1)
@@ -598,6 +595,3 @@ count(*)
 drop procedure populate_t1;
 drop procedure populate_t1_small;
 drop procedure populate_t1_small2;
-drop table t1;
-drop table t2;
-set global innodb_file_per_table = 1;

mysql-test/suite/innodb_zip/r/wl6470_1.result renamed to mysql-test/suite/innodb/r/temp_table.result

@@ -1,10 +1,10 @@
+SET sql_mode = 'NO_ENGINE_SUBSTITUTION';
 Warnings:
 Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
 create procedure populate_tables()
 begin
 declare n int default 20;
 declare inner_loop int default 100;
-set global innodb_file_per_table=on;
 create temporary table t1(c1 int not null,
 c2 int not null,
 c3 char(255) not null,
@@ -15,7 +15,7 @@ c7 varchar(2000) not null,
 c8 datetime,
 c9 decimal(6,3),
 primary key (c1),
-index (c3,c4(50),c5(50)), 
+index (c3,c4(50),c5(50)),
 index (c2))
 engine=innodb row_format=redundant;
 create temporary table t2(c1 int not null,
@@ -91,7 +91,7 @@ update t2 set c1 = c1 + 1000 where c1 > 10;
 update t4 set c1 = c1 + 1000 where c1 > 10;
 update t5 set c1 = c1 + 1000 where c1 > 10;
 rollback;
-end if;     
+end if;
 start transaction;
 insert into t1 values(n+inner_loop,n+inner_loop,repeat(concat(' tc3_',n+inner_loop),30),
 repeat(concat(' tc4_',n+inner_loop),800),repeat(concat(' tc_',n+inner_loop),800),
@@ -157,7 +157,7 @@ rollback to a;
 commit;
 commit;
 rollback;
-set n = n - 1; 
+set n = n - 1;
 end while;
 end|
 #---client 1 : dml operation ---"
@@ -460,7 +460,7 @@ count(*)
 select count(*) from temp_1;
 count(*)
 20
-alter table temp_1 add column c10 int default 99 , 
+alter table temp_1 add column c10 int default 99 ,
 add column c11 varchar(100) default 'test';
 alter table temp_1 add primary key (c1);
 insert into temp_1 (c1,c2,c3,c4,c5,c6,c7,c8,c9) values (-1,-1,'a','a','a','a','a',now(),100.55);
@@ -470,7 +470,7 @@ c1	c2	c3	c4	c5	c6	c7	c9	c10	c11
 select count(*) from temp_1 where c10 = 99 and c11 like 'test';
 count(*)
 21
-insert into temp_1 (c1,c2,c3,c4,c5,c6,c7,c8,c9) values (-1,-1,'a','a','a','a','a',now(),100.55) 
+insert into temp_1 (c1,c2,c3,c4,c5,c6,c7,c8,c9) values (-1,-1,'a','a','a','a','a',now(),100.55)
 on duplicate  key update c1=-2,c2=-2;
 select c1,c2,c3,c4,c5,c6,c7,c9,c10,c11 from temp_1 where c1 < 0;
 c1	c2	c3	c4	c5	c6	c7	c9	c10	c11

mysql-test/suite/innodb_zip/r/wl6470_2.result renamed to mysql-test/suite/innodb/r/temp_table_savepoint.result

@@ -20,9 +20,8 @@ create temporary table t2
 	(keyc int, c1 char(100), c2 char(100),
 	 primary key(keyc), index sec_index(c1)
 	) engine = innodb;
---source suite/innodb_zip/include/innodb_dml_ops.inc
-drop table t1;
-drop table t2;
+--source suite/innodb/include/dml_ops.inc
+drop temporary table t1,t2;
 #
 --error ER_UNSUPPORT_COMPRESSED_TEMPORARY_TABLE
 create temporary table t1
@@ -39,14 +38,11 @@ create temporary table t2
 	(keyc int, c1 char(100), c2 char(100),
 	 primary key(keyc), index sec_index(c1)
 	) engine = innodb key_block_size = 8;
-set innodb_strict_mode=default;
+set innodb_strict_mode=on;
 --enable_warnings
---source suite/innodb_zip/include/innodb_dml_ops.inc
-drop table t1;
-drop table t2;
+--source suite/innodb/include/dml_ops.inc
+drop temporary table t1, t2;
 #
-let $file_per_table = `select @@innodb_file_per_table`;
-set global innodb_file_per_table = 0;
 create temporary table t1
 	(keyc int, c1 char(100), c2 char(100),
 	 primary key(keyc), index sec_index(c1)
@@ -55,9 +51,4 @@ create temporary table t2
 	(keyc int, c1 char(100), c2 char(100),
 	 primary key(keyc), index sec_index(c1)
 	) engine = innodb;
---source suite/innodb_zip/include/innodb_dml_ops.inc
-drop table t1;
-drop table t2;
-eval set global innodb_file_per_table = $file_per_table;
-#
-
+--source suite/innodb/include/dml_ops.inc

mysql-test/suite/innodb_zip/t/wl6470_1.test renamed to mysql-test/suite/innodb/t/temp_table.test

@@ -1,11 +1,10 @@
 --source include/have_innodb.inc
---source include/have_innodb_max_16k.inc
 --source include/no_valgrind_without_big.inc
 
 ####################################################################
 # TC to test temp-table DML optimization changes for correctness   #
 # Sceanrio covered in single testcase :                            #
-# - Tables with row format(redundant,compressed,dynamic,compact    #
+# - Tables with row format(redundant,dynamic,compact)              #
 # - Table with primary,composite,prefix,secondary index            #
 # - Insert/delete/update with transactioons                        #
 # - Transaction with commit,rollback,savepoint statements          #
@@ -14,7 +13,7 @@
 # - Inserting data using                                           #
 #   - Insert into .. , Load data infile..,insert ignore            #
 #   - Insert into .. on duplicate update                           #
-# - Check basic delete and upadte [ignore]                         #
+# - Check basic delete and update [ignore]                         #
 # - Check constraints like duplicate key,default value             #
 # - Alter add column , add primary key                             #
 # - with prepare and execute statement                             #
@@ -28,22 +27,16 @@ if (`SELECT COUNT(*) = 0 FROM performance_schema.global_status WHERE LOWER(varia
 }
 --enable_warnings
 
-
-# Save initial values of server variable
---disable_query_log
-let $innodb_file_per_table_orig=`select @@innodb_file_per_table`;
 SET sql_mode = 'NO_ENGINE_SUBSTITUTION';
---enable_query_log
 
-# Create procedure to perform 
+# Create procedure to perform
 # 1. Create temp table with row types , index , sufficent data types
-# 2. Perform DML with transaction 
+# 2. Perform DML with transaction
 delimiter |;
 create procedure populate_tables()
    begin
    declare n int default 20;
    declare inner_loop int default 100;
-   set global innodb_file_per_table=on;
 
    create temporary table t1(c1 int not null,
    c2 int not null,
@@ -55,7 +48,7 @@ create procedure populate_tables()
    c8 datetime,
    c9 decimal(6,3),
    primary key (c1),
-   index (c3,c4(50),c5(50)), 
+   index (c3,c4(50),c5(50)),
    index (c2))
    engine=innodb row_format=redundant;
 
@@ -138,7 +131,7 @@ create procedure populate_tables()
         update t4 set c1 = c1 + 1000 where c1 > 10;
         update t5 set c1 = c1 + 1000 where c1 > 10;
         rollback;
-     end if;     
+     end if;
 
      start transaction;
      insert into t1 values(n+inner_loop,n+inner_loop,repeat(concat(' tc3_',n+inner_loop),30),
@@ -210,7 +203,7 @@ create procedure populate_tables()
      commit;
      commit;
      rollback;
-     set n = n - 1; 
+     set n = n - 1;
      end while;
 end|
 delimiter ;|
@@ -222,19 +215,13 @@ connect (con2,localhost,root,,);
 --echo #---client 1 : dml operation ---"
 connection con1;
 -- disable_query_log
-eval set global innodb_file_per_table=$innodb_file_per_table_orig;
--- enable_query_log
--- disable_query_log
 # call procedure
 --send call populate_tables();
 -- enable_query_log
 
 --echo #---client 2 : dml operation ---"
 connection con2;
 -- disable_query_log
-eval set global innodb_file_per_table=$innodb_file_per_table_orig;
--- enable_query_log
--- disable_query_log
 # call procedure
 --send call populate_tables();
 -- enable_query_log
@@ -327,7 +314,7 @@ select count(*) from t2 where c1 = 140;
 select count(*) from t4 where c1 = 140;
 select count(*) from t5 where c1 = 140;
 
-# Load data infile 
+# Load data infile
 --echo "running select * into outfile <file> from t1 ;
 --disable_query_log
 eval select * into outfile "$MYSQLTEST_VARDIR/tmp/t1.outfile" from t1;
@@ -342,14 +329,14 @@ eval load data infile '$MYSQLTEST_VARDIR/tmp/t1.outfile' into table temp_1;
 select count(*) from temp_1;
 
 # Alter table to add column and primary key
-alter table temp_1 add column c10 int default 99 , 
+alter table temp_1 add column c10 int default 99 ,
 add column c11 varchar(100) default 'test';
 alter table temp_1 add primary key (c1);
 insert into temp_1 (c1,c2,c3,c4,c5,c6,c7,c8,c9) values (-1,-1,'a','a','a','a','a',now(),100.55);
 select c1,c2,c3,c4,c5,c6,c7,c9,c10,c11 from temp_1 where c1 < 0;
 select count(*) from temp_1 where c10 = 99 and c11 like 'test';
 # insert on duplicate key update
-insert into temp_1 (c1,c2,c3,c4,c5,c6,c7,c8,c9) values (-1,-1,'a','a','a','a','a',now(),100.55) 
+insert into temp_1 (c1,c2,c3,c4,c5,c6,c7,c8,c9) values (-1,-1,'a','a','a','a','a',now(),100.55)
 on duplicate  key update c1=-2,c2=-2;
 select c1,c2,c3,c4,c5,c6,c7,c9,c10,c11 from temp_1 where c1 < 0;
 
@@ -410,9 +397,3 @@ drop prepare stm_2;
 drop table prep_1;
 
 --remove_file $MYSQLTEST_VARDIR/tmp/t1.outfile
-
--- disable_query_log
-eval set global innodb_file_per_table=$innodb_file_per_table_orig;
-SET sql_mode = default;
--- enable_query_log
-