diff options
| author | Monty <monty@mariadb.org> | 2014-12-22 16:53:17 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-02-10 10:21:17 +0100 |
| commit | d7d589dc01f6d70d1518b74d46fd3b75e76267f5 (patch) | |
| tree | f9df59951453660f0038ed78cf5ceadc852bf74c /storage/xtradb/handler/handler0alter.cc | |
| parent | 3a3ec744b5a31318a00821dc0ed6da8af49fda25 (diff) | |
| download | mariadb-git-d7d589dc01f6d70d1518b74d46fd3b75e76267f5.tar.gz | |
Push for testing of encryption
Diffstat (limited to 'storage/xtradb/handler/handler0alter.cc')
| -rw-r--r-- | storage/xtradb/handler/handler0alter.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/storage/xtradb/handler/handler0alter.cc b/storage/xtradb/handler/handler0alter.cc index 250c1019e09..7e8e6e4598e 100644 --- a/storage/xtradb/handler/handler0alter.cc +++ b/storage/xtradb/handler/handler0alter.cc @@ -281,6 +281,13 @@ ha_innobase::check_if_supported_inplace_alter( ER_ALTER_OPERATION_NOT_SUPPORTED_REASON); DBUG_RETURN(HA_ALTER_INPLACE_NOT_SUPPORTED); } + + if (new_options->page_encryption != old_options->page_encryption || + new_options->page_encryption_key != old_options->page_encryption_key) { + ha_alter_info->unsupported_reason = innobase_get_err_msg( + ER_ALTER_OPERATION_NOT_SUPPORTED_REASON); + DBUG_RETURN(HA_ALTER_INPLACE_NOT_SUPPORTED); + } } if (ha_alter_info->handler_flags |