summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2018-11-01 10:40:14 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2018-11-01 10:40:14 +0200
commitd355be887714c726e4a312e1947dc8f8632539bf (patch)
tree52af113d2f4b388bf367153edc848b2f473ba103 /storage
parentf8268f3cce4577c28ab62e53293556d05a74fb1a (diff)
downloadmariadb-git-d355be887714c726e4a312e1947dc8f8632539bf.tar.gz
Remove dead code in dict_build_table_def_step()
At the start of the function, we already dereferenced node, so the checks for NULL are unnecessary and redundant.
Diffstat (limited to 'storage')
-rw-r--r--storage/innobase/dict/dict0crea.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/storage/innobase/dict/dict0crea.cc b/storage/innobase/dict/dict0crea.cc
index ece81caafd8..758a45de943 100644
--- a/storage/innobase/dict/dict0crea.cc
+++ b/storage/innobase/dict/dict0crea.cc
@@ -431,9 +431,7 @@ dict_build_table_def_step(
dberr_t err = fil_ibd_create(
space, table->name.m_name, filepath, fsp_flags,
- FIL_IBD_FILE_INITIAL_SIZE,
- node ? node->mode : FIL_ENCRYPTION_DEFAULT,
- node ? node->key_id : FIL_DEFAULT_ENCRYPTION_KEY);
+ FIL_IBD_FILE_INITIAL_SIZE, node->mode, node->key_id);
ut_free(filepath);