diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2015-09-05 07:18:57 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2015-09-05 07:18:57 +0300 |
| commit | a0df8225eced15c8a3a03ca0d9129badf022b34c (patch) | |
| tree | 08940d990238516f83d288dfc9f2e5340b944a4b /storage/innobase/ut | |
| parent | e04723d754ffff6c532190205d0f3a5a7033b310 (diff) | |
| download | mariadb-git-a0df8225eced15c8a3a03ca0d9129badf022b34c.tar.gz | |
MDEV-8753: 10.1 build is broken: xtradb/handler/ha_innodb.cc:21430: error: redefinition of 'void ib_push_warning(trx_t*, ulint, const char*, ...)'
Fixed bad merge.
Diffstat (limited to 'storage/innobase/ut')
| -rw-r--r-- | storage/innobase/ut/ut0ut.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/storage/innobase/ut/ut0ut.cc b/storage/innobase/ut/ut0ut.cc index 68446cc85ef..f19737aa123 100644 --- a/storage/innobase/ut/ut0ut.cc +++ b/storage/innobase/ut/ut0ut.cc @@ -824,6 +824,8 @@ ut_strerr( return("Too many words in a FTS phrase or proximity search"); case DB_TOO_BIG_FOR_REDO: return("BLOB record length is greater than 10%% of redo log"); + case DB_ENCRYPTED_DECRYPT_FAILED: + return("Table is encrypted but decrypt failed."); /* do not add default: in order to produce a warning if new code is added to the enum but not added here */ |