diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2015-09-14 11:01:14 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2015-09-14 11:01:14 +0300 |
| commit | 71b14446013e2ff4e7f918c70fca95d0795f80e4 (patch) | |
| tree | 23dd3a50626e119e4476641ab8df65946355d1a0 /storage/innobase/include/btr0btr.h | |
| parent | d581ef5b2c68465815d78548357e3e104e39f5d6 (diff) | |
| download | mariadb-git-71b14446013e2ff4e7f918c70fca95d0795f80e4.tar.gz | |
MDEV-8768: Server crash at file btr0btr.ic line 122 when checking encrypted table using incorrect keys
Add error handling to btr_validate_index when index root block
can't be read because block decryption fails.
Diffstat (limited to 'storage/innobase/include/btr0btr.h')
| -rw-r--r-- | storage/innobase/include/btr0btr.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/storage/innobase/include/btr0btr.h b/storage/innobase/include/btr0btr.h index 3cd44e3a39f..f19e82e1513 100644 --- a/storage/innobase/include/btr0btr.h +++ b/storage/innobase/include/btr0btr.h @@ -2,7 +2,7 @@ Copyright (c) 1994, 2013, Oracle and/or its affiliates. All Rights Reserved. Copyright (c) 2012, Facebook Inc. -Copyright (c) 2014, SkySQL Ab. All Rights Reserved. +Copyright (c) 2014, 2015, MariaDB Corporation. All Rights Reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -797,9 +797,9 @@ btr_index_rec_validate( __attribute__((nonnull, warn_unused_result)); /**************************************************************//** Checks the consistency of an index tree. -@return TRUE if ok */ +@return DB_SUCCESS if ok, error code if not */ UNIV_INTERN -bool +dberr_t btr_validate_index( /*===============*/ dict_index_t* index, /*!< in: index */ |