summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnel Husakovic <anel@mariadb.org>2018-11-06 10:58:02 +0000
committerAnel Husakovic <anel@mariadb.org>2018-11-06 12:07:26 +0000
commit9c026273a923f3433ad622124d7a008ce6b5c487 (patch)
tree7ce0e730e9778eae1182980e2c4762d3095e596d
parentdb55b39fb29979acd3c58581e34f8e51507a1792 (diff)
downloadmariadb-git-9c026273a923f3433ad622124d7a008ce6b5c487.tar.gz
Add implementation in .h and delete unneccessery printing
-rw-r--r--storage/innobase/handler/ha_innodb.cc11
-rw-r--r--storage/innobase/handler/ha_innodb.h2
-rw-r--r--storage/xtradb/handler/ha_innodb.cc11
-rw-r--r--storage/xtradb/handler/ha_innodb.h2
4 files changed, 2 insertions, 24 deletions
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
index 2092cd113a5..85c5529a096 100644
--- a/storage/innobase/handler/ha_innodb.cc
+++ b/storage/innobase/handler/ha_innodb.cc
@@ -9039,17 +9039,6 @@ next_record:
return(HA_ERR_END_OF_FILE);
}
-/*************************************************************************
-*/
-
-void
-ha_innobase::ft_end()
-{
- fprintf(stderr, "ft_end()\n");
-
- rnd_end();
-}
-
/*********************************************************************//**
Stores a reference to the current row to 'ref' field of the handle. Note
that in the case where we have generated the clustered index for the
diff --git a/storage/innobase/handler/ha_innodb.h b/storage/innobase/handler/ha_innodb.h
index f9e98d5dfe6..e09d2d81e35 100644
--- a/storage/innobase/handler/ha_innodb.h
+++ b/storage/innobase/handler/ha_innodb.h
@@ -153,7 +153,7 @@ class ha_innobase: public handler
int rnd_pos(uchar * buf, uchar *pos);
int ft_init();
- void ft_end();
+ void ft_end() { rnd_end(); }
FT_INFO *ft_init_ext(uint flags, uint inx, String* key);
int ft_read(uchar* buf);
diff --git a/storage/xtradb/handler/ha_innodb.cc b/storage/xtradb/handler/ha_innodb.cc
index 127309a6b65..52ef0b01534 100644
--- a/storage/xtradb/handler/ha_innodb.cc
+++ b/storage/xtradb/handler/ha_innodb.cc
@@ -9810,17 +9810,6 @@ next_record:
return(HA_ERR_END_OF_FILE);
}
-/*************************************************************************
-*/
-
-void
-ha_innobase::ft_end()
-{
- fprintf(stderr, "ft_end()\n");
-
- rnd_end();
-}
-
/*********************************************************************//**
Stores a reference to the current row to 'ref' field of the handle. Note
that in the case where we have generated the clustered index for the
diff --git a/storage/xtradb/handler/ha_innodb.h b/storage/xtradb/handler/ha_innodb.h
index e65e0964f9d..87267789ab3 100644
--- a/storage/xtradb/handler/ha_innodb.h
+++ b/storage/xtradb/handler/ha_innodb.h
@@ -156,7 +156,7 @@ class ha_innobase: public handler
int rnd_pos(uchar * buf, uchar *pos);
int ft_init();
- void ft_end();
+ void ft_end() { rnd_end(); }
FT_INFO *ft_init_ext(uint flags, uint inx, String* key);
int ft_read(uchar* buf);