From 4e15146fe66f75e4b0289dd0142c71f697ffa44c Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <serg@mariadb.org>
Date: Sat, 11 Apr 2015 10:13:49 +0200
Subject: [PATCH] update tokudb test results after dd8f93195

that is, after

  commit dd8f931957e0c6fb538fffff76f40239e624096c
  Author: Sergei Golubchik <serg@mariadb.org>
  Date:   Fri Apr 10 02:36:54 2015 +0200

    be less annoying about sysvar-based table attributes
    do not *always* add them to the create table definition,
    but only when a sysvar value is different from a default.
    also, when adding them - don't quote numbers
---
 .../mysql-test/tokudb/r/auto_increment.result |   2 +-
 .../r/change_column_char_default.result       |   6 +--
 .../tokudb/r/change_column_int_default.result |  40 +++++++++---------
 .../tokudb/r/change_column_varbin.result      |   2 +-
 .../r/change_column_varbin_default.result     |   8 ++--
 .../r/change_column_varbin_multiple.result    |   8 ++--
 .../tokudb/r/change_column_varchar.result     |   2 +-
 .../r/change_column_varchar_default.result    |   8 ++--
 .../r/change_column_varchar_prefix_a.result   |   2 +-
 .../r/change_column_varchar_prefix_b.result   |   2 +-
 .../change_column_varchar_sum_cross256.result |   8 ++--
 .../mysql-test/tokudb/r/cluster_2968-0.result |   8 ++--
 .../mysql-test/tokudb/r/cluster_2968-1.result |  20 ++++-----
 .../mysql-test/tokudb/r/cluster_2968-2.result |  20 ++++-----
 .../mysql-test/tokudb/r/cluster_2968-3.result |  18 ++++----
 .../tokudb/r/cluster_create_table.result      |   6 +--
 .../mysql-test/tokudb/r/ctype_collate.result  |   6 +--
 .../tokudb/r/ctype_cp1250_ch.result           |   4 +-
 .../tokudb/mysql-test/tokudb/r/mvcc-10.result |   2 +-
 .../tokudb/mysql-test/tokudb/r/mvcc-11.result |   2 +-
 .../tokudb/mysql-test/tokudb/r/mvcc-12.result |   2 +-
 .../tokudb/mysql-test/tokudb/r/mvcc-13.result |   2 +-
 .../tokudb/mysql-test/tokudb/r/mvcc-14.result |   2 +-
 .../tokudb/mysql-test/tokudb/r/mvcc-15.result |   2 +-
 .../tokudb/mysql-test/tokudb/r/mvcc-16.result |   2 +-
 .../tokudb/mysql-test/tokudb/r/mvcc-17.result |   2 +-
 .../tokudb/mysql-test/tokudb/r/mvcc-18.result |   2 +-
 .../tokudb/mysql-test/tokudb/r/mvcc-21.result |   2 +-
 .../tokudb/mysql-test/tokudb/r/mvcc-22.result |   2 +-
 .../tokudb/mysql-test/tokudb/r/mvcc-23.result |   2 +-
 .../tokudb/mysql-test/tokudb/r/mvcc-25.result |   4 +-
 .../tokudb/mysql-test/tokudb/r/mvcc-3.result  |   2 +-
 .../tokudb/mysql-test/tokudb/r/mvcc-33.result |   2 +-
 .../tokudb/mysql-test/tokudb/r/mvcc-34.result |   2 +-
 .../tokudb/mysql-test/tokudb/r/mvcc-35.result |   2 +-
 .../tokudb/mysql-test/tokudb/r/mvcc-36.result |   2 +-
 .../tokudb/mysql-test/tokudb/r/mvcc-37.result |   2 +-
 .../tokudb/mysql-test/tokudb/r/mvcc-38.result |   2 +-
 .../tokudb/mysql-test/tokudb/r/mvcc-39.result |   2 +-
 .../tokudb/mysql-test/tokudb/r/mvcc-4.result  |   2 +-
 .../tokudb/mysql-test/tokudb/r/mvcc-40.result |   2 +-
 .../tokudb/mysql-test/tokudb/r/mvcc-5.result  |   2 +-
 .../tokudb/mysql-test/tokudb/r/mvcc-6.result  |   2 +-
 .../tokudb/mysql-test/tokudb/r/mvcc-7.result  |   2 +-
 .../tokudb/mysql-test/tokudb/r/mvcc-8.result  |   2 +-
 .../tokudb/mysql-test/tokudb/r/mvcc-9.result  |   2 +-
 .../tokudb/r/mvcc-checksum-locks.result       |   2 +-
 .../mysql-test/tokudb/r/type_binary.result    |   2 +-
 .../mysql-test/tokudb/r/type_bit.result       |   6 +--
 .../mysql-test/tokudb/r/type_blob.result      |  10 ++---
 .../mysql-test/tokudb/r/type_datetime.result  |   4 +-
 .../mysql-test/tokudb/r/type_decimal.result   |   6 +--
 .../mysql-test/tokudb/r/type_enum.result      |  20 ++++-----
 .../mysql-test/tokudb/r/type_float.result     |   4 +-
 .../mysql-test/tokudb/r/type_nchar.result     |  14 +++---
 .../tokudb/r/type_newdecimal.result           |  18 ++++----
 .../mysql-test/tokudb/r/type_set.result       |   8 ++--
 .../mysql-test/tokudb/r/type_timestamp.result |  18 ++++----
 .../mysql-test/tokudb/r/type_varchar.result   |   8 ++--
 .../tokudb_alter_table/r/ai_part.result       |   4 +-
 .../r/alter_column_default.result             |  10 ++---
 .../tokudb_alter_table/r/auto_inc.result      |   6 +--
 .../tokudb_alter_table/r/frm_discover.result  |   8 ++--
 .../r/hcad_and_rename_table.result            |   4 +-
 .../tokudb_alter_table/r/hcad_part.result     |   4 +-
 .../tokudb_alter_table/r/hcr.result           |   2 +-
 .../tokudb_alter_table/r/hcr3.result          |   6 +--
 .../tokudb_alter_table/r/other_alter.result   |   2 +-
 .../tokudb_alter_table/r/other_alter2.result  |   2 +-
 .../r/row_format_alter.result                 |   4 +-
 .../r/test_field_same_detection.result        | Bin 6579 -> 6551 bytes
 .../mysql-test/tokudb_bugs/r/2952.result      |   6 +--
 .../mysql-test/tokudb_bugs/r/5089.result      |   2 +-
 .../tokudb_bugs/r/dict_leak_3518.result       |  12 +++---
 .../mysql-test/tokudb_bugs/r/frm_store.result |   8 ++--
 .../tokudb_bugs/r/frm_store2.result           |   4 +-
 .../tokudb_bugs/r/frm_store3.result           |   4 +-
 .../tokudb_mariadb/r/229cols.result           |   6 +--
 .../mysql-test/tokudb_mariadb/r/alter.result  |   6 +--
 .../tokudb_mariadb/r/clustering.result        |   2 +-
 80 files changed, 225 insertions(+), 225 deletions(-)

diff --git a/storage/tokudb/mysql-test/tokudb/r/auto_increment.result b/storage/tokudb/mysql-test/tokudb/r/auto_increment.result
index 140c943081f..ce576c337d3 100644
--- a/storage/tokudb/mysql-test/tokudb/r/auto_increment.result
+++ b/storage/tokudb/mysql-test/tokudb/r/auto_increment.result
@@ -376,7 +376,7 @@ t1	CREATE TABLE `t1` (
   `t1_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`t1_id`),
   KEY `t1_name` (`t1_name`)
-) ENGINE=TokuDB AUTO_INCREMENT=1003 DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB AUTO_INCREMENT=1003 DEFAULT CHARSET=latin1
 DROP TABLE `t1`;
 create table t1(a int not null auto_increment primary key);
 create table t2(a int not null auto_increment primary key, t1a int);
diff --git a/storage/tokudb/mysql-test/tokudb/r/change_column_char_default.result b/storage/tokudb/mysql-test/tokudb/r/change_column_char_default.result
index f9df80c8fd6..b32ea1498c1 100644
--- a/storage/tokudb/mysql-test/tokudb/r/change_column_char_default.result
+++ b/storage/tokudb/mysql-test/tokudb/r/change_column_char_default.result
@@ -7,19 +7,19 @@ Table	Create Table
 t	CREATE TABLE `t` (
   `a` char(100) NOT NULL DEFAULT '',
   `b` binary(200) NOT NULL DEFAULT '\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0'
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 ALTER TABLE t CHANGE COLUMN a a CHAR(101) NOT NULL DEFAULT 'a';
 SHOW CREATE TABLE t;
 Table	Create Table
 t	CREATE TABLE `t` (
   `a` char(101) NOT NULL DEFAULT 'a',
   `b` binary(200) NOT NULL DEFAULT '\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0'
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 ALTER TABLE t CHANGE COLUMN b b BINARY(201) NOT NULL DEFAULT 'b';
 SHOW CREATE TABLE t;
 Table	Create Table
 t	CREATE TABLE `t` (
   `a` char(101) NOT NULL DEFAULT 'a',
   `b` binary(201) NOT NULL DEFAULT 'b\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0'
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 DROP TABLE t;
diff --git a/storage/tokudb/mysql-test/tokudb/r/change_column_int_default.result b/storage/tokudb/mysql-test/tokudb/r/change_column_int_default.result
index 2d450f4991a..558d153711c 100644
--- a/storage/tokudb/mysql-test/tokudb/r/change_column_int_default.result
+++ b/storage/tokudb/mysql-test/tokudb/r/change_column_int_default.result
@@ -7,31 +7,31 @@ SHOW CREATE TABLE t;
 Table	Create Table
 t	CREATE TABLE `t` (
   `a` tinyint(4) DEFAULT '100'
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 ALTER TABLE t CHANGE COLUMN a a SMALLINT DEFAULT 200;
 SHOW CREATE TABLE t;
 Table	Create Table
 t	CREATE TABLE `t` (
   `a` smallint(6) DEFAULT '200'
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 ALTER TABLE t CHANGE COLUMN a a MEDIUMINT DEFAULT 300;
 SHOW CREATE TABLE t;
 Table	Create Table
 t	CREATE TABLE `t` (
   `a` mediumint(9) DEFAULT '300'
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 ALTER TABLE t CHANGE COLUMN a a INT DEFAULT 400;
 SHOW CREATE TABLE t;
 Table	Create Table
 t	CREATE TABLE `t` (
   `a` int(11) DEFAULT '400'
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 ALTER TABLE t CHANGE COLUMN a a BIGINT DEFAULT 500;
 SHOW CREATE TABLE t;
 Table	Create Table
 t	CREATE TABLE `t` (
   `a` bigint(20) DEFAULT '500'
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 DROP TABLE t;
 CREATE TABLE t (a TINYINT NOT NULL DEFAULT 1);
 ALTER TABLE t CHANGE COLUMN a a TINYINT NOT NULL DEFAULT 100;
@@ -39,31 +39,31 @@ SHOW CREATE TABLE t;
 Table	Create Table
 t	CREATE TABLE `t` (
   `a` tinyint(4) NOT NULL DEFAULT '100'
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 ALTER TABLE t CHANGE COLUMN a a SMALLINT NOT NULL DEFAULT 200;
 SHOW CREATE TABLE t;
 Table	Create Table
 t	CREATE TABLE `t` (
   `a` smallint(6) NOT NULL DEFAULT '200'
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 ALTER TABLE t CHANGE COLUMN a a MEDIUMINT NOT NULL DEFAULT 300;
 SHOW CREATE TABLE t;
 Table	Create Table
 t	CREATE TABLE `t` (
   `a` mediumint(9) NOT NULL DEFAULT '300'
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 ALTER TABLE t CHANGE COLUMN a a INT NOT NULL DEFAULT 400;
 SHOW CREATE TABLE t;
 Table	Create Table
 t	CREATE TABLE `t` (
   `a` int(11) NOT NULL DEFAULT '400'
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 ALTER TABLE t CHANGE COLUMN a a BIGINT NOT NULL DEFAULT 500;
 SHOW CREATE TABLE t;
 Table	Create Table
 t	CREATE TABLE `t` (
   `a` bigint(20) NOT NULL DEFAULT '500'
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 DROP TABLE t;
 CREATE TABLE t (a TINYINT UNSIGNED DEFAULT 1);
 ALTER TABLE t CHANGE COLUMN a a TINYINT UNSIGNED DEFAULT 100;
@@ -71,31 +71,31 @@ SHOW CREATE TABLE t;
 Table	Create Table
 t	CREATE TABLE `t` (
   `a` tinyint(3) unsigned DEFAULT '100'
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 ALTER TABLE t CHANGE COLUMN a a SMALLINT UNSIGNED DEFAULT 200;
 SHOW CREATE TABLE t;
 Table	Create Table
 t	CREATE TABLE `t` (
   `a` smallint(5) unsigned DEFAULT '200'
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 ALTER TABLE t CHANGE COLUMN a a MEDIUMINT UNSIGNED DEFAULT 300;
 SHOW CREATE TABLE t;
 Table	Create Table
 t	CREATE TABLE `t` (
   `a` mediumint(8) unsigned DEFAULT '300'
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 ALTER TABLE t CHANGE COLUMN a a INT UNSIGNED DEFAULT 400;
 SHOW CREATE TABLE t;
 Table	Create Table
 t	CREATE TABLE `t` (
   `a` int(10) unsigned DEFAULT '400'
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 ALTER TABLE t CHANGE COLUMN a a BIGINT UNSIGNED DEFAULT 500;
 SHOW CREATE TABLE t;
 Table	Create Table
 t	CREATE TABLE `t` (
   `a` bigint(20) unsigned DEFAULT '500'
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 DROP TABLE t;
 CREATE TABLE t (a TINYINT UNSIGNED NOT NULL DEFAULT 1);
 ALTER TABLE t CHANGE COLUMN a a TINYINT UNSIGNED NOT NULL DEFAULT 100;
@@ -103,29 +103,29 @@ SHOW CREATE TABLE t;
 Table	Create Table
 t	CREATE TABLE `t` (
   `a` tinyint(3) unsigned NOT NULL DEFAULT '100'
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 ALTER TABLE t CHANGE COLUMN a a SMALLINT UNSIGNED NOT NULL DEFAULT 200;
 SHOW CREATE TABLE t;
 Table	Create Table
 t	CREATE TABLE `t` (
   `a` smallint(5) unsigned NOT NULL DEFAULT '200'
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 ALTER TABLE t CHANGE COLUMN a a MEDIUMINT UNSIGNED NOT NULL DEFAULT 300;
 SHOW CREATE TABLE t;
 Table	Create Table
 t	CREATE TABLE `t` (
   `a` mediumint(8) unsigned NOT NULL DEFAULT '300'
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 ALTER TABLE t CHANGE COLUMN a a INT UNSIGNED NOT NULL DEFAULT 400;
 SHOW CREATE TABLE t;
 Table	Create Table
 t	CREATE TABLE `t` (
   `a` int(10) unsigned NOT NULL DEFAULT '400'
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 ALTER TABLE t CHANGE COLUMN a a BIGINT UNSIGNED NOT NULL DEFAULT 500;
 SHOW CREATE TABLE t;
 Table	Create Table
 t	CREATE TABLE `t` (
   `a` bigint(20) unsigned NOT NULL DEFAULT '500'
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 DROP TABLE t;
diff --git a/storage/tokudb/mysql-test/tokudb/r/change_column_varbin.result b/storage/tokudb/mysql-test/tokudb/r/change_column_varbin.result
index d18c38721e6..635afaf0895 100644
--- a/storage/tokudb/mysql-test/tokudb/r/change_column_varbin.result
+++ b/storage/tokudb/mysql-test/tokudb/r/change_column_varbin.result
@@ -5,7 +5,7 @@ SHOW CREATE TABLE t;
 Table	Create Table
 t	CREATE TABLE `t` (
   `a` varbinary(1) DEFAULT NULL
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 ALTER TABLE t CHANGE COLUMN a a VARBINARY(2);
 ALTER TABLE t CHANGE COLUMN a a VARBINARY(2);
 ALTER TABLE t CHANGE COLUMN a a VARBINARY(3);
diff --git a/storage/tokudb/mysql-test/tokudb/r/change_column_varbin_default.result b/storage/tokudb/mysql-test/tokudb/r/change_column_varbin_default.result
index 344c78c53be..874233af69c 100644
--- a/storage/tokudb/mysql-test/tokudb/r/change_column_varbin_default.result
+++ b/storage/tokudb/mysql-test/tokudb/r/change_column_varbin_default.result
@@ -6,21 +6,21 @@ Table	Create Table
 t	CREATE TABLE `t` (
   `a` varbinary(100) NOT NULL DEFAULT '',
   `b` varbinary(256) NOT NULL DEFAULT ''
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 ALTER TABLE t CHANGE COLUMN a a VARBINARY(255) NOT NULL DEFAULT 'a';
 SHOW CREATE TABLE t;
 Table	Create Table
 t	CREATE TABLE `t` (
   `a` varbinary(255) NOT NULL DEFAULT 'a',
   `b` varbinary(256) NOT NULL DEFAULT ''
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 ALTER TABLE t CHANGE COLUMN a a VARBINARY(256) NOT NULL DEFAULT 'b';
 SHOW CREATE TABLE t;
 Table	Create Table
 t	CREATE TABLE `t` (
   `a` varbinary(256) NOT NULL DEFAULT 'b',
   `b` varbinary(256) NOT NULL DEFAULT ''
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 ALTER TABLE t CHANGE COLUMN b b VARBINARY(255) NOT NULL DEFAULT 'c';
 ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 ALTER TABLE t CHANGE COLUMN b b VARBINARY(1024) NOT NULL DEFAULT 'd';
@@ -29,7 +29,7 @@ Table	Create Table
 t	CREATE TABLE `t` (
   `a` varbinary(256) NOT NULL DEFAULT 'b',
   `b` varbinary(1024) NOT NULL DEFAULT 'd'
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 ALTER TABLE t CHANGE COLUMN b b VARBINARY(256) NOT NULL DEFAULT 'e';
 ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 DROP TABLE t;
diff --git a/storage/tokudb/mysql-test/tokudb/r/change_column_varbin_multiple.result b/storage/tokudb/mysql-test/tokudb/r/change_column_varbin_multiple.result
index d1577ee0d84..3da19a3fd62 100644
--- a/storage/tokudb/mysql-test/tokudb/r/change_column_varbin_multiple.result
+++ b/storage/tokudb/mysql-test/tokudb/r/change_column_varbin_multiple.result
@@ -12,14 +12,14 @@ Table	Create Table
 t	CREATE TABLE `t` (
   `a` varbinary(101) DEFAULT NULL,
   `b` varbinary(100) DEFAULT NULL
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 ALTER TABLE t CHANGE COLUMN a a VARBINARY(200);
 SHOW CREATE TABLE t;
 Table	Create Table
 t	CREATE TABLE `t` (
   `a` varbinary(200) DEFAULT NULL,
   `b` varbinary(100) DEFAULT NULL
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 SELECT * FROM t;
 a	b
 hi	there
@@ -38,7 +38,7 @@ t	CREATE TABLE `t` (
   `i` int(11) DEFAULT NULL,
   `a` varbinary(101) DEFAULT NULL,
   `b` varbinary(100) DEFAULT NULL
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 ALTER TABLE t CHANGE COLUMN a a VARBINARY(200);
 SHOW CREATE TABLE t;
 Table	Create Table
@@ -46,7 +46,7 @@ t	CREATE TABLE `t` (
   `i` int(11) DEFAULT NULL,
   `a` varbinary(200) DEFAULT NULL,
   `b` varbinary(100) DEFAULT NULL
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 SELECT * FROM t;
 i	a	b
 1	hi	there
diff --git a/storage/tokudb/mysql-test/tokudb/r/change_column_varchar.result b/storage/tokudb/mysql-test/tokudb/r/change_column_varchar.result
index 5018e2db278..2e7da5ed5ef 100644
--- a/storage/tokudb/mysql-test/tokudb/r/change_column_varchar.result
+++ b/storage/tokudb/mysql-test/tokudb/r/change_column_varchar.result
@@ -5,7 +5,7 @@ SHOW CREATE TABLE t;
 Table	Create Table
 t	CREATE TABLE `t` (
   `a` varchar(1) DEFAULT NULL
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 INSERT INTO t VALUES (null);
 ALTER TABLE t CHANGE COLUMN a a VARCHAR(2);
 ALTER TABLE t CHANGE COLUMN a a VARCHAR(2);
diff --git a/storage/tokudb/mysql-test/tokudb/r/change_column_varchar_default.result b/storage/tokudb/mysql-test/tokudb/r/change_column_varchar_default.result
index b04e5d7bc36..c9ea9737e5f 100644
--- a/storage/tokudb/mysql-test/tokudb/r/change_column_varchar_default.result
+++ b/storage/tokudb/mysql-test/tokudb/r/change_column_varchar_default.result
@@ -6,21 +6,21 @@ Table	Create Table
 t	CREATE TABLE `t` (
   `a` varchar(100) NOT NULL DEFAULT '',
   `b` varchar(256) NOT NULL DEFAULT ''
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 ALTER TABLE t CHANGE COLUMN a a VARCHAR(255) NOT NULL DEFAULT 'a';
 SHOW CREATE TABLE t;
 Table	Create Table
 t	CREATE TABLE `t` (
   `a` varchar(255) NOT NULL DEFAULT 'a',
   `b` varchar(256) NOT NULL DEFAULT ''
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 ALTER TABLE t CHANGE COLUMN a a VARCHAR(256) NOT NULL DEFAULT 'b';
 SHOW CREATE TABLE t;
 Table	Create Table
 t	CREATE TABLE `t` (
   `a` varchar(256) NOT NULL DEFAULT 'b',
   `b` varchar(256) NOT NULL DEFAULT ''
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 ALTER TABLE t CHANGE COLUMN b b VARCHAR(255) NOT NULL DEFAULT 'c';
 ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 ALTER TABLE t CHANGE COLUMN b b VARCHAR(1024) NOT NULL DEFAULT 'd';
@@ -29,7 +29,7 @@ Table	Create Table
 t	CREATE TABLE `t` (
   `a` varchar(256) NOT NULL DEFAULT 'b',
   `b` varchar(1024) NOT NULL DEFAULT 'd'
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 ALTER TABLE t CHANGE COLUMN b b VARCHAR(256) NOT NULL DEFAULT 'e';
 ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 DROP TABLE t;
diff --git a/storage/tokudb/mysql-test/tokudb/r/change_column_varchar_prefix_a.result b/storage/tokudb/mysql-test/tokudb/r/change_column_varchar_prefix_a.result
index 30bdc54acbf..d40f4abdd4a 100644
--- a/storage/tokudb/mysql-test/tokudb/r/change_column_varchar_prefix_a.result
+++ b/storage/tokudb/mysql-test/tokudb/r/change_column_varchar_prefix_a.result
@@ -8,7 +8,7 @@ t	CREATE TABLE `t` (
   `a` varchar(32) DEFAULT NULL,
   `b` varchar(32) DEFAULT NULL,
   KEY `a` (`a`(2))
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 ALTER TABLE t CHANGE COLUMN a a VARCHAR(100);
 ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 ALTER TABLE t CHANGE COLUMN a a VARCHAR(256);
diff --git a/storage/tokudb/mysql-test/tokudb/r/change_column_varchar_prefix_b.result b/storage/tokudb/mysql-test/tokudb/r/change_column_varchar_prefix_b.result
index dfe9d12b047..6cbf0f9b5b7 100644
--- a/storage/tokudb/mysql-test/tokudb/r/change_column_varchar_prefix_b.result
+++ b/storage/tokudb/mysql-test/tokudb/r/change_column_varchar_prefix_b.result
@@ -8,7 +8,7 @@ t	CREATE TABLE `t` (
   `a` varchar(32) DEFAULT NULL,
   `b` varchar(32) DEFAULT NULL,
   KEY `a` (`a`(2))
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 ALTER TABLE t CHANGE COLUMN b b VARCHAR(100);
 ALTER TABLE t CHANGE COLUMN b b VARCHAR(256);
 DROP TABLE t;
diff --git a/storage/tokudb/mysql-test/tokudb/r/change_column_varchar_sum_cross256.result b/storage/tokudb/mysql-test/tokudb/r/change_column_varchar_sum_cross256.result
index 2d91d590dd4..2d56f6b7319 100644
--- a/storage/tokudb/mysql-test/tokudb/r/change_column_varchar_sum_cross256.result
+++ b/storage/tokudb/mysql-test/tokudb/r/change_column_varchar_sum_cross256.result
@@ -12,14 +12,14 @@ Table	Create Table
 t	CREATE TABLE `t` (
   `a` varchar(101) DEFAULT NULL,
   `b` varchar(100) DEFAULT NULL
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 ALTER TABLE t CHANGE COLUMN a a VARCHAR(200);
 SHOW CREATE TABLE t;
 Table	Create Table
 t	CREATE TABLE `t` (
   `a` varchar(200) DEFAULT NULL,
   `b` varchar(100) DEFAULT NULL
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 SELECT * FROM t;
 a	b
 hi	there
@@ -38,7 +38,7 @@ t	CREATE TABLE `t` (
   `i` int(11) DEFAULT NULL,
   `a` varchar(101) DEFAULT NULL,
   `b` varchar(100) DEFAULT NULL
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 ALTER TABLE t CHANGE COLUMN a a VARCHAR(200);
 SHOW CREATE TABLE t;
 Table	Create Table
@@ -46,7 +46,7 @@ t	CREATE TABLE `t` (
   `i` int(11) DEFAULT NULL,
   `a` varchar(200) DEFAULT NULL,
   `b` varchar(100) DEFAULT NULL
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 SELECT * FROM t;
 i	a	b
 1	hi	there
diff --git a/storage/tokudb/mysql-test/tokudb/r/cluster_2968-0.result b/storage/tokudb/mysql-test/tokudb/r/cluster_2968-0.result
index 4e23ce34a0c..1e0935543dc 100644
--- a/storage/tokudb/mysql-test/tokudb/r/cluster_2968-0.result
+++ b/storage/tokudb/mysql-test/tokudb/r/cluster_2968-0.result
@@ -1009,14 +1009,14 @@ s	CREATE TABLE `s` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 show create table t;
 Table	Create Table
 t	CREATE TABLE `t` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 explain select straight_join * from s,t where s.b = t.b;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	s	ALL	NULL	NULL	NULL	NULL	1000	
@@ -1030,7 +1030,7 @@ s	CREATE TABLE `s` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `b` (`b`) `clustering`=yes
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 show create table t;
 Table	Create Table
 t	CREATE TABLE `t` (
@@ -1038,7 +1038,7 @@ t	CREATE TABLE `t` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `b` (`b`) `clustering`=yes
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 explain select straight_join * from s,t where s.b = t.b;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	s	index	b	b	5	NULL	1000	Using where; Using index
diff --git a/storage/tokudb/mysql-test/tokudb/r/cluster_2968-1.result b/storage/tokudb/mysql-test/tokudb/r/cluster_2968-1.result
index b124834f7c8..9337718ce35 100644
--- a/storage/tokudb/mysql-test/tokudb/r/cluster_2968-1.result
+++ b/storage/tokudb/mysql-test/tokudb/r/cluster_2968-1.result
@@ -1009,14 +1009,14 @@ s	CREATE TABLE `s` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 show create table t;
 Table	Create Table
 t	CREATE TABLE `t` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 explain select straight_join * from s,t where s.b = t.b;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	s	ALL	NULL	NULL	NULL	NULL	1000	
@@ -1030,7 +1030,7 @@ s	CREATE TABLE `s` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `b` (`b`)
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 show create table t;
 Table	Create Table
 t	CREATE TABLE `t` (
@@ -1038,7 +1038,7 @@ t	CREATE TABLE `t` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `b` (`b`)
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 explain select straight_join * from s,t where s.b = t.b;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	s	ALL	b	NULL	NULL	NULL	1000	Using where
@@ -1057,7 +1057,7 @@ s	CREATE TABLE `s` (
   `c` int(11) DEFAULT NULL,
   KEY `b` (`b`),
   KEY `b_2` (`b`) `clustering`=yes
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 show create table t;
 Table	Create Table
 t	CREATE TABLE `t` (
@@ -1066,7 +1066,7 @@ t	CREATE TABLE `t` (
   `c` int(11) DEFAULT NULL,
   KEY `b` (`b`),
   KEY `b_2` (`b`) `clustering`=yes
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 explain select straight_join * from s,t where s.b = t.b;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	s	index	b,b_2	b_2	5	NULL	1000	Using where; Using index
@@ -1080,7 +1080,7 @@ s	CREATE TABLE `s` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `b_2` (`b`) `clustering`=yes
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 show create table t;
 Table	Create Table
 t	CREATE TABLE `t` (
@@ -1088,7 +1088,7 @@ t	CREATE TABLE `t` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `b_2` (`b`) `clustering`=yes
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 explain select straight_join * from s,t where s.b = t.b;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	s	index	b_2	b_2	5	NULL	1000	Using where; Using index
@@ -1107,7 +1107,7 @@ s	CREATE TABLE `s` (
   `c` int(11) DEFAULT NULL,
   KEY `b_2` (`b`) `clustering`=yes,
   KEY `b` (`b`)
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 show create table t;
 Table	Create Table
 t	CREATE TABLE `t` (
@@ -1116,7 +1116,7 @@ t	CREATE TABLE `t` (
   `c` int(11) DEFAULT NULL,
   KEY `b_2` (`b`) `clustering`=yes,
   KEY `b` (`b`)
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 explain select straight_join * from s,t where s.b = t.b;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	s	index	b_2,b	b_2	5	NULL	1000	Using where; Using index
diff --git a/storage/tokudb/mysql-test/tokudb/r/cluster_2968-2.result b/storage/tokudb/mysql-test/tokudb/r/cluster_2968-2.result
index cfb4ec696ce..710509b2acf 100644
--- a/storage/tokudb/mysql-test/tokudb/r/cluster_2968-2.result
+++ b/storage/tokudb/mysql-test/tokudb/r/cluster_2968-2.result
@@ -1009,14 +1009,14 @@ s	CREATE TABLE `s` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 show create table t;
 Table	Create Table
 t	CREATE TABLE `t` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 explain select straight_join s.a,t.a from s,t where s.b = t.b;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	s	ALL	NULL	NULL	NULL	NULL	1000	
@@ -1030,7 +1030,7 @@ s	CREATE TABLE `s` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `b` (`b`)
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 show create table t;
 Table	Create Table
 t	CREATE TABLE `t` (
@@ -1038,7 +1038,7 @@ t	CREATE TABLE `t` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `b` (`b`)
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 explain select straight_join s.a,t.a from s,t where s.b = t.b;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	s	ALL	b	NULL	NULL	NULL	1000	Using where
@@ -1053,7 +1053,7 @@ s	CREATE TABLE `s` (
   `c` int(11) DEFAULT NULL,
   KEY `b` (`b`),
   KEY `b_2` (`b`,`a`)
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 show create table t;
 Table	Create Table
 t	CREATE TABLE `t` (
@@ -1062,7 +1062,7 @@ t	CREATE TABLE `t` (
   `c` int(11) DEFAULT NULL,
   KEY `b` (`b`),
   KEY `b_2` (`b`,`a`)
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 explain select straight_join s.a,t.a from s,t where s.b = t.b;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	s	index	b,b_2	b_2	10	NULL	1000	Using where; Using index
@@ -1082,7 +1082,7 @@ s	CREATE TABLE `s` (
   KEY `b` (`b`),
   KEY `b_2` (`b`,`a`),
   KEY `b_3` (`b`) `clustering`=yes
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 show create table t;
 Table	Create Table
 t	CREATE TABLE `t` (
@@ -1092,7 +1092,7 @@ t	CREATE TABLE `t` (
   KEY `b` (`b`),
   KEY `b_2` (`b`,`a`),
   KEY `b_3` (`b`) `clustering`=yes
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 explain select straight_join s.a,t.a from s,t where s.b = t.b;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	s	index	b,b_2,b_3	b_2	10	NULL	1000	Using where; Using index
@@ -1107,7 +1107,7 @@ s	CREATE TABLE `s` (
   `c` int(11) DEFAULT NULL,
   KEY `b` (`b`),
   KEY `b_3` (`b`) `clustering`=yes
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 show create table t;
 Table	Create Table
 t	CREATE TABLE `t` (
@@ -1116,7 +1116,7 @@ t	CREATE TABLE `t` (
   `c` int(11) DEFAULT NULL,
   KEY `b` (`b`),
   KEY `b_3` (`b`) `clustering`=yes
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 explain select straight_join s.a,t.a from s,t where s.b = t.b;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	s	index	b,b_3	b_3	5	NULL	1000	Using where; Using index
diff --git a/storage/tokudb/mysql-test/tokudb/r/cluster_2968-3.result b/storage/tokudb/mysql-test/tokudb/r/cluster_2968-3.result
index a36df1f251e..660d63c54c8 100644
--- a/storage/tokudb/mysql-test/tokudb/r/cluster_2968-3.result
+++ b/storage/tokudb/mysql-test/tokudb/r/cluster_2968-3.result
@@ -1012,21 +1012,21 @@ s	CREATE TABLE `s` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 show create table t;
 Table	Create Table
 t	CREATE TABLE `t` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 show create table u;
 Table	Create Table
 u	CREATE TABLE `u` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 explain select straight_join * from s,t,u where s.b = t.b and s.c = t.c;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	s	ALL	NULL	NULL	NULL	NULL	1000	
@@ -1042,7 +1042,7 @@ s	CREATE TABLE `s` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `b` (`b`)
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 show create table t;
 Table	Create Table
 t	CREATE TABLE `t` (
@@ -1050,7 +1050,7 @@ t	CREATE TABLE `t` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `b` (`b`)
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 show create table u;
 Table	Create Table
 u	CREATE TABLE `u` (
@@ -1058,7 +1058,7 @@ u	CREATE TABLE `u` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `c` (`c`)
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 explain select straight_join * from s,t,u where s.b = t.b and s.c = u.c;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	s	ALL	b	NULL	NULL	NULL	1000	Using where
@@ -1081,7 +1081,7 @@ s	CREATE TABLE `s` (
   `c` int(11) DEFAULT NULL,
   KEY `b` (`b`),
   KEY `b_2` (`b`) `clustering`=yes
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 show create table t;
 Table	Create Table
 t	CREATE TABLE `t` (
@@ -1090,7 +1090,7 @@ t	CREATE TABLE `t` (
   `c` int(11) DEFAULT NULL,
   KEY `b` (`b`),
   KEY `b_2` (`b`) `clustering`=yes
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 show create table u;
 Table	Create Table
 u	CREATE TABLE `u` (
@@ -1099,7 +1099,7 @@ u	CREATE TABLE `u` (
   `c` int(11) DEFAULT NULL,
   KEY `c` (`c`),
   KEY `c_2` (`c`) `clustering`=yes
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 explain select straight_join * from s,t,u where s.b = t.b and s.c = u.c;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	s	ALL	b,b_2	NULL	NULL	NULL	1000	Using where
diff --git a/storage/tokudb/mysql-test/tokudb/r/cluster_create_table.result b/storage/tokudb/mysql-test/tokudb/r/cluster_create_table.result
index 5ffa89eaf6c..914c3edc6ac 100644
--- a/storage/tokudb/mysql-test/tokudb/r/cluster_create_table.result
+++ b/storage/tokudb/mysql-test/tokudb/r/cluster_create_table.result
@@ -11,7 +11,7 @@ t1	CREATE TABLE `t1` (
   `d` int(11) DEFAULT NULL,
   PRIMARY KEY (`a`),
   KEY `b` (`b`) `clustering`=yes
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 create index foo on t1(c,d) clustering=yes;
 show create table t1;
 Table	Create Table
@@ -23,7 +23,7 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`a`),
   KEY `b` (`b`) `clustering`=yes,
   KEY `foo` (`c`,`d`) `clustering`=yes
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 alter table t1 drop primary key;
 alter table t1 add primary key (a,b,c,d);
 alter table t1 add key bar(d,c,b,a) clustering=yes;
@@ -38,7 +38,7 @@ t1	CREATE TABLE `t1` (
   KEY `b` (`b`) `clustering`=yes,
   KEY `foo` (`c`,`d`) `clustering`=yes,
   KEY `bar` (`d`,`c`,`b`,`a`) `clustering`=yes
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 insert into t1 value (1,1,1,1),(2,2,2,2),(3,3,3,3),(4,4,4,4),(32,54,12,56);
 explain select * from t1;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
diff --git a/storage/tokudb/mysql-test/tokudb/r/ctype_collate.result b/storage/tokudb/mysql-test/tokudb/r/ctype_collate.result
index e6de51b896d..6254005d2bb 100644
--- a/storage/tokudb/mysql-test/tokudb/r/ctype_collate.result
+++ b/storage/tokudb/mysql-test/tokudb/r/ctype_collate.result
@@ -486,7 +486,7 @@ SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `latin1_f` char(32) NOT NULL
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 SHOW FIELDS FROM  t1;
 Field	Type	Null	Key	Default	Extra
 latin1_f	char(32)	NO		NULL	
@@ -496,7 +496,7 @@ SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `latin1_f` char(32) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 SHOW FIELDS FROM  t1;
 Field	Type	Null	Key	Default	Extra
 latin1_f	char(32)	YES		NULL	
@@ -505,7 +505,7 @@ SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `latin1_f` char(32) COLLATE latin1_bin DEFAULT NULL
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 COLLATE=latin1_bin `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1 COLLATE=latin1_bin
 SHOW FIELDS FROM  t1;
 Field	Type	Null	Key	Default	Extra
 latin1_f	char(32)	YES		NULL	
diff --git a/storage/tokudb/mysql-test/tokudb/r/ctype_cp1250_ch.result b/storage/tokudb/mysql-test/tokudb/r/ctype_cp1250_ch.result
index 0c450b38fda..3efeb757b61 100644
--- a/storage/tokudb/mysql-test/tokudb/r/ctype_cp1250_ch.result
+++ b/storage/tokudb/mysql-test/tokudb/r/ctype_cp1250_ch.result
@@ -94,7 +94,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `name` varchar(10) DEFAULT NULL,
   `level` smallint(5) unsigned DEFAULT NULL
-) ENGINE=TokuDB DEFAULT CHARSET=cp1250 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=cp1250
 insert into t1 values ('string',1);
 select concat(name,space(level)), concat(name, repeat(' ',level)) from t1;
 concat(name,space(level))	concat(name, repeat(' ',level))
@@ -196,7 +196,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `name` varchar(10) COLLATE cp1250_czech_cs DEFAULT NULL,
   `level` smallint(5) unsigned DEFAULT NULL
-) ENGINE=TokuDB DEFAULT CHARSET=cp1250 COLLATE=cp1250_czech_cs `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=cp1250 COLLATE=cp1250_czech_cs
 insert into t1 values ('string',1);
 select concat(name,space(level)), concat(name, repeat(' ',level)) from t1;
 concat(name,space(level))	concat(name, repeat(' ',level))
diff --git a/storage/tokudb/mysql-test/tokudb/r/mvcc-10.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-10.result
index b0eedf1e33e..319048cfd8b 100644
--- a/storage/tokudb/mysql-test/tokudb/r/mvcc-10.result
+++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-10.result
@@ -8,7 +8,7 @@ foo	CREATE TABLE `foo` (
   `a` int(11) NOT NULL DEFAULT '0',
   `b` varchar(100) DEFAULT NULL,
   PRIMARY KEY (`a`)
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 set session transaction isolation level repeatable read;
 begin;
 select * from foo;
diff --git a/storage/tokudb/mysql-test/tokudb/r/mvcc-11.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-11.result
index c7efe887e33..a89ba26a461 100644
--- a/storage/tokudb/mysql-test/tokudb/r/mvcc-11.result
+++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-11.result
@@ -6,7 +6,7 @@ show create table foo;
 Table	Create Table
 foo	CREATE TABLE `foo` (
   `a` int(11) DEFAULT NULL
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 insert into foo values (1);
 begin;
 insert into foo values (2);
diff --git a/storage/tokudb/mysql-test/tokudb/r/mvcc-12.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-12.result
index e061dd7252a..b307f487f03 100644
--- a/storage/tokudb/mysql-test/tokudb/r/mvcc-12.result
+++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-12.result
@@ -7,7 +7,7 @@ show create table foo;
 Table	Create Table
 foo	CREATE TABLE `foo` (
   `a` int(11) DEFAULT NULL
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 insert into foo values (1);
 begin;
 select * from foo;
diff --git a/storage/tokudb/mysql-test/tokudb/r/mvcc-13.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-13.result
index 2073e3e26ce..2f87ddb26cc 100644
--- a/storage/tokudb/mysql-test/tokudb/r/mvcc-13.result
+++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-13.result
@@ -7,7 +7,7 @@ show create table foo;
 Table	Create Table
 foo	CREATE TABLE `foo` (
   `a` int(11) DEFAULT NULL
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 begin;
 select * from foo;
 a
diff --git a/storage/tokudb/mysql-test/tokudb/r/mvcc-14.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-14.result
index 8fb95595c85..eecb674346f 100644
--- a/storage/tokudb/mysql-test/tokudb/r/mvcc-14.result
+++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-14.result
@@ -7,7 +7,7 @@ show create table foo;
 Table	Create Table
 foo	CREATE TABLE `foo` (
   `a` int(11) DEFAULT NULL
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 begin;
 select * from foo;
 a
diff --git a/storage/tokudb/mysql-test/tokudb/r/mvcc-15.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-15.result
index 65732a84585..0b7d96dd7b5 100644
--- a/storage/tokudb/mysql-test/tokudb/r/mvcc-15.result
+++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-15.result
@@ -7,7 +7,7 @@ show create table foo;
 Table	Create Table
 foo	CREATE TABLE `foo` (
   `a` int(11) DEFAULT NULL
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 begin;
 select * from foo;
 a
diff --git a/storage/tokudb/mysql-test/tokudb/r/mvcc-16.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-16.result
index 0379dc05d5e..7ee801d88b2 100644
--- a/storage/tokudb/mysql-test/tokudb/r/mvcc-16.result
+++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-16.result
@@ -7,7 +7,7 @@ show create table foo;
 Table	Create Table
 foo	CREATE TABLE `foo` (
   `a` int(11) DEFAULT NULL
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 begin;
 select * from foo;
 a
diff --git a/storage/tokudb/mysql-test/tokudb/r/mvcc-17.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-17.result
index c0191bedb47..fe3322b9fb7 100644
--- a/storage/tokudb/mysql-test/tokudb/r/mvcc-17.result
+++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-17.result
@@ -8,7 +8,7 @@ show create table foo;
 Table	Create Table
 foo	CREATE TABLE `foo` (
   `a` int(11) DEFAULT NULL
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 set session tokudb_load_save_space=0;
 set session transaction isolation level repeatable read;
 begin;
diff --git a/storage/tokudb/mysql-test/tokudb/r/mvcc-18.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-18.result
index c36a872fd30..1edda2650e2 100644
--- a/storage/tokudb/mysql-test/tokudb/r/mvcc-18.result
+++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-18.result
@@ -8,7 +8,7 @@ show create table foo;
 Table	Create Table
 foo	CREATE TABLE `foo` (
   `a` int(11) DEFAULT NULL
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 set session tokudb_load_save_space=1;
 set session transaction isolation level repeatable read;
 begin;
diff --git a/storage/tokudb/mysql-test/tokudb/r/mvcc-21.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-21.result
index 88e6efd2b02..bee7c8b4549 100644
--- a/storage/tokudb/mysql-test/tokudb/r/mvcc-21.result
+++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-21.result
@@ -8,7 +8,7 @@ foo	CREATE TABLE `foo` (
   `a` int(11) NOT NULL DEFAULT '0',
   `b` varchar(100) DEFAULT NULL,
   PRIMARY KEY (`a`)
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 set session transaction isolation level repeatable read;
 begin;
 select * from foo;
diff --git a/storage/tokudb/mysql-test/tokudb/r/mvcc-22.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-22.result
index 7790a3ff5ff..5d986701785 100644
--- a/storage/tokudb/mysql-test/tokudb/r/mvcc-22.result
+++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-22.result
@@ -8,7 +8,7 @@ foo	CREATE TABLE `foo` (
   `a` int(11) NOT NULL DEFAULT '0',
   `b` varchar(100) DEFAULT NULL,
   PRIMARY KEY (`a`)
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 set session transaction isolation level repeatable read;
 begin;
 select * from foo;
diff --git a/storage/tokudb/mysql-test/tokudb/r/mvcc-23.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-23.result
index 1d2bcc175c7..9ea3c631d17 100644
--- a/storage/tokudb/mysql-test/tokudb/r/mvcc-23.result
+++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-23.result
@@ -8,7 +8,7 @@ foo	CREATE TABLE `foo` (
   `a` int(11) NOT NULL DEFAULT '0',
   `b` varchar(100) DEFAULT NULL,
   PRIMARY KEY (`a`)
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 set session transaction isolation level repeatable read;
 begin;
 select * from foo;
diff --git a/storage/tokudb/mysql-test/tokudb/r/mvcc-25.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-25.result
index 37e19f0cff5..427d1ca5c3f 100644
--- a/storage/tokudb/mysql-test/tokudb/r/mvcc-25.result
+++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-25.result
@@ -10,14 +10,14 @@ foo	CREATE TABLE `foo` (
   `a` int(11) NOT NULL DEFAULT '0',
   `b` varchar(100) DEFAULT NULL,
   PRIMARY KEY (`a`)
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 show create table bar;
 Table	Create Table
 bar	CREATE TABLE `bar` (
   `a` int(11) NOT NULL DEFAULT '0',
   `b` varchar(100) DEFAULT NULL,
   PRIMARY KEY (`a`)
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 set session transaction isolation level repeatable read;
 begin;
 # should be empty
diff --git a/storage/tokudb/mysql-test/tokudb/r/mvcc-3.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-3.result
index 878bed00102..684dd147b07 100644
--- a/storage/tokudb/mysql-test/tokudb/r/mvcc-3.result
+++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-3.result
@@ -10,7 +10,7 @@ foo	CREATE TABLE `foo` (
   `a` int(11) NOT NULL DEFAULT '0',
   `b` int(11) DEFAULT NULL,
   PRIMARY KEY (`a`)
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 insert into foo values (1,1);
 begin;
 select * from foo;
diff --git a/storage/tokudb/mysql-test/tokudb/r/mvcc-33.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-33.result
index 7a520ffb0e1..38acca99831 100644
--- a/storage/tokudb/mysql-test/tokudb/r/mvcc-33.result
+++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-33.result
@@ -11,7 +11,7 @@ foo	CREATE TABLE `foo` (
   `c` int(11) DEFAULT NULL,
   PRIMARY KEY (`a`),
   KEY `b` (`b`)
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 insert into foo values (1,10,100),(2,20,200),(3,30,300),(4,40,400),(5,50,500),(6,60,600),(7,70,700),(8,80,800),(9,90,900);
 begin;
 select * from foo;
diff --git a/storage/tokudb/mysql-test/tokudb/r/mvcc-34.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-34.result
index d725bd33c95..e1795bbc832 100644
--- a/storage/tokudb/mysql-test/tokudb/r/mvcc-34.result
+++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-34.result
@@ -11,7 +11,7 @@ foo	CREATE TABLE `foo` (
   `c` int(11) DEFAULT NULL,
   PRIMARY KEY (`a`),
   KEY `b` (`b`)
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 insert into foo values (1,10,100),(2,20,200),(3,30,300),(4,40,400),(5,50,500),(6,60,600),(7,70,700),(8,80,800),(9,90,900);
 begin;
 select * from foo;
diff --git a/storage/tokudb/mysql-test/tokudb/r/mvcc-35.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-35.result
index 4daac248bd8..86fb9670fce 100644
--- a/storage/tokudb/mysql-test/tokudb/r/mvcc-35.result
+++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-35.result
@@ -11,7 +11,7 @@ foo	CREATE TABLE `foo` (
   `c` int(11) DEFAULT NULL,
   PRIMARY KEY (`a`),
   KEY `b` (`b`)
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 insert into foo values (1,10,100),(2,20,200),(3,30,300),(4,40,400),(5,50,500),(6,60,600),(7,70,700),(8,80,800),(9,90,900);
 begin;
 select * from foo;
diff --git a/storage/tokudb/mysql-test/tokudb/r/mvcc-36.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-36.result
index ba4a455e529..d982ff3249d 100644
--- a/storage/tokudb/mysql-test/tokudb/r/mvcc-36.result
+++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-36.result
@@ -11,7 +11,7 @@ foo	CREATE TABLE `foo` (
   `c` int(11) DEFAULT NULL,
   PRIMARY KEY (`a`),
   KEY `b` (`b`)
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 insert into foo values (1,10,100),(2,20,200),(3,30,300),(4,40,400),(5,50,500),(6,60,600),(7,70,700),(8,80,800),(9,90,900);
 begin;
 select * from foo;
diff --git a/storage/tokudb/mysql-test/tokudb/r/mvcc-37.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-37.result
index 5209adeeac6..3e1ad76dd3d 100644
--- a/storage/tokudb/mysql-test/tokudb/r/mvcc-37.result
+++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-37.result
@@ -11,7 +11,7 @@ foo	CREATE TABLE `foo` (
   `c` int(11) DEFAULT NULL,
   PRIMARY KEY (`a`),
   KEY `b` (`b`)
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 insert into foo values (1,10,100),(2,20,200),(3,30,300),(4,40,400),(5,50,500),(6,60,600),(7,70,700),(8,80,800),(9,90,900);
 begin;
 select * from foo;
diff --git a/storage/tokudb/mysql-test/tokudb/r/mvcc-38.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-38.result
index 936a50b1709..5ee3c72e91e 100644
--- a/storage/tokudb/mysql-test/tokudb/r/mvcc-38.result
+++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-38.result
@@ -11,7 +11,7 @@ foo	CREATE TABLE `foo` (
   `c` int(11) DEFAULT NULL,
   PRIMARY KEY (`a`),
   KEY `b` (`b`)
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 create table foo_isam (a int, b int, c int) engine=MyISAM;
 insert into foo values (1,10,100),(2,20,200),(3,30,300),(4,40,400),(5,50,500),(6,60,600),(7,70,700),(8,80,800),(9,90,900);
 begin;
diff --git a/storage/tokudb/mysql-test/tokudb/r/mvcc-39.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-39.result
index cd9baa23c09..905d5c2292a 100644
--- a/storage/tokudb/mysql-test/tokudb/r/mvcc-39.result
+++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-39.result
@@ -7,7 +7,7 @@ show create table foo;
 Table	Create Table
 foo	CREATE TABLE `foo` (
   `a` int(11) DEFAULT NULL
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 insert into foo values (1),(2),(3);
 set session transaction isolation level repeatable read;
 begin;
diff --git a/storage/tokudb/mysql-test/tokudb/r/mvcc-4.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-4.result
index 499eca4053d..ce8aa725f5b 100644
--- a/storage/tokudb/mysql-test/tokudb/r/mvcc-4.result
+++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-4.result
@@ -11,7 +11,7 @@ foo	CREATE TABLE `foo` (
   `a` int(11) NOT NULL DEFAULT '0',
   `b` int(11) DEFAULT NULL,
   PRIMARY KEY (`a`)
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 #should read (1,1)
 select * from foo;
 a	b
diff --git a/storage/tokudb/mysql-test/tokudb/r/mvcc-40.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-40.result
index da77da35ce3..1330fe41c50 100644
--- a/storage/tokudb/mysql-test/tokudb/r/mvcc-40.result
+++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-40.result
@@ -7,7 +7,7 @@ show create table foo;
 Table	Create Table
 foo	CREATE TABLE `foo` (
   `a` int(11) DEFAULT NULL
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 insert into foo values (1),(2),(3);
 set session transaction isolation level repeatable read;
 begin;
diff --git a/storage/tokudb/mysql-test/tokudb/r/mvcc-5.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-5.result
index 3d58de843f0..47204dcc7e1 100644
--- a/storage/tokudb/mysql-test/tokudb/r/mvcc-5.result
+++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-5.result
@@ -9,7 +9,7 @@ foo	CREATE TABLE `foo` (
   `a` int(11) NOT NULL DEFAULT '0',
   `b` int(11) DEFAULT NULL,
   PRIMARY KEY (`a`)
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 insert into foo values (1,1);
 set session transaction isolation level repeatable read;
 begin;
diff --git a/storage/tokudb/mysql-test/tokudb/r/mvcc-6.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-6.result
index e388c2dc5fd..a0c8185b1ab 100644
--- a/storage/tokudb/mysql-test/tokudb/r/mvcc-6.result
+++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-6.result
@@ -10,7 +10,7 @@ foo	CREATE TABLE `foo` (
   `b` int(11) DEFAULT NULL,
   PRIMARY KEY (`a`),
   KEY `b` (`b`)
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 insert into foo values (100,100);
 begin;
 insert into foo values (1,100);
diff --git a/storage/tokudb/mysql-test/tokudb/r/mvcc-7.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-7.result
index 61f115b9f64..ba78f786c31 100644
--- a/storage/tokudb/mysql-test/tokudb/r/mvcc-7.result
+++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-7.result
@@ -9,7 +9,7 @@ foo	CREATE TABLE `foo` (
   `a` int(11) NOT NULL DEFAULT '0',
   `b` int(11) DEFAULT NULL,
   PRIMARY KEY (`a`)
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 insert into foo values (1,100);
 select * from foo;
 a	b
diff --git a/storage/tokudb/mysql-test/tokudb/r/mvcc-8.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-8.result
index 0f1584692da..4e310d2d001 100644
--- a/storage/tokudb/mysql-test/tokudb/r/mvcc-8.result
+++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-8.result
@@ -11,7 +11,7 @@ foo	CREATE TABLE `foo` (
   `c` int(11) DEFAULT NULL,
   PRIMARY KEY (`a`),
   KEY `b` (`b`)
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 insert into foo values (1,10,100),(2,20,200),(3,30,300),(4,40,400),(5,50,500);
 create table foo_isam (a int, b int, c int);
 # should use key b
diff --git a/storage/tokudb/mysql-test/tokudb/r/mvcc-9.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-9.result
index b1de77d61b2..b3b45d731f2 100644
--- a/storage/tokudb/mysql-test/tokudb/r/mvcc-9.result
+++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-9.result
@@ -8,7 +8,7 @@ foo	CREATE TABLE `foo` (
   `a` int(11) NOT NULL DEFAULT '0',
   `b` varchar(100) DEFAULT NULL,
   PRIMARY KEY (`a`)
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 set session transaction isolation level repeatable read;
 begin;
 select * from foo;
diff --git a/storage/tokudb/mysql-test/tokudb/r/mvcc-checksum-locks.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-checksum-locks.result
index aa199dd04a9..c6bea70265b 100644
--- a/storage/tokudb/mysql-test/tokudb/r/mvcc-checksum-locks.result
+++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-checksum-locks.result
@@ -6,7 +6,7 @@ show create table foo;
 Table	Create Table
 foo	CREATE TABLE `foo` (
   `a` int(11) DEFAULT NULL
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 insert into foo values (1),(2),(3);
 begin;
 insert into foo values (4);
diff --git a/storage/tokudb/mysql-test/tokudb/r/type_binary.result b/storage/tokudb/mysql-test/tokudb/r/type_binary.result
index c2f1ded6d92..d3a4582404e 100644
--- a/storage/tokudb/mysql-test/tokudb/r/type_binary.result
+++ b/storage/tokudb/mysql-test/tokudb/r/type_binary.result
@@ -25,7 +25,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `s1` varbinary(20) DEFAULT NULL,
   `s2` varbinary(20) DEFAULT NULL
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 insert into t1 values (0x41,0x4100),(0x41,0x4120),(0x4100,0x4120);
 select hex(s1), hex(s2) from t1;
 hex(s1)	hex(s2)
diff --git a/storage/tokudb/mysql-test/tokudb/r/type_bit.result b/storage/tokudb/mysql-test/tokudb/r/type_bit.result
index b9813451d94..1d5432e2dd6 100644
--- a/storage/tokudb/mysql-test/tokudb/r/type_bit.result
+++ b/storage/tokudb/mysql-test/tokudb/r/type_bit.result
@@ -43,7 +43,7 @@ show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` bit(1) DEFAULT NULL
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 drop table t1;
 create table t1 (a bit(64));
 insert into t1 values 
@@ -498,7 +498,7 @@ show create table t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
   `a` bit(7) DEFAULT NULL
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 drop table t1, t2;
 create table t1 (id1 int(11), b1 bit(1));
 create table t2 (id2 int(11), b2 bit(1));
@@ -701,6 +701,6 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` bit(8) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 drop table t1;
 End of 5.1 tests
diff --git a/storage/tokudb/mysql-test/tokudb/r/type_blob.result b/storage/tokudb/mysql-test/tokudb/r/type_blob.result
index ed9b554e5cb..21d9f57770e 100644
--- a/storage/tokudb/mysql-test/tokudb/r/type_blob.result
+++ b/storage/tokudb/mysql-test/tokudb/r/type_blob.result
@@ -26,12 +26,12 @@ Table	Create Table
 t3	CREATE TABLE `t3` (
   `a` mediumtext,
   `b` mediumblob
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 show create TABLE t4;
 Table	Create Table
 t4	CREATE TABLE `t4` (
   `c` mediumtext CHARACTER SET utf8 NOT NULL
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 drop table t1,t2,t3,t4;
 CREATE TABLE t1 (a char(257) default "hello");
 ERROR 42000: Column length too big for column 'a' (max = 255); use BLOB or TEXT instead
@@ -365,7 +365,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` text,
   KEY `a` (`a`(2100))
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 drop table t1;
 CREATE TABLE t1 (
 t1_id bigint(21) NOT NULL auto_increment,
@@ -672,7 +672,7 @@ t1	CREATE TABLE `t1` (
   `e` int(11) DEFAULT NULL,
   PRIMARY KEY (`a`,`b`,`c`(255),`d`),
   KEY `a` (`a`,`b`,`d`,`e`)
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 drop table t1;
 CREATE table t1 (a blob);
 insert into t1 values ('b'),('a\0'),('a'),('a '),('aa'),(NULL);
@@ -751,7 +751,7 @@ show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` text
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 insert into t1 values (default);
 select * from t1;
 a
diff --git a/storage/tokudb/mysql-test/tokudb/r/type_datetime.result b/storage/tokudb/mysql-test/tokudb/r/type_datetime.result
index 82f5ebe9600..77364b90f9d 100644
--- a/storage/tokudb/mysql-test/tokudb/r/type_datetime.result
+++ b/storage/tokudb/mysql-test/tokudb/r/type_datetime.result
@@ -205,7 +205,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `da` date DEFAULT '1962-03-03',
   `dt` datetime DEFAULT '1962-03-03 00:00:00'
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 insert into t1 values ();
 insert into t1 values ('2007-03-23 13:49:38','2007-03-23 13:49:38');
 Warnings:
@@ -573,7 +573,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `da` date DEFAULT '1962-03-03',
   `dt` datetime DEFAULT '1962-03-03 00:00:00'
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 insert into t1 values ();
 insert into t1 values ('2007-03-23 13:49:38','2007-03-23 13:49:38');
 Warnings:
diff --git a/storage/tokudb/mysql-test/tokudb/r/type_decimal.result b/storage/tokudb/mysql-test/tokudb/r/type_decimal.result
index a432927eda2..5d271bc73fa 100644
--- a/storage/tokudb/mysql-test/tokudb/r/type_decimal.result
+++ b/storage/tokudb/mysql-test/tokudb/r/type_decimal.result
@@ -712,14 +712,14 @@ show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `d` decimal(5,0) DEFAULT NULL
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 drop table t1;
 create table t1 (d decimal);
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `d` decimal(10,0) DEFAULT NULL
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 drop table t1;
 create table t1 (d decimal(66,0));
 ERROR 42000: Too big precision 66 specified for 'd'. Maximum is 65.
@@ -880,7 +880,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` decimal(10,0) DEFAULT NULL,
   `b` int(11) DEFAULT NULL
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 select round(a,b) as c from t1 order by c;
 c
 1000
diff --git a/storage/tokudb/mysql-test/tokudb/r/type_enum.result b/storage/tokudb/mysql-test/tokudb/r/type_enum.result
index cd96b7520b2..85ca32f1697 100644
--- a/storage/tokudb/mysql-test/tokudb/r/type_enum.result
+++ b/storage/tokudb/mysql-test/tokudb/r/type_enum.result
@@ -1628,14 +1628,14 @@ show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` enum('','a','b') NOT NULL
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 drop table t1;
 create table t1 (a enum (' ','a','b ') not null default 'b ');
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` enum('','a','b') NOT NULL DEFAULT 'b'
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 drop table t1;
 create table t1 (a enum ('0','1'));
 insert into t1 set a='foobar';
@@ -1660,7 +1660,7 @@ show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` enum('ä','1','2') NOT NULL DEFAULT 'ä'
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 drop table t1;
 set names latin1;
 CREATE TABLE t1 (
@@ -1672,7 +1672,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT '1',
   `b` enum('value','öäü_value','ÊÃÕ') NOT NULL
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 show columns from t1;
 Field	Type	Null	Key	Default	Extra
 a	int(11)	YES		1	
@@ -1701,7 +1701,7 @@ show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` enum('ä','ö','ü') CHARACTER SET utf8 DEFAULT 'ü'
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 insert into t1 values ('ä'), ('ö'), ('ü');
 select a from t1 order by a;
 a
@@ -1719,7 +1719,7 @@ show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` enum('ä','ö','ü') DEFAULT 'ü'
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 select a from t1 order by a;
 a
 ä
@@ -1753,28 +1753,28 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `f1` int(11) DEFAULT NULL,
   `f2` enum('ÿÿ') DEFAULT NULL
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 drop table t1;
 create table t1(russian enum('E','F','EÿF','FÿE') NOT NULL DEFAULT'E');
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `russian` enum('E','F','EÿF','FÿE') NOT NULL DEFAULT 'E'
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 drop table t1;
 create table t1(denormal enum('E','F','E,F','F,E') NOT NULL DEFAULT'E');
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `denormal` enum('E','F','E,F','F,E') NOT NULL DEFAULT 'E'
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 drop table t1;
 create table t1(russian_deviant enum('E','F','EÿF','F,E') NOT NULL DEFAULT'E');
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `russian_deviant` enum('E','F','EÿF','F,E') NOT NULL DEFAULT 'E'
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 drop table t1;
 CREATE TABLE t1 (
 id INT AUTO_INCREMENT PRIMARY KEY,
diff --git a/storage/tokudb/mysql-test/tokudb/r/type_float.result b/storage/tokudb/mysql-test/tokudb/r/type_float.result
index cdb3db55f75..e9abecc1dee 100644
--- a/storage/tokudb/mysql-test/tokudb/r/type_float.result
+++ b/storage/tokudb/mysql-test/tokudb/r/type_float.result
@@ -96,7 +96,7 @@ t2	CREATE TABLE `t2` (
   `col2` double(22,5) DEFAULT NULL,
   `col3` double DEFAULT NULL,
   `col4` double DEFAULT NULL
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 drop table t1,t2;
 create table t1 (a float);
 insert into t1 values (1);
@@ -239,7 +239,7 @@ show create table t3;
 Table	Create Table
 t3	CREATE TABLE `t3` (
   `d` double DEFAULT NULL
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 drop table t1, t2, t3;
 create table t1 select  105213674794682365.00 + 0.0 x;
 show warnings;
diff --git a/storage/tokudb/mysql-test/tokudb/r/type_nchar.result b/storage/tokudb/mysql-test/tokudb/r/type_nchar.result
index 0e261807c5c..0dc39a49a7e 100644
--- a/storage/tokudb/mysql-test/tokudb/r/type_nchar.result
+++ b/storage/tokudb/mysql-test/tokudb/r/type_nchar.result
@@ -5,47 +5,47 @@ show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `c` char(10) CHARACTER SET utf8 DEFAULT NULL
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 drop table t1;
 create table t1 (c national char(10));
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `c` char(10) CHARACTER SET utf8 DEFAULT NULL
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 drop table t1;
 create table t1 (c national varchar(10));
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `c` varchar(10) CHARACTER SET utf8 DEFAULT NULL
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 drop table t1;
 create table t1 (c nvarchar(10));
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `c` varchar(10) CHARACTER SET utf8 DEFAULT NULL
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 drop table t1;
 create table t1 (c nchar varchar(10));
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `c` varchar(10) CHARACTER SET utf8 DEFAULT NULL
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 drop table t1;
 create table t1 (c national character varying(10));
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `c` varchar(10) CHARACTER SET utf8 DEFAULT NULL
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 drop table t1;
 create table t1 (c nchar varying(10));
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `c` varchar(10) CHARACTER SET utf8 DEFAULT NULL
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 drop table t1;
diff --git a/storage/tokudb/mysql-test/tokudb/r/type_newdecimal.result b/storage/tokudb/mysql-test/tokudb/r/type_newdecimal.result
index 3f76f54609f..6ab94a1b10b 100644
--- a/storage/tokudb/mysql-test/tokudb/r/type_newdecimal.result
+++ b/storage/tokudb/mysql-test/tokudb/r/type_newdecimal.result
@@ -60,7 +60,7 @@ t1	CREATE TABLE `t1` (
   `if(0, NULL, 1.2)` decimal(2,1) DEFAULT NULL,
   `if(1, 0.22e1, 1.1)` double NOT NULL DEFAULT '0',
   `if(1E0, 1.1, 1.2)` decimal(2,1) NOT NULL DEFAULT '0.0'
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 drop table t1;
 create table t1 select nullif(1.1, 1.1), nullif(1.1, 1.2), nullif(1.1, 0.11e1), nullif(1.0, 1), nullif(1, 1.0), nullif(1, 1.1);
 select * from t1;
@@ -75,7 +75,7 @@ t1	CREATE TABLE `t1` (
   `nullif(1.0, 1)` decimal(2,1) DEFAULT NULL,
   `nullif(1, 1.0)` int(1) DEFAULT NULL,
   `nullif(1, 1.1)` int(1) DEFAULT NULL
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 drop table t1;
 create table t1 (a decimal(4,2));
 insert into t1 value (10000), (1.1e10), ("11111"), (100000.1);
@@ -179,7 +179,7 @@ t1	CREATE TABLE `t1` (
   `truncate(-5678.123451,-3)` decimal(4,0) NOT NULL DEFAULT '0',
   `abs(-1.1)` decimal(3,1) NOT NULL DEFAULT '0.0',
   `-(-1.1)` decimal(2,1) NOT NULL DEFAULT '0.0'
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 drop table t1;
 set session sql_mode='traditional';
 select 1e10/0e0;
@@ -773,7 +773,7 @@ show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `0.5` decimal(2,1) NOT NULL DEFAULT '0.0'
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 drop table t1;
 select round(1.5),round(2.5);
 round(1.5)	round(2.5)
@@ -936,14 +936,14 @@ show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `sl` decimal(5,5) DEFAULT NULL
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 drop table t1;
 create table t1 (sl decimal(65, 30));
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `sl` decimal(65,30) DEFAULT NULL
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 drop table t1;
 create table t1 (
 f1 decimal unsigned not null default 17.49, 
@@ -976,7 +976,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `f0` decimal(30,30) unsigned zerofill NOT NULL DEFAULT '0.000000000000000000000000000000',
   `f1` decimal(10,0) unsigned zerofill NOT NULL DEFAULT '0000000000'
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 drop table t1;
 drop procedure if exists wg2;
 create procedure wg2()
@@ -1026,7 +1026,7 @@ t1	CREATE TABLE `t1` (
   `my_double` double DEFAULT NULL,
   `my_varchar` varchar(50) DEFAULT NULL,
   `my_decimal` decimal(65,30) DEFAULT NULL
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 INSERT INTO t1 SET my_float = 1.175494345e-32,
 my_double = 1.175494345e-32,
 my_varchar = '1.175494345e-32';
@@ -1540,7 +1540,7 @@ show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `5.05 / 0.014` decimal(10,6) DEFAULT NULL
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 select * from t1;
 5.05 / 0.014
 360.714286
diff --git a/storage/tokudb/mysql-test/tokudb/r/type_set.result b/storage/tokudb/mysql-test/tokudb/r/type_set.result
index f155cb53809..9d8574ce5ab 100644
--- a/storage/tokudb/mysql-test/tokudb/r/type_set.result
+++ b/storage/tokudb/mysql-test/tokudb/r/type_set.result
@@ -5,14 +5,14 @@ show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` set('','a','b') NOT NULL
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 drop table t1;
 create table t1 (a set (' ','a','b ') not null default 'b ');
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` set('','a','b') NOT NULL DEFAULT 'b'
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 drop table t1;
 CREATE TABLE t1 (   user varchar(64) NOT NULL default '',   path varchar(255) NOT NULL default '',   privilege   set('select','RESERVED30','RESERVED29','RESERVED28','RESERVED27','RESERVED26',   'RESERVED25','RESERVED24','data.delete','RESERVED22','RESERVED21',   'RESERVED20','data.insert.none','data.insert.approve',   'data.insert.delete','data.insert.move','data.insert.propose',   'data.insert.reject','RESERVED13','RESERVED12','RESERVED11','RESERVED10',   'RESERVED09','data.update','RESERVED07','RESERVED06','RESERVED05',   'RESERVED04','metadata.delete','metadata.put','RESERVED01','RESERVED00')   NOT NULL default '',   KEY user (user)   ) ENGINE=MyISAM CHARSET=utf8;
 DROP TABLE t1;
@@ -22,7 +22,7 @@ show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `s` set('a','A') CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 insert into t1 values ('a'),('a,A'),('A,a'),('A');
 select s from t1 order by s;
 s
@@ -84,5 +84,5 @@ show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `f1` set('1','2','3','4','5','6','7','8','9','10','11','12','13','14','15','16','17','18','19','20','21','22','23','24','25','26','27','28','29','30','31','32','33','34','35','36','37','38','39','40','41','42','43','44','45','46','47','48','49','50','51','52','53','54','55','56','57','58','59','60','61','62','63','64','1') DEFAULT NULL
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 drop table t1;
diff --git a/storage/tokudb/mysql-test/tokudb/r/type_timestamp.result b/storage/tokudb/mysql-test/tokudb/r/type_timestamp.result
index 6d0f6946ed9..9154c84d5a7 100644
--- a/storage/tokudb/mysql-test/tokudb/r/type_timestamp.result
+++ b/storage/tokudb/mysql-test/tokudb/r/type_timestamp.result
@@ -195,7 +195,7 @@ t1	CREATE TABLE `t1` (
   `t1` timestamp NOT NULL DEFAULT '2003-01-01 00:00:00',
   `t2` datetime DEFAULT NULL,
   `t3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00'
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 show columns from t1;
 Field	Type	Null	Key	Default	Extra
 t1	timestamp	NO		2003-01-01 00:00:00	
@@ -219,7 +219,7 @@ t1	CREATE TABLE `t1` (
   `t1` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
   `t2` datetime DEFAULT NULL,
   `t3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00'
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 show columns from t1;
 Field	Type	Null	Key	Default	Extra
 t1	timestamp	NO		CURRENT_TIMESTAMP	
@@ -245,7 +245,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `t1` timestamp NOT NULL DEFAULT '2003-01-01 00:00:00' ON UPDATE CURRENT_TIMESTAMP,
   `t2` datetime DEFAULT NULL
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 show columns from t1;
 Field	Type	Null	Key	Default	Extra
 t1	timestamp	NO		2003-01-01 00:00:00	on update CURRENT_TIMESTAMP
@@ -270,7 +270,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `t1` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   `t2` datetime DEFAULT NULL
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 show columns from t1;
 Field	Type	Null	Key	Default	Extra
 t1	timestamp	NO		CURRENT_TIMESTAMP	on update CURRENT_TIMESTAMP
@@ -296,7 +296,7 @@ t1	CREATE TABLE `t1` (
   `t1` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   `t2` datetime DEFAULT NULL,
   `t3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00'
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 show columns from t1;
 Field	Type	Null	Key	Default	Extra
 t1	timestamp	NO		CURRENT_TIMESTAMP	on update CURRENT_TIMESTAMP
@@ -322,7 +322,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `t1` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   `t2` datetime DEFAULT NULL
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 show columns from t1;
 Field	Type	Null	Key	Default	Extra
 t1	timestamp	NO		CURRENT_TIMESTAMP	on update CURRENT_TIMESTAMP
@@ -377,7 +377,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` timestamp NULL DEFAULT NULL,
   `b` timestamp NULL DEFAULT NULL
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 insert into t1 values (NULL, NULL);
 SET TIMESTAMP=1000000017;
 insert into t1 values ();
@@ -392,7 +392,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   `b` timestamp NULL DEFAULT NULL
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 insert into t1 values (NULL, NULL);
 SET TIMESTAMP=1000000018;
 insert into t1 values ();
@@ -407,7 +407,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` timestamp NULL DEFAULT NULL,
   `b` timestamp NULL DEFAULT '2003-01-01 00:00:00'
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 insert into t1 values (NULL, NULL);
 insert into t1 values (DEFAULT, DEFAULT);
 select * from t1;
diff --git a/storage/tokudb/mysql-test/tokudb/r/type_varchar.result b/storage/tokudb/mysql-test/tokudb/r/type_varchar.result
index d12fbbf99bd..ad95b9a9908 100644
--- a/storage/tokudb/mysql-test/tokudb/r/type_varchar.result
+++ b/storage/tokudb/mysql-test/tokudb/r/type_varchar.result
@@ -9,7 +9,7 @@ t1	CREATE TABLE `t1` (
   `c` char(3) DEFAULT NULL,
   `e` enum('abc','def','ghi') DEFAULT NULL,
   `t` text
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 show create table vchar;
 Table	Create Table
 vchar	CREATE TABLE `vchar` (
@@ -400,21 +400,21 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `f1` varchar(65500) DEFAULT NULL,
   KEY `index1` (`f1`(10))
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 alter table t1 modify f1 varchar(255);
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `f1` varchar(255) DEFAULT NULL,
   KEY `index1` (`f1`(10))
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 alter table t1 modify f1 tinytext;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `f1` tinytext,
   KEY `index1` (`f1`(10))
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 drop table t1;
 DROP TABLE IF EXISTS t1;
 CREATE TABLE t1(f1 VARCHAR(100) DEFAULT 'test');
diff --git a/storage/tokudb/mysql-test/tokudb_alter_table/r/ai_part.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/ai_part.result
index d4aac756ffa..38338f7f823 100644
--- a/storage/tokudb/mysql-test/tokudb_alter_table/r/ai_part.result
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/ai_part.result
@@ -9,7 +9,7 @@ foo	CREATE TABLE `foo` (
   `a` int(11) NOT NULL DEFAULT '0',
   `b` int(11) DEFAULT NULL,
   PRIMARY KEY (`a`)
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY HASH (a)
 PARTITIONS 2 */
 ALTER TABLE foo ADD KEY(b);
@@ -20,7 +20,7 @@ foo	CREATE TABLE `foo` (
   `b` int(11) DEFAULT NULL,
   PRIMARY KEY (`a`),
   KEY `b` (`b`)
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY HASH (a)
 PARTITIONS 2 */
 DROP TABLE foo;
diff --git a/storage/tokudb/mysql-test/tokudb_alter_table/r/alter_column_default.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/alter_column_default.result
index 0058d4c5664..2c1390ad2a4 100644
--- a/storage/tokudb/mysql-test/tokudb_alter_table/r/alter_column_default.result
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/alter_column_default.result
@@ -7,33 +7,33 @@ Table	Create Table
 foo	CREATE TABLE `foo` (
   `a` int(11) NOT NULL DEFAULT '0',
   `b` int(11) DEFAULT NULL
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 ALTER TABLE foo ALTER COLUMN a SET DEFAULT 100;
 SHOW CREATE TABLE foo;
 Table	Create Table
 foo	CREATE TABLE `foo` (
   `a` int(11) NOT NULL DEFAULT '100',
   `b` int(11) DEFAULT NULL
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 ALTER TABLE foo ALTER COLUMN a DROP DEFAULT;
 SHOW CREATE TABLE foo;
 Table	Create Table
 foo	CREATE TABLE `foo` (
   `a` int(11) NOT NULL,
   `b` int(11) DEFAULT NULL
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 ALTER TABLE foo ALTER COLUMN b SET DEFAULT 42;
 SHOW CREATE TABLE foo;
 Table	Create Table
 foo	CREATE TABLE `foo` (
   `a` int(11) NOT NULL,
   `b` int(11) DEFAULT '42'
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 ALTER TABLE foo ALTER COLUMN b DROP DEFAULT;
 SHOW CREATE TABLE foo;
 Table	Create Table
 foo	CREATE TABLE `foo` (
   `a` int(11) NOT NULL,
   `b` int(11)
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 DROP TABLE foo;
diff --git a/storage/tokudb/mysql-test/tokudb_alter_table/r/auto_inc.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/auto_inc.result
index e70818ed629..7f58c9ebc97 100644
--- a/storage/tokudb/mysql-test/tokudb_alter_table/r/auto_inc.result
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/auto_inc.result
@@ -15,7 +15,7 @@ foo	CREATE TABLE `foo` (
   `a` int(11) NOT NULL AUTO_INCREMENT,
   `b` int(11) DEFAULT NULL,
   PRIMARY KEY (`a`)
-) ENGINE=TokuDB AUTO_INCREMENT=4 DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB AUTO_INCREMENT=4 DEFAULT CHARSET=latin1
 insert into foo (b) values (11),(21),(32);
 select * from foo;
 a	b
@@ -31,7 +31,7 @@ foo	CREATE TABLE `foo` (
   `a` int(11) NOT NULL AUTO_INCREMENT,
   `b` int(11) DEFAULT NULL,
   PRIMARY KEY (`a`)
-) ENGINE=TokuDB AUTO_INCREMENT=1003 DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB AUTO_INCREMENT=1003 DEFAULT CHARSET=latin1
 alter table foo auto_increment=10;
 insert into foo (b) values (11),(21),(32);
 select * from foo;
@@ -51,7 +51,7 @@ foo	CREATE TABLE `foo` (
   `a` int(11) NOT NULL AUTO_INCREMENT,
   `b` int(11) DEFAULT NULL,
   PRIMARY KEY (`a`)
-) ENGINE=TokuDB AUTO_INCREMENT=1006 DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB AUTO_INCREMENT=1006 DEFAULT CHARSET=latin1
 alter table foo auto_increment=100000, add column c int;
 ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 alter table foo auto_increment=100000, drop column b;
diff --git a/storage/tokudb/mysql-test/tokudb_alter_table/r/frm_discover.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/frm_discover.result
index 85c7914edc3..41c5a6c72d4 100644
--- a/storage/tokudb/mysql-test/tokudb_alter_table/r/frm_discover.result
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/frm_discover.result
@@ -6,14 +6,14 @@ Table	Create Table
 foo	CREATE TABLE `foo` (
   `id` int(11) NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 CREATE TABLE bar LIKE foo;
 SHOW CREATE TABLE bar;
 Table	Create Table
 bar	CREATE TABLE `bar` (
   `id` int(11) NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 ALTER TABLE foo ADD COLUMN a INT;
 SHOW CREATE TABLE foo;
 Table	Create Table
@@ -21,7 +21,7 @@ foo	CREATE TABLE `foo` (
   `id` int(11) NOT NULL,
   `a` int(11) DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 FLUSH TABLES;
 SHOW CREATE TABLE foo;
 Table	Create Table
@@ -29,5 +29,5 @@ foo	CREATE TABLE `foo` (
   `id` int(11) NOT NULL,
   `a` int(11) DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 DROP TABLE foo, bar;
diff --git a/storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_and_rename_table.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_and_rename_table.result
index 9f6637826ab..426834da11b 100644
--- a/storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_and_rename_table.result
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_and_rename_table.result
@@ -5,7 +5,7 @@ SHOW CREATE TABLE s;
 Table	Create Table
 s	CREATE TABLE `s` (
   `a` int(11) DEFAULT NULL
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 SET tokudb_disable_slow_alter=1;
 ALTER TABLE s RENAME TO t, ADD COLUMN b INT;
 SHOW CREATE TABLE t;
@@ -13,5 +13,5 @@ Table	Create Table
 t	CREATE TABLE `t` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 DROP TABLE t;
diff --git a/storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_part.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_part.result
index 26685013aa4..075ccad6065 100644
--- a/storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_part.result
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_part.result
@@ -8,7 +8,7 @@ foo	CREATE TABLE `foo` (
   `a` int(11) NOT NULL DEFAULT '0',
   `b` int(11) DEFAULT NULL,
   PRIMARY KEY (`a`)
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY HASH (a)
 PARTITIONS 2 */
 ALTER TABLE foo ADD COLUMN c INT;
@@ -19,7 +19,7 @@ foo	CREATE TABLE `foo` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   PRIMARY KEY (`a`)
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY HASH (a)
 PARTITIONS 2 */
 DROP TABLE foo;
diff --git a/storage/tokudb/mysql-test/tokudb_alter_table/r/hcr.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcr.result
index 272d0edd61c..f4fc1b67bb6 100644
--- a/storage/tokudb/mysql-test/tokudb_alter_table/r/hcr.result
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcr.result
@@ -33,7 +33,7 @@ foo	CREATE TABLE `foo` (
   `b` varchar(10) DEFAULT NULL,
   `c` blob,
   KEY `b` (`b`)
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 select * from foo;
 a	b	c
 1	bb	cccc
diff --git a/storage/tokudb/mysql-test/tokudb_alter_table/r/hcr3.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcr3.result
index 8c490c0ad35..834ddfbd2d3 100644
--- a/storage/tokudb/mysql-test/tokudb_alter_table/r/hcr3.result
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/hcr3.result
@@ -18,7 +18,7 @@ foo	CREATE TABLE `foo` (
   PRIMARY KEY (`aa`),
   KEY `b` (`b`),
   KEY `d` (`d`) `clustering`=yes
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 select * from foo;
 aa	b	c	d	e
 1	10	cc	dddd	eeeee
@@ -40,7 +40,7 @@ foo	CREATE TABLE `foo` (
   PRIMARY KEY (`aa`),
   KEY `b` (`bb`),
   KEY `d` (`d`) `clustering`=yes
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 explain select bb from foo FORCE INDEX (b) where bb > 5;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	foo	index	b	b	9	NULL	1	Using where; Using index
@@ -59,7 +59,7 @@ foo	CREATE TABLE `foo` (
   PRIMARY KEY (`aa`),
   KEY `b` (`bb`),
   KEY `d` (`dd`) `clustering`=yes
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 explain select * from foo where dd > "d";
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	foo	index	d	d	13	NULL	1	Using where; Using index
diff --git a/storage/tokudb/mysql-test/tokudb_alter_table/r/other_alter.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/other_alter.result
index 4538fa6881a..7ec5ee47865 100644
--- a/storage/tokudb/mysql-test/tokudb_alter_table/r/other_alter.result
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/other_alter.result
@@ -63,7 +63,7 @@ foo	CREATE TABLE `foo` (
   UNIQUE KEY `c` (`c`),
   KEY `d` (`d`),
   KEY `b` (`b`) `clustering`=yes
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 alter table foo change column aa aa int NOT NULL;
 ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 alter table foo change column aa aa varchar(20);
diff --git a/storage/tokudb/mysql-test/tokudb_alter_table/r/other_alter2.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/other_alter2.result
index dd32bd5b86f..7e552fbbfa1 100644
--- a/storage/tokudb/mysql-test/tokudb_alter_table/r/other_alter2.result
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/other_alter2.result
@@ -61,7 +61,7 @@ foo	CREATE TABLE `foo` (
   UNIQUE KEY `c` (`c`),
   KEY `d` (`d`),
   KEY `b` (`b`) `clustering`=yes
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 show create table foo_isam;
 Table	Create Table
 foo_isam	CREATE TABLE `foo_isam` (
diff --git a/storage/tokudb/mysql-test/tokudb_alter_table/r/row_format_alter.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/row_format_alter.result
index 6057137da5b..b366f097081 100644
--- a/storage/tokudb/mysql-test/tokudb_alter_table/r/row_format_alter.result
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/r/row_format_alter.result
@@ -5,13 +5,13 @@ CREATE TABLE foo (c1 int not null primary key) engine=TokuDB;
 SELECT CREATE_OPTIONS 
 FROM INFORMATION_SCHEMA.TABLES  WHERE (table_name LIKE 'foo');
 CREATE_OPTIONS
-`compression`='tokudb_zlib'
+
 SHOW CREATE TABLE foo;
 Table	Create Table
 foo	CREATE TABLE `foo` (
   `c1` int(11) NOT NULL,
   PRIMARY KEY (`c1`)
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 ALTER TABLE foo compression=tokudb_lzma, add column c2 int not null;
 SELECT CREATE_OPTIONS
 FROM INFORMATION_SCHEMA.TABLES  WHERE (table_name LIKE 'foo');
diff --git a/storage/tokudb/mysql-test/tokudb_alter_table/r/test_field_same_detection.result b/storage/tokudb/mysql-test/tokudb_alter_table/r/test_field_same_detection.result
index 88dad457334827a34fcb7d4d16f7c0d23511c3b1..005ac572afd4e79e3fc4216773e8313324e7b49c 100644
GIT binary patch
delta 12
TcmdmNJl%LhChO)_Ry`2_AmIc~

delta 41
wcmbPkyxDj|Caa7>LUMj?K~ZXPab|vAf~|T<es*a}QhZfTW|I2mOjbP+07kkG1ONa4

diff --git a/storage/tokudb/mysql-test/tokudb_bugs/r/2952.result b/storage/tokudb/mysql-test/tokudb_bugs/r/2952.result
index 277e2d9f407..d0319ab9f74 100644
--- a/storage/tokudb/mysql-test/tokudb_bugs/r/2952.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/2952.result
@@ -12,7 +12,7 @@ foo	CREATE TABLE `foo` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 begin;
 insert into foo values (1,10,100),(2,20,200),(3,30,300);
 set session transaction isolation level read uncommitted;
@@ -35,7 +35,7 @@ foo	CREATE TABLE `foo` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 begin;
 insert into foo values (1,10,100),(2,20,200),(3,30,300);
 insert into foo values (100,100,100);
@@ -56,7 +56,7 @@ foo	CREATE TABLE `foo` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 begin;
 insert into foo values (1,10,100),(2,20,200),(3,30,300);
 insert into foo values (100,100,100);
diff --git a/storage/tokudb/mysql-test/tokudb_bugs/r/5089.result b/storage/tokudb/mysql-test/tokudb_bugs/r/5089.result
index a4229ffa9dd..995a854f5da 100644
--- a/storage/tokudb/mysql-test/tokudb_bugs/r/5089.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/5089.result
@@ -6,7 +6,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` int(11) NOT NULL,
   PRIMARY KEY (`c1`)
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 insert into t1 (c1,c2) values (1,1),(2,2);
 alter table t1 compression=tokudb_lzma;
 show create table t1;
diff --git a/storage/tokudb/mysql-test/tokudb_bugs/r/dict_leak_3518.result b/storage/tokudb/mysql-test/tokudb_bugs/r/dict_leak_3518.result
index 055cf471eb7..ae80daae14b 100644
--- a/storage/tokudb/mysql-test/tokudb_bugs/r/dict_leak_3518.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/dict_leak_3518.result
@@ -8,7 +8,7 @@ Table	Create Table
 foo	CREATE TABLE `foo` (
   `a` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`a`)
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 insert into foo values(1);
 select * from foo;
 a
@@ -20,7 +20,7 @@ Table	Create Table
 foo	CREATE TABLE `foo` (
   `a` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`a`)
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 select * from foo;
 a
 1
@@ -45,7 +45,7 @@ Table	Create Table
 foo	CREATE TABLE `foo` (
   `a` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`a`)
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 select * from foo;
 a
 1
@@ -67,7 +67,7 @@ Table	Create Table
 foo	CREATE TABLE `foo` (
   `a` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`a`)
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 insert into foo values(1);
 select * from foo;
 a
@@ -84,7 +84,7 @@ show create table fooff;
 Table	Create Table
 fooff	CREATE TABLE `fooff` (
   `a` int(11) DEFAULT NULL
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 drop table fooff;
 begin;
 select * from bar;
@@ -100,7 +100,7 @@ show create table foo;
 Table	Create Table
 foo	CREATE TABLE `foo` (
   `abra` int(11) DEFAULT NULL
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 select * from foo;
 abra
 drop table foo;
diff --git a/storage/tokudb/mysql-test/tokudb_bugs/r/frm_store.result b/storage/tokudb/mysql-test/tokudb_bugs/r/frm_store.result
index c7757919d69..53cb52ddcba 100644
--- a/storage/tokudb/mysql-test/tokudb_bugs/r/frm_store.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/frm_store.result
@@ -7,23 +7,23 @@ Table	Create Table
 foo	CREATE TABLE `foo` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 show create table bar;
 Table	Create Table
 bar	CREATE TABLE `bar` (
   `a` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 show create table foo;
 Table	Create Table
 foo	CREATE TABLE `foo` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 show create table bar;
 Table	Create Table
 bar	CREATE TABLE `bar` (
   `a` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 DROP TABLE foo,bar;
diff --git a/storage/tokudb/mysql-test/tokudb_bugs/r/frm_store2.result b/storage/tokudb/mysql-test/tokudb_bugs/r/frm_store2.result
index e57d76fba21..b202da70fcf 100644
--- a/storage/tokudb/mysql-test/tokudb_bugs/r/frm_store2.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/frm_store2.result
@@ -9,12 +9,12 @@ show create table foo;
 Table	Create Table
 foo	CREATE TABLE `foo` (
   `b` bigint(20) DEFAULT NULL
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 show create table bar;
 Table	Create Table
 bar	CREATE TABLE `bar` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 DROP TABLE foo,bar;
diff --git a/storage/tokudb/mysql-test/tokudb_bugs/r/frm_store3.result b/storage/tokudb/mysql-test/tokudb_bugs/r/frm_store3.result
index 7c329454692..2b098d68705 100644
--- a/storage/tokudb/mysql-test/tokudb_bugs/r/frm_store3.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/frm_store3.result
@@ -10,11 +10,11 @@ foo	CREATE TABLE `foo` (
   `a` int(11) NOT NULL DEFAULT '0',
   `b` int(11) DEFAULT NULL,
   PRIMARY KEY (`a`)
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 show create table bar;
 Table	Create Table
 bar	CREATE TABLE `bar` (
   `a` bigint(20) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 DROP TABLE foo,bar;
diff --git a/storage/tokudb/mysql-test/tokudb_mariadb/r/229cols.result b/storage/tokudb/mysql-test/tokudb_mariadb/r/229cols.result
index 540839485cb..c6f214e4f24 100644
--- a/storage/tokudb/mysql-test/tokudb_mariadb/r/229cols.result
+++ b/storage/tokudb/mysql-test/tokudb_mariadb/r/229cols.result
@@ -461,7 +461,7 @@ t1	CREATE TABLE `t1` (
   `col227` varchar(40) DEFAULT NULL,
   `col228` varchar(40) DEFAULT NULL,
   `col229` varchar(40) DEFAULT NULL
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 alter table t1 add i230 integer;
 show create table t1;
 Table	Create Table
@@ -696,7 +696,7 @@ t1	CREATE TABLE `t1` (
   `col228` varchar(40) DEFAULT NULL,
   `col229` varchar(40) DEFAULT NULL,
   `i230` int(11) DEFAULT NULL
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 drop table t1;
 create table t1(
 col1 varchar(40),
@@ -1163,5 +1163,5 @@ t1	CREATE TABLE `t1` (
   `col228` varchar(40) DEFAULT NULL,
   `col229` varchar(40) DEFAULT NULL,
   `col230` varchar(40) DEFAULT NULL
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 drop table t1;
diff --git a/storage/tokudb/mysql-test/tokudb_mariadb/r/alter.result b/storage/tokudb/mysql-test/tokudb_mariadb/r/alter.result
index cc779a36ca7..600e34dfffd 100644
--- a/storage/tokudb/mysql-test/tokudb_mariadb/r/alter.result
+++ b/storage/tokudb/mysql-test/tokudb_mariadb/r/alter.result
@@ -9,7 +9,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `i` int(11) DEFAULT NULL,
   `j` int(11) DEFAULT '0'
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 alter table t1 modify i int default '1';
 select * from t1;
 i	j
@@ -19,7 +19,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `i` int(11) DEFAULT '1',
   `j` int(11) DEFAULT '0'
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 alter table t1 modify j int default '2', rename t2;
 select * from t1;
 ERROR 42S02: Table 'test.t1' doesn't exist
@@ -31,5 +31,5 @@ Table	Create Table
 t2	CREATE TABLE `t2` (
   `i` int(11) DEFAULT '1',
   `j` int(11) DEFAULT '2'
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 drop table t2;
diff --git a/storage/tokudb/mysql-test/tokudb_mariadb/r/clustering.result b/storage/tokudb/mysql-test/tokudb_mariadb/r/clustering.result
index f8ac248e5cf..86f6fd4cdc2 100644
--- a/storage/tokudb/mysql-test/tokudb_mariadb/r/clustering.result
+++ b/storage/tokudb/mysql-test/tokudb_mariadb/r/clustering.result
@@ -7,7 +7,7 @@ t1	CREATE TABLE `t1` (
   `c` text,
   KEY `a` (`a`) `clustering`=yes,
   KEY `b` (`b`)
-) ENGINE=TokuDB DEFAULT CHARSET=latin1 `compression`='tokudb_zlib'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
 insert t1 values (1, 1, 1);
 insert t1 select a+1, a+1, a+1 from t1;
 insert t1 select a+2, a+2, a+2 from t1;