MDEV-10551 Test innodb.defrag_mdl-9155 hangs on InnoDB 5.7

restore a table_flag lost in a merge

MDEV-10551 Test innodb.defrag_mdl-9155 hangs on InnoDB 5.7
restore a table_flag lost in a merge
11ae60d2 · Sergei Golubchik · fec844ac · 11ae60d2 · 11ae60d2
Commit 11ae60d2 authored Sep 08, 2016 by Sergei Golubchik
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

mysql-test/suite/innodb/disabled.def mysql-test/suite/innodb/disabled.def +0 -1

storage/innobase/handler/ha_innodb.cc storage/innobase/handler/ha_innodb.cc +1 -0

No files found.
--- a/mysql-test/suite/innodb/disabled.def
+++ b/mysql-test/suite/innodb/disabled.def
@@ -12,5 +12,4 @@

 innodb.auto_increment_dup : MDEV-10548
 innodb_skip_innodb_is_tables : MDEV-10200
-innodb.defrag_mdl-9155 : MDEV-10551
 innodb_defragment_fill_factor : MDEV-10771
\ No newline at end of file
--- a/storage/innobase/handler/ha_innodb.cc
+++ b/storage/innobase/handler/ha_innodb.cc
@@ -3351,6 +3351,7 @@ ha_innobase::ha_innobase(
 		*/
 			  | HA_CAN_EXPORT
 			  | HA_CAN_RTREEKEYS
+                          | HA_CONCURRENT_OPTIMIZE
 		/* JAN: TODO: MySQL 5.7
 			  | HA_HAS_RECORDS
 			  | HA_NO_READ_LOCAL_LOCK