diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-14 11:33:35 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-14 11:33:35 +0300 |
commit | cf87f3e08c10dd7a944447ddee93fbc3827e6570 (patch) | |
tree | 3c81320e2811d99e075f7d03d3bf0d1cdfa48c84 /mysql-test/suite/sys_vars/r/sysvars_innodb.result | |
parent | 1bf77cde5c62166c0f1652c2a1764e05ce76edb5 (diff) | |
parent | 2f7b37b02154748b223e385a7d7787900ab37b5e (diff) | |
download | mariadb-git-cf87f3e08c10dd7a944447ddee93fbc3827e6570.tar.gz |
Merge 10.4 into 10.5
Diffstat (limited to 'mysql-test/suite/sys_vars/r/sysvars_innodb.result')
-rw-r--r-- | mysql-test/suite/sys_vars/r/sysvars_innodb.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/suite/sys_vars/r/sysvars_innodb.result b/mysql-test/suite/sys_vars/r/sysvars_innodb.result index 7e59a8ea810..5b532addaa8 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_innodb.result +++ b/mysql-test/suite/sys_vars/r/sysvars_innodb.result @@ -398,7 +398,7 @@ SESSION_VALUE NULL DEFAULT_VALUE zlib VARIABLE_SCOPE GLOBAL VARIABLE_TYPE ENUM -VARIABLE_COMMENT Compression algorithm used on page compression. One of: none, zlib, lz4, lzo, lzma, or bzip2 +VARIABLE_COMMENT Compression algorithm used on page compression. One of: none, zlib, lz4, lzo, lzma, bzip2, or snappy NUMERIC_MIN_VALUE NULL NUMERIC_MAX_VALUE NULL NUMERIC_BLOCK_SIZE NULL |