From a0df8225eced15c8a3a03ca0d9129badf022b34c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Lindstr=C3=B6m?= Date: Sat, 5 Sep 2015 07:18:57 +0300 Subject: 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. --- storage/xtradb/ut/ut0ut.cc | 2 ++ 1 file changed, 2 insertions(+) (limited to 'storage/xtradb/ut') diff --git a/storage/xtradb/ut/ut0ut.cc b/storage/xtradb/ut/ut0ut.cc index 121cbdb7bc0..96f2c537deb 100644 --- a/storage/xtradb/ut/ut0ut.cc +++ b/storage/xtradb/ut/ut0ut.cc @@ -827,6 +827,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 */ -- cgit v1.2.1