From 1c022aaf584e69531765ec6be97012ecf1252f5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= <marko.makela@mariadb.com>
Date: Mon, 28 Oct 2019 21:28:21 +0200
Subject: [PATCH] MDEV-20487: Fix a test

The test rpl.rpl_failed_drop_tbl_binlog exercises a scenario where
the adaptive hash index is enabled. Try to explicitly enable the
adaptive hash index for this test, and skip the test if it does not
succeed (that is, if the server was not built WITH_INNODB_AHI=ON).
---
 mysql-test/suite/rpl/t/rpl_failed_drop_tbl_binlog.opt  | 1 +
 mysql-test/suite/rpl/t/rpl_failed_drop_tbl_binlog.test | 5 +++++
 2 files changed, 6 insertions(+)
 create mode 100644 mysql-test/suite/rpl/t/rpl_failed_drop_tbl_binlog.opt

diff --git a/mysql-test/suite/rpl/t/rpl_failed_drop_tbl_binlog.opt b/mysql-test/suite/rpl/t/rpl_failed_drop_tbl_binlog.opt
new file mode 100644
index 00000000000..14fe8f7b579
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_failed_drop_tbl_binlog.opt
@@ -0,0 +1 @@
+--loose-innodb-adaptive-hash-index
diff --git a/mysql-test/suite/rpl/t/rpl_failed_drop_tbl_binlog.test b/mysql-test/suite/rpl/t/rpl_failed_drop_tbl_binlog.test
index 281e2a2ab47..1d544891a9c 100644
--- a/mysql-test/suite/rpl/t/rpl_failed_drop_tbl_binlog.test
+++ b/mysql-test/suite/rpl/t/rpl_failed_drop_tbl_binlog.test
@@ -26,6 +26,11 @@
 --source include/have_binlog_format_statement.inc
 --source include/master-slave.inc
 
+if (!`select @@GLOBAL.innodb_adaptive_hash_index`)
+{
+  --skip Need innodb_adaptive_hash_index
+}
+
 create table t1 (a int) engine=innodb;
 create table t2 (b longblob) engine=innodb;
 create table t3 (c int) engine=innodb;