diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-12-17 19:42:01 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-12-17 19:42:01 +0200 |
| commit | 17e040c26e5a57e7101a8a3a59e947a64d74462f (patch) | |
| tree | 0dcca9cd02c07a8b2011b9d071165767ba9328e5 | |
| parent | 2225f432130c3b9ae961b19d57e35b847cf5a544 (diff) | |
| download | mariadb-git-bb-10.11-new-innodb-defaults.tar.gz | |
fixup! bcf43d7690fac0611273f606803f175b0203c324bb-10.11-new-innodb-defaults
Leave innodb_undo_log_truncate=OFF unchanged, as was the intention.
| -rw-r--r-- | mysql-test/suite/sys_vars/r/innodb_undo_log_truncate_basic.result | 4 | ||||
| -rw-r--r-- | mysql-test/suite/sys_vars/r/sysvars_innodb.result | 2 | ||||
| -rw-r--r-- | storage/innobase/handler/ha_innodb.cc | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/suite/sys_vars/r/innodb_undo_log_truncate_basic.result b/mysql-test/suite/sys_vars/r/innodb_undo_log_truncate_basic.result index 4b10e71106f..eb42f4965ea 100644 --- a/mysql-test/suite/sys_vars/r/innodb_undo_log_truncate_basic.result +++ b/mysql-test/suite/sys_vars/r/innodb_undo_log_truncate_basic.result @@ -1,7 +1,7 @@ SET @start_global_value = @@global.innodb_undo_log_truncate; SELECT @start_global_value; @start_global_value -1 +0 '#---------------------BS_STVARS_028_01----------------------#' SELECT COUNT(@@GLOBAL.innodb_undo_log_truncate); COUNT(@@GLOBAL.innodb_undo_log_truncate) @@ -66,4 +66,4 @@ ERROR 42S22: Unknown column 'innodb_undo_log_truncate' in 'field list' SET @@global.innodb_undo_log_truncate = @start_global_value; SELECT @@global.innodb_undo_log_truncate; @@global.innodb_undo_log_truncate -1 +0 diff --git a/mysql-test/suite/sys_vars/r/sysvars_innodb.result b/mysql-test/suite/sys_vars/r/sysvars_innodb.result index e4837d4e15e..79341b85822 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_innodb.result +++ b/mysql-test/suite/sys_vars/r/sysvars_innodb.result @@ -1641,7 +1641,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME INNODB_UNDO_LOG_TRUNCATE SESSION_VALUE NULL -DEFAULT_VALUE ON +DEFAULT_VALUE OFF VARIABLE_SCOPE GLOBAL VARIABLE_TYPE BOOLEAN VARIABLE_COMMENT Enable or Disable Truncate of UNDO tablespace. diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index 1008f92838c..7b61e23ab92 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -19335,7 +19335,7 @@ static MYSQL_SYSVAR_ULONG(purge_rseg_truncate_frequency, static MYSQL_SYSVAR_BOOL(undo_log_truncate, srv_undo_log_truncate, PLUGIN_VAR_OPCMDARG, "Enable or Disable Truncate of UNDO tablespace.", - NULL, NULL, TRUE); + NULL, NULL, FALSE); static MYSQL_SYSVAR_LONG(autoinc_lock_mode, innobase_autoinc_lock_mode, PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY, |