diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-02-11 09:45:34 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-02-11 09:45:34 +0100 |
| commit | f3914d10b61eb4bc4184b2a9aa92a998e1abd779 (patch) | |
| tree | 0f973c0dc2fb1f667ed852e4177b17938e28b6b9 /mysql-test/suite/sys_vars/r/sysvars_innodb.result | |
| parent | 559345806216369bad999539018bd3943860a5d5 (diff) | |
| parent | 2195bb4e416232ab807ff67eecf03b1223bf6bff (diff) | |
| download | mariadb-git-f3914d10b61eb4bc4184b2a9aa92a998e1abd779.tar.gz | |
Merge branch 'bb-10.2-serg-merge' into 10.2
Diffstat (limited to 'mysql-test/suite/sys_vars/r/sysvars_innodb.result')
| -rw-r--r-- | mysql-test/suite/sys_vars/r/sysvars_innodb.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/suite/sys_vars/r/sysvars_innodb.result b/mysql-test/suite/sys_vars/r/sysvars_innodb.result index 46b80370912..0816cd7bd31 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_innodb.result +++ b/mysql-test/suite/sys_vars/r/sysvars_innodb.result @@ -526,9 +526,9 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME INNODB_COMPRESSION_ALGORITHM SESSION_VALUE NULL -GLOBAL_VALUE none +GLOBAL_VALUE zlib GLOBAL_VALUE_ORIGIN COMPILE-TIME -DEFAULT_VALUE none +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 |