diff options
Diffstat (limited to 'storage/spider/spd_db_handlersocket.cc')
| -rw-r--r-- | storage/spider/spd_db_handlersocket.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/storage/spider/spd_db_handlersocket.cc b/storage/spider/spd_db_handlersocket.cc index d1eb68679b2..9d0b05855d5 100644 --- a/storage/spider/spd_db_handlersocket.cc +++ b/storage/spider/spd_db_handlersocket.cc @@ -14,7 +14,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #define MYSQL_SERVER 1 -#include <my_global.h> #include "mysql_version.h" #if MYSQL_VERSION_ID < 50500 #include "mysql_priv.h" @@ -5543,7 +5542,7 @@ void spider_handlersocket_handler::minimum_select_bitmap_create() DBUG_ENTER("spider_handlersocket_handler::minimum_select_bitmap_create"); memset(minimum_select_bitmap, 0, no_bytes_in_map(table->read_set)); if ( - spider->has_clone_for_merge || + spider->use_index_merge || #ifdef HA_CAN_BULK_ACCESS (spider->is_clone && !spider->is_bulk_access_clone) #else |