=== modified file 'mysql-test/r/lock_multi.result'
--- mysql-test/r/lock_multi.result	2013-08-20 11:48:29 +0000
+++ mysql-test/r/lock_multi.result	2014-03-17 10:04:31 +0000
@@ -187,6 +187,13 @@ ERROR 70100: Query execution was interru
 unlock tables;
 drop table t1;
 drop table if exists t1;
+create table t1 (a int) ENGINE=MEMORY;
+--> client 2
+handler t1 open;
+ERROR HY000: Table storage engine for 't1' doesn't have this option
+--> client 1
+drop table t1;
+drop table if exists t1;
 create table t1 (i int);
 connection: default
 lock tables t1 write;

=== modified file 'mysql-test/t/lock_multi.test'
--- mysql-test/t/lock_multi.test	2013-08-20 11:48:29 +0000
+++ mysql-test/t/lock_multi.test	2014-03-17 10:06:38 +0000
@@ -530,6 +530,22 @@ unlock tables;
 connection default;
 drop table t1;
 
+#
+# Bug#25856 HANDLER table OPEN in one connection lock DROP TABLE in another one
+#
+--disable_warnings
+drop table if exists t1;
+--enable_warnings
+create table t1 (a int) ENGINE=MEMORY;
+--echo --> client 2
+connection locker;
+#--error ER_ILLEGAL_HA
+handler t1 open;
+--echo --> client 1
+connection default;
+drop table t1;
+
+
 # Disconnect sessions used in many subtests above
 disconnect locker;
 disconnect locker2;