diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h
index 7f40bd2bc57..e3db96be2e7 100644
--- a/sql/mysql_priv.h
+++ b/sql/mysql_priv.h
@@ -489,6 +489,7 @@ inline THD *_current_thd(void)
 my_bool thd_in_lock_tables(const THD *thd);
 my_bool thd_tablespace_op(const THD *thd);
 const char *thd_proc_info(THD *thd, const char *info);
+void **thd_ha_data(const THD *thd, const struct handlerton *hton);
 
 /*
   External variables
diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index 9b2ad209e84..b4a7f9abc1c 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -186,6 +186,11 @@ const char *thd_proc_info(THD *thd, const char *info)
   return old_info;
 }
 
+void **thd_ha_data(const THD *thd, const struct handlerton *hton)
+{
+  return (void **) thd->ha_data + hton->slot;
+}
+
 
 /*
   Pass nominal parameters to Statement constructor only to ensure that