summaryrefslogtreecommitdiff
path: root/mysql-test/suite/sys_vars/r
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-08-31 06:53:45 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2019-08-31 06:53:45 +0300
commitdb4a27ab738c3ab43173368117583402f995c4f1 (patch)
tree01a367ede38cc8ede00038a904c96b76e570de5f /mysql-test/suite/sys_vars/r
parentd1ef02e9592b744d6c8dbca9231152f0a58d4384 (diff)
parent396da1a70548f80ecf781cf352b0d4a5740c54f6 (diff)
downloadmariadb-git-db4a27ab738c3ab43173368117583402f995c4f1.tar.gz
Merge 10.3 into 10.4
Diffstat (limited to 'mysql-test/suite/sys_vars/r')
-rw-r--r--mysql-test/suite/sys_vars/r/sysvars_innodb.result1
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/suite/sys_vars/r/sysvars_innodb.result b/mysql-test/suite/sys_vars/r/sysvars_innodb.result
index 3562d016266..2c7f4fed4fe 100644
--- a/mysql-test/suite/sys_vars/r/sysvars_innodb.result
+++ b/mysql-test/suite/sys_vars/r/sysvars_innodb.result
@@ -5,6 +5,7 @@ variable_name not in (
'innodb_disallow_writes', # only available WITH_WSREP
'innodb_numa_interleave', # only available WITH_NUMA
'innodb_sched_priority_cleaner', # linux only
+'innodb_evict_tables_on_commit_debug', # one may want to override this
'innodb_use_native_aio', # default value depends on OS
'innodb_buffer_pool_load_pages_abort') # debug build only, and is only for testing
order by variable_name;