Skip to content

Commit a8f75d8

Browse files
author
Benny Wang
committed
Fixed Bug#21461026: INCONSISTEND CASING ON STORAGE ENGINE VARIABLE VALUES
Change the value of global variable internal_tmp_disk_storage_engine to use consistent typo as other variables' value.
1 parent 5eb1f5a commit a8f75d8

File tree

3 files changed

+13
-1
lines changed

3 files changed

+13
-1
lines changed

mysql-test/r/internal_tmp_disk_storage_engine.result

+8
Original file line numberDiff line numberDiff line change
@@ -3116,6 +3116,14 @@ select distinct least(1,count(distinct a)) from t1 group by a;
31163116
least(1,count(distinct a))
31173117
0
31183118
drop table t1;
3119+
#
3120+
# Bug#21461026: INCONSISTEND CASING ON STORAGE ENGINE VARIABLE VALUE
3121+
#
3122+
SHOW GLOBAL VARIABLES LIKE '%\_storage\_engine';
3123+
Variable_name Value
3124+
default_storage_engine InnoDB
3125+
default_tmp_storage_engine InnoDB
3126+
internal_tmp_disk_storage_engine InnoDB
31193127
SET GLOBAL innodb_large_prefix=default;
31203128
Warnings:
31213129
Warning 131 Using innodb_large_prefix is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html

mysql-test/t/internal_tmp_disk_storage_engine.test

+4
Original file line numberDiff line numberDiff line change
@@ -1352,6 +1352,10 @@ insert into t1 values ('a');
13521352
select distinct least(1,count(distinct a)) from t1 group by a;
13531353
drop table t1;
13541354

1355+
--echo #
1356+
--echo # Bug#21461026: INCONSISTEND CASING ON STORAGE ENGINE VARIABLE VALUE
1357+
--echo #
1358+
SHOW GLOBAL VARIABLES LIKE '%\_storage\_engine';
13551359
#============================end && cleanup=======================
13561360
SET GLOBAL innodb_large_prefix=default;
13571361
set @@global.internal_tmp_disk_storage_engine= @old_internal_tmp_disk_storage_engine;

sql/sys_vars.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -4015,7 +4015,7 @@ static Sys_var_plugin Sys_default_storage_engine(
40154015
MYSQL_STORAGE_ENGINE_PLUGIN, DEFAULT(&default_storage_engine),
40164016
NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(check_storage_engine));
40174017

4018-
const char *internal_tmp_disk_storage_engine_names[] = { "MYISAM", "INNODB", 0};
4018+
const char *internal_tmp_disk_storage_engine_names[] = { "MyISAM", "InnoDB", 0};
40194019
static Sys_var_enum Sys_internal_tmp_disk_storage_engine(
40204020
"internal_tmp_disk_storage_engine",
40214021
"The default storage engine for on-disk internal tmp table",

0 commit comments

Comments
 (0)