Skip to content

Commit

Permalink
Remove MYSQL_ENCRYPTION.
Browse files Browse the repository at this point in the history
MariaDB will likely never support MySQL-style encryption for
InnoDB, because we cannot link with the Oracle encryption plugin.
This is preparation for merging MDEV-11623.
  • Loading branch information
dr-m committed Jan 18, 2017
1 parent 45f11a7 commit 70c1148
Show file tree
Hide file tree
Showing 32 changed files with 24 additions and 3,029 deletions.
4 changes: 1 addition & 3 deletions storage/innobase/btr/btr0btr.cc
Original file line number Diff line number Diff line change
Expand Up @@ -336,9 +336,7 @@ btr_root_adjust_on_import(
/* Check that the table flags and the tablespace
flags match. */
ulint flags = dict_tf_to_fsp_flags(
table->flags,
false,
dict_table_is_encrypted(table));
table->flags, false);
ulint fsp_flags = fil_space_get_flags(table->space);
err = fsp_flags_are_equal(flags, fsp_flags)
? DB_SUCCESS : DB_CORRUPTION;
Expand Down
4 changes: 1 addition & 3 deletions storage/innobase/dict/dict0crea.cc
Original file line number Diff line number Diff line change
Expand Up @@ -494,11 +494,9 @@ dict_build_tablespace_for_table(

/* Determine the tablespace flags. */
bool is_temp = dict_table_is_temporary(table);
bool is_encrypted = dict_table_is_encrypted(table);
bool has_data_dir = DICT_TF_HAS_DATA_DIR(table->flags);
ulint fsp_flags = dict_tf_to_fsp_flags(table->flags,
is_temp,
is_encrypted);
is_temp);

/* Determine the full filepath */
if (is_temp) {
Expand Down
7 changes: 2 additions & 5 deletions storage/innobase/dict/dict0dict.cc
Original file line number Diff line number Diff line change
Expand Up @@ -7255,13 +7255,11 @@ dict_table_t::flags | 0 | 1 | 1 | 1
fil_space_t::flags | 0 | 0 | 1 | 1
@param[in] table_flags dict_table_t::flags
@param[in] is_temp whether the tablespace is temporary
@param[in] is_encrypted whether the tablespace is encrypted
@return tablespace flags (fil_space_t::flags) */
ulint
dict_tf_to_fsp_flags(
ulint table_flags,
bool is_temp,
bool is_encrypted)
bool is_temp)
{
DBUG_EXECUTE_IF("dict_tf_to_fsp_flags_failure",
return(ULINT_UNDEFINED););
Expand Down Expand Up @@ -7289,8 +7287,7 @@ dict_tf_to_fsp_flags(
is_temp,
0,
0,
0,
is_encrypted);
0);

/* In addition, tablespace flags also contain if the page
compression is used for this table. */
Expand Down
9 changes: 2 additions & 7 deletions storage/innobase/dict/dict0load.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1453,10 +1453,7 @@ dict_check_sys_tables(

/* Check that the .ibd file exists. */
bool is_temp = flags2 & DICT_TF2_TEMPORARY;
bool is_encrypted = flags2 & DICT_TF2_ENCRYPTION;
ulint fsp_flags = dict_tf_to_fsp_flags(flags,
is_temp,
is_encrypted);
ulint fsp_flags = dict_tf_to_fsp_flags(flags, is_temp);
validate = true; /* Encryption */

dberr_t err = fil_ibd_open(
Expand Down Expand Up @@ -2991,9 +2988,7 @@ dict_load_tablespace(

/* Try to open the tablespace. We set the 2nd param (fix_dict) to
false because we do not have an x-lock on dict_operation_lock */
ulint fsp_flags = dict_tf_to_fsp_flags(table->flags,
false,
dict_table_is_encrypted(table));
ulint fsp_flags = dict_tf_to_fsp_flags(table->flags, false);
dberr_t err = fil_ibd_open(
true, false, FIL_TYPE_TABLESPACE, table->space,
fsp_flags, space_name, filepath, table);
Expand Down
Loading

0 comments on commit 70c1148

Please sign in to comment.