merge

sql/field.cc:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/ha_federated.cc:
  Auto merged
sql/examples/ha_tina.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_select.h:
  Auto merged

1 files changed, 6 insertions, 0 deletions

diff --git a/sql/sql_select.h b/sql/sql_select.h
index 2b2557de180..7fdd26846a6 100644
--- a/sql/sql_select.h
+++ b/sql/sql_select.h
@@ -390,6 +390,12 @@ class Cursor: public Sql_alloc, public Query_arena
   TABLE *derived_tables;
   /* List of items created during execution */
   query_id_t query_id;
+  struct Engine_info
+  {
+    const handlerton *ht;
+    void *read_view;
+  };
+  Engine_info ht_info[MAX_HA];
 public:
   Item_change_list change_list;
   select_send result;