From 847e0f152bc803bc850f11bc291f8f135bf06556 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Mon, 12 Aug 2013 21:27:43 +0200 Subject: [PATCH] MDEV-4786 merge 10.0-monty -> 10.0 remove unused HA_CAN_EXPORT (with the merge of "FLUSH TABLE FOR EXPORT", this functionality should be added back, but differently - no table flag, handler::extra() returns an error instead) --- sql/handler.h | 6 ------ storage/innobase/handler/ha_innodb.cc | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/sql/handler.h b/sql/handler.h index c9770acd011..1adfcaad7e2 100644 --- a/sql/handler.h +++ b/sql/handler.h @@ -255,12 +255,6 @@ enum enum_alter_inplace_result { */ #define HA_READ_OUT_OF_SYNC (1LL << 45) -/* - Storage engine supports table export using the - FLUSH TABLE FOR EXPORT statement. - */ -#define HA_CAN_EXPORT (1LL << 46) - /* Set of all binlog flags. Currently only contain the capabilities flags. diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index acc07c8aaef..589f0d72eec 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -2190,7 +2190,7 @@ ha_innobase::ha_innobase( HA_BINLOG_ROW_CAPABLE | HA_CAN_GEOMETRY | HA_PARTIAL_COLUMN_READ | HA_TABLE_SCAN_ON_INDEX | HA_CAN_FULLTEXT | - HA_CAN_FULLTEXT_EXT | HA_CAN_EXPORT), + HA_CAN_FULLTEXT_EXT), start_of_scan(0), num_write_row(0) {}