diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2015-06-30 09:16:09 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2015-06-30 18:49:47 +0300 |
| commit | 84cefe24552cb5009192067bf4796f1be9ff5c4a (patch) | |
| tree | 2e9beb201394e75f15e505900e43b7ed34ff08d1 /storage | |
| parent | d1307bde651a02535405531aa9abd576b625311c (diff) | |
| download | mariadb-git-84cefe24552cb5009192067bf4796f1be9ff5c4a.tar.gz | |
MDEV-8396: InnoDB: Assertion failure in file fil0crypt.cc line 2052
Logic error, NULL pointer was referenced.
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innobase/fil/fil0crypt.cc | 2 | ||||
| -rw-r--r-- | storage/xtradb/fil/fil0crypt.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/storage/innobase/fil/fil0crypt.cc b/storage/innobase/fil/fil0crypt.cc index 324c78e9c7c..d5b942a652b 100644 --- a/storage/innobase/fil/fil0crypt.cc +++ b/storage/innobase/fil/fil0crypt.cc @@ -2049,7 +2049,7 @@ fil_crypt_complete_rotate_space( fil_space_crypt_t *crypt_data = fil_space_get_crypt_data(space); /* Space might already be dropped */ - if (crypt_data || !crypt_data->inited) { + if (crypt_data != NULL && crypt_data->inited) { mutex_enter(&crypt_data->mutex); /** diff --git a/storage/xtradb/fil/fil0crypt.cc b/storage/xtradb/fil/fil0crypt.cc index 98a6d0dbf29..a60e55f3de6 100644 --- a/storage/xtradb/fil/fil0crypt.cc +++ b/storage/xtradb/fil/fil0crypt.cc @@ -2049,7 +2049,7 @@ fil_crypt_complete_rotate_space( fil_space_crypt_t *crypt_data = fil_space_get_crypt_data(space); /* Space might already be dropped */ - if (crypt_data || !crypt_data->inited) { + if (crypt_data != NULL && crypt_data->inited) { mutex_enter(&crypt_data->mutex); /** |