diff options
| author | Monty <monty@mariadb.org> | 2015-07-09 14:47:32 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2015-07-09 14:47:32 +0300 |
| commit | 9bb8b74e99adced1ccb38ced24a96cf2d1040f39 (patch) | |
| tree | c58f67cd054fa8829ca11d275f86db7691031eb2 /mysql-test/suite/encryption/t/innodb-page_encryption_compression.test | |
| parent | a6c801438717b815288acb72513f5e42fe736b7b (diff) | |
| parent | 77803703431d79f5dcc2b23b3f878dfdbaf01c2b (diff) | |
| download | mariadb-git-9bb8b74e99adced1ccb38ced24a96cf2d1040f39.tar.gz | |
Merge branch '10.1' of github.com:MariaDB/server into 10.1
Conflicts:
sql/item_subselect.cc
Fixed also typo in comment
Diffstat (limited to 'mysql-test/suite/encryption/t/innodb-page_encryption_compression.test')
| -rw-r--r-- | mysql-test/suite/encryption/t/innodb-page_encryption_compression.test | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/suite/encryption/t/innodb-page_encryption_compression.test b/mysql-test/suite/encryption/t/innodb-page_encryption_compression.test index b262e6033a9..1d59c39d637 100644 --- a/mysql-test/suite/encryption/t/innodb-page_encryption_compression.test +++ b/mysql-test/suite/encryption/t/innodb-page_encryption_compression.test @@ -15,7 +15,9 @@ SET GLOBAL innodb_file_per_table = ON; set global innodb_compression_algorithm = 1; create table innodb_normal(c1 bigint not null, b char(200)) engine=innodb page_compressed=1; +show warnings; create table innodb_compact(c1 bigint not null, b char(200)) engine=innodb row_format=compact encrypted=yes encryption_key_id=1 page_compressed=1; +show warnings; create table innodb_dynamic(c1 bigint not null, b char(200)) engine=innodb row_format=dynamic encrypted=yes encryption_key_id=2 page_compressed=1; show warnings; |