[Commits] 8e1b1cd781e: Spider Patch Integration

jacob.mathew at mariadb.com jacob.mathew at mariadb.com
Tue Jun 13 04:20:03 EEST 2017


revision-id: 8e1b1cd781e034c53527ec3e8bf2c5c64bc1a61b (mariadb-10.2.3-103-g8e1b1cd781e)
parent(s): 3332f92eca372ddc8b07dc85b6530f279dab26e9
author: Jacob Mathew
committer: Jacob Mathew
timestamp: 2017-06-12 16:14:24 -0700
message:

Spider Patch Integration

Fixed bug in patch 038 regarding ft_end().

---
 sql/ha_partition.cc                   | 1 +
 storage/innobase/handler/ha_innodb.cc | 2 ++
 storage/spider/ha_spider.cc           | 1 +
 storage/xtradb/handler/ha_innodb.cc   | 2 ++
 4 files changed, 6 insertions(+)

diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc
index 5bcf7918f47..b3ca86cbdb1 100644
--- a/sql/ha_partition.cc
+++ b/sql/ha_partition.cc
@@ -6795,6 +6795,7 @@ void ha_partition::ft_end()
   }
   m_scan_value= 2;
   m_part_spec.start_part= NO_CURRENT_PART_ID;
+  handler::ft_end();
   DBUG_VOID_RETURN;
 }
 
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
index 93f5c936915..18ef0535d59 100644
--- a/storage/innobase/handler/ha_innodb.cc
+++ b/storage/innobase/handler/ha_innodb.cc
@@ -11005,6 +11005,8 @@ ha_innobase::ft_end()
 	ib::info() << "ft_end()";
 
 	rnd_end();
+
+  handler::ft_end();
 }
 #ifdef WITH_WSREP
 extern dict_index_t*
diff --git a/storage/spider/ha_spider.cc b/storage/spider/ha_spider.cc
index 23734469f3a..c5e224d0b92 100644
--- a/storage/spider/ha_spider.cc
+++ b/storage/spider/ha_spider.cc
@@ -7898,6 +7898,7 @@ void ha_spider::ft_end()
       store_error_num = index_end();
   }
   ft_init_without_index_init = FALSE;
+  handler::ft_end();
   DBUG_VOID_RETURN;
 }
 
diff --git a/storage/xtradb/handler/ha_innodb.cc b/storage/xtradb/handler/ha_innodb.cc
index a3f1d9c3c85..3ce945b29aa 100644
--- a/storage/xtradb/handler/ha_innodb.cc
+++ b/storage/xtradb/handler/ha_innodb.cc
@@ -10824,6 +10824,8 @@ ha_innobase::ft_end()
 	fprintf(stderr, "ft_end()\n");
 
 	rnd_end();
+
+  handler::ft_end();
 }
 #ifdef WITH_WSREP
 extern dict_index_t*


More information about the commits mailing list