1 files changed, 29 insertions, 0 deletions
diff --git a/sql/structs.h b/sql/structs.h
index ae71819ae09..f4b85433e3a 100644
--- a/sql/structs.h
+++ b/sql/structs.h
@@ -29,6 +29,7 @@
 
 struct TABLE;
 class Field;
+class Index_statistics;
 
 class THD;
 
@@ -96,6 +97,11 @@ typedef struct st_key {
   uint  block_size;
   uint  name_length;
   enum  ha_key_alg algorithm;
+  /* 
+    The flag is on if statistical data for the index prefixes
+    has to be taken from the system statistical tables.
+  */
+  bool is_statistics_from_stat_tables;
   /*
     Note that parser is used when the table is opened for use, and
     parser_name is used when the table is being created.
@@ -115,6 +121,18 @@ typedef struct st_key {
     For temporary heap tables this member is NULL.
   */
   ulong *rec_per_key;
+
+  /*
+    This structure is used for statistical data on the index
+    that has been read from the statistical table index_stat
+  */ 
+  Index_statistics *read_stats;
+  /*
+    This structure is used for statistical data on the index that
+    is collected by the function collect_statistics_for_table
+  */
+  Index_statistics *collected_stats;
+ 
   union {
     int  bdb_return_if_eq;
   } handler;
@@ -123,6 +141,9 @@ typedef struct st_key {
   /** reference to the list of options or NULL */
   engine_option_value *option_list;
   ha_index_option_struct *option_struct;                  /* structure with parsed options */
+
+  double actual_rec_per_key(uint i);
+
 } KEY;
 
 
@@ -169,6 +190,14 @@ typedef int *(*update_var)(THD *, struct st_mysql_show_var *);
 
 typedef struct	st_lex_user {
   LEX_STRING user, host, password, plugin, auth;
+  bool is_role() { return user.str[0] && !host.str[0]; }
+  void set_lex_string(LEX_STRING *l, char *buf)
+  {
+    if (is_role())
+      *l= user;
+    else
+      l->length= strxmov(l->str= buf, user.str, "@", host.str, NullS) - buf;
+  }
 } LEX_USER;
 
 /*