Fixed Bug#21461026: INCONSISTEND CASING ON STORAGE ENGINE VARIABLE VALUES

Benny Wang · Benny Wang · commit 707bacdbb7a9 · 2015-08-03T15:35:26.000+02:00
Recorded the failures of PB2 tests.
diff --git a/mysql-test/r/insert_select.result b/mysql-test/r/insert_select.result
@@ -850,7 +850,7 @@ INSERT INTO t1 VALUES (1), (2), (3), (4), (5);
 call mtr.add_suppression("mysqld.*: The table '.*#sql.*' is full");
 INSERT IGNORE INTO t1 SELECT t1.a FROM t1,t1 t2,t1 t3,t1 t4,t1 t5,t1 t6,t1 t7;
 Got one of the listed errors
-set global internal_tmp_disk_storage_engine = TMP_TABLE_ENGINE;
+set global internal_tmp_disk_storage_engine = InnoDB;
 SET GLOBAL myisam_data_pointer_size = @old_myisam_data_pointer_size;
 DROP TABLE t1;
 End of 5.0 tests
diff --git a/mysql-test/r/mysqld--help-notwin.result b/mysql-test/r/mysqld--help-notwin.result
@@ -1292,7 +1292,7 @@ init-slave
 initialize FALSE
 initialize-insecure FALSE
 interactive-timeout 28800
-internal-tmp-disk-storage-engine INNODB
+internal-tmp-disk-storage-engine InnoDB
 join-buffer-size 262144
 keep-files-on-create FALSE
 key-buffer-size 8388608
diff --git a/mysql-test/r/mysqld--help-win.result b/mysql-test/r/mysqld--help-win.result
@@ -1290,7 +1290,7 @@ init-slave
 initialize FALSE
 initialize-insecure FALSE
 interactive-timeout 28800
-internal-tmp-disk-storage-engine INNODB
+internal-tmp-disk-storage-engine InnoDB
 join-buffer-size 262144
 keep-files-on-create FALSE
 key-buffer-size 8388608
diff --git a/mysql-test/r/temp_pool.result b/mysql-test/r/temp_pool.result
@@ -18,4 +18,4 @@ a
 2
 #cleanup
 DROP TABLE t1, pid_table;
-set global internal_tmp_disk_storage_engine = INNODB;
+set global internal_tmp_disk_storage_engine = InnoDB;
diff --git a/mysql-test/suite/innodb/include/query_workload_itt.inc b/mysql-test/suite/innodb/include/query_workload_itt.inc
@@ -159,7 +159,6 @@ select b, count(a), sum(a), avg(a), std(a), min(a),
 #
 # choose innodb to create tmp table
 --disable_warnings
---replace_result INNODB TMP_TABLE_ENGINE MYISAM TMP_TABLE_ENGINE
 select sql_big_result * from information_schema.global_variables where variable_name like 'internal_tmp_disk_storage_engine';
 --enable_warnings
 
diff --git a/mysql-test/suite/innodb/r/optimizer_temporary_table.result b/mysql-test/suite/innodb/r/optimizer_temporary_table.result
@@ -2219,7 +2219,7 @@ b	1	2	2.0000	0	2	2	2	2
 c	3	10	3.3333	0.4714045207910316	3	4	0	7
 select sql_big_result * from information_schema.global_variables where variable_name like 'internal_tmp_disk_storage_engine';
 VARIABLE_NAME	VARIABLE_VALUE
-INTERNAL_TMP_DISK_STORAGE_ENGINE	TMP_TABLE_ENGINE
+INTERNAL_TMP_DISK_STORAGE_ENGINE	InnoDB
 select 1 union distinct select 1 union all select 1;
 1
 1
@@ -4072,7 +4072,7 @@ b	1	2	2.0000	0	2	2	2	2
 c	3	10	3.3333	0.4714045207910316	3	4	0	7
 select sql_big_result * from information_schema.global_variables where variable_name like 'internal_tmp_disk_storage_engine';
 VARIABLE_NAME	VARIABLE_VALUE
-INTERNAL_TMP_DISK_STORAGE_ENGINE	TMP_TABLE_ENGINE
+INTERNAL_TMP_DISK_STORAGE_ENGINE	InnoDB
 select 1 union distinct select 1 union all select 1;
 1
 1
diff --git a/mysql-test/suite/innodb_gis/r/geometry.result b/mysql-test/suite/innodb_gis/r/geometry.result
@@ -6,7 +6,7 @@ Variable_name	Value
 default_storage_engine	InnoDB
 default_tmp_storage_engine	InnoDB
 disabled_storage_engines	
-internal_tmp_disk_storage_engine	TMP_TABLE_ENGINE
+internal_tmp_disk_storage_engine	InnoDB
 USE test;
 DROP TABLE IF EXISTS t1, gis_point, gis_line, gis_polygon;
 DROP TABLE IF EXISTS gis_multi_point, gis_multi_line, gis_multi_polygon;
diff --git a/mysql-test/suite/innodb_gis/t/geometry.test b/mysql-test/suite/innodb_gis/t/geometry.test
@@ -19,7 +19,6 @@ SET innodb_strict_mode=OFF;
 # Turn on the geometry data print.
 SET SESSION debug="+d,row_print_geometry_data";
 
---replace_result INNODB TMP_TABLE_ENGINE MYISAM TMP_TABLE_ENGINE 
 SHOW VARIABLES LIKE '%engine%';
 
 #
diff --git a/mysql-test/suite/sys_vars/r/internal_tmp_disk_storage_engine_basic.result b/mysql-test/suite/sys_vars/r/internal_tmp_disk_storage_engine_basic.result
@@ -1,22 +1,22 @@
 SET @start_global_value = @@global.internal_tmp_disk_storage_engine;
 SELECT @start_global_value;
 @start_global_value
-INNODB
+InnoDB
 '#--------------------FN_DYNVARS_005_01-------------------------#'
 SET @@global.internal_tmp_disk_storage_engine = INNODB;
 SET @@global.internal_tmp_disk_storage_engine = DEFAULT;
 SELECT @@global.internal_tmp_disk_storage_engine;
 @@global.internal_tmp_disk_storage_engine
-INNODB
+InnoDB
 '#--------------------FN_DYNVARS_005_02-------------------------#'
 SET @@global.internal_tmp_disk_storage_engine = MYISAM;
 SELECT @@global.internal_tmp_disk_storage_engine;
 @@global.internal_tmp_disk_storage_engine
-MYISAM
+MyISAM
 SET @@global.internal_tmp_disk_storage_engine = INNODB;
 SELECT @@global.internal_tmp_disk_storage_engine;
 @@global.internal_tmp_disk_storage_engine
-INNODB
+InnoDB
 '#--------------------FN_DYNVARS_005_03-------------------------#'
 SET @@global.internal_tmp_disk_storage_engine = 8199;
 ERROR 42000: Variable 'internal_tmp_disk_storage_engine' can't be set to the value of '8199'
@@ -35,11 +35,11 @@ VARIABLE_VALUE
 SET @@global.internal_tmp_disk_storage_engine = TRUE;
 SELECT @@global.internal_tmp_disk_storage_engine;
 @@global.internal_tmp_disk_storage_engine
-INNODB
+InnoDB
 SET @@global.internal_tmp_disk_storage_engine = FALSE;
 SELECT @@global.internal_tmp_disk_storage_engine;
 @@global.internal_tmp_disk_storage_engine
-MYISAM
+MyISAM
 '#------------------FN_DYNVARS_005_06-----------------------#'
 SET @@session.internal_tmp_disk_storage_engine= 'MYISAM';
 ERROR HY000: Variable 'internal_tmp_disk_storage_engine' is a GLOBAL variable and should be set with SET GLOBAL
@@ -49,4 +49,4 @@ ERROR HY000: Variable 'internal_tmp_disk_storage_engine' is a GLOBAL variable
 SET @@global.internal_tmp_disk_storage_engine = @start_global_value;
 SELECT @@global.internal_tmp_disk_storage_engine;
 @@global.internal_tmp_disk_storage_engine
-INNODB
+InnoDB
diff --git a/mysql-test/t/insert_select.test b/mysql-test/t/insert_select.test
@@ -420,7 +420,6 @@ INSERT INTO t1 VALUES (1), (2), (3), (4), (5);
 call mtr.add_suppression("mysqld.*: The table '.*#sql.*' is full");
 --error ER_RECORD_FILE_FULL,ER_RECORD_FILE_FULL
 INSERT IGNORE INTO t1 SELECT t1.a FROM t1,t1 t2,t1 t3,t1 t4,t1 t5,t1 t6,t1 t7;
---REPLACE_RESULT INNODB TMP_TABLE_ENGINE MYISAM TMP_TABLE_ENGINE 
 eval set global internal_tmp_disk_storage_engine = $default_internal_tmp_se;
 
 # Cleanup

Original file line number	Diff line number	Diff line change
`@@ -18,4 +18,4 @@ a`
`18`	`18`	`2`
`19`	`19`	`#cleanup`
`20`	`20`	`DROP TABLE t1, pid_table;`
`21`		`-set global internal_tmp_disk_storage_engine = INNODB;`
	`21`	`+set global internal_tmp_disk_storage_engine = InnoDB;`
Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,6 @@ select b, count(a), sum(a), avg(a), std(a), min(a),`
`159`	`159`	`#`
`160`	`160`	`# choose innodb to create tmp table`
`161`	`161`	`--disable_warnings`
`162`		`---replace_result INNODB TMP_TABLE_ENGINE MYISAM TMP_TABLE_ENGINE`
`163`	`162`	`select sql_big_result * from information_schema.global_variables where variable_name like 'internal_tmp_disk_storage_engine';`
`164`	`163`	`--enable_warnings`
`165`	`164`
Original file line number	Diff line number	Diff line change
`@@ -2219,7 +2219,7 @@ b 1 2 2.0000 0 2 2 2 2`
`2219`	`2219`	`c 3 10 3.3333 0.4714045207910316 3 4 0 7`
`2220`	`2220`	`select sql_big_result * from information_schema.global_variables where variable_name like 'internal_tmp_disk_storage_engine';`
`2221`	`2221`	`VARIABLE_NAME VARIABLE_VALUE`
`2222`		`-INTERNAL_TMP_DISK_STORAGE_ENGINE TMP_TABLE_ENGINE`
	`2222`	`+INTERNAL_TMP_DISK_STORAGE_ENGINE InnoDB`
`2223`	`2223`	`select 1 union distinct select 1 union all select 1;`
`2224`	`2224`	`1`
`2225`	`2225`	`1`
`@@ -4072,7 +4072,7 @@ b 1 2 2.0000 0 2 2 2 2`
`4072`	`4072`	`c 3 10 3.3333 0.4714045207910316 3 4 0 7`
`4073`	`4073`	`select sql_big_result * from information_schema.global_variables where variable_name like 'internal_tmp_disk_storage_engine';`
`4074`	`4074`	`VARIABLE_NAME VARIABLE_VALUE`
`4075`		`-INTERNAL_TMP_DISK_STORAGE_ENGINE TMP_TABLE_ENGINE`
	`4075`	`+INTERNAL_TMP_DISK_STORAGE_ENGINE InnoDB`
`4076`	`4076`	`select 1 union distinct select 1 union all select 1;`
`4077`	`4077`	`1`
`4078`	`4078`	`1`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,6 @@ SET innodb_strict_mode=OFF;`
`19`	`19`	`# Turn on the geometry data print.`
`20`	`20`	`SET SESSION debug="+d,row_print_geometry_data";`
`21`	`21`
`22`		`---replace_result INNODB TMP_TABLE_ENGINE MYISAM TMP_TABLE_ENGINE`
`23`	`22`	`SHOW VARIABLES LIKE '%engine%';`
`24`	`23`
`25`	`24`	`#`