Merge branch '10.1' into 10.2

1 files changed, 10 insertions, 0 deletions

diff --git a/sql/sql_admin.cc b/sql/sql_admin.cc
index 7ace3144dc3..ed0f37b8e75 100644
--- a/sql/sql_admin.cc
+++ b/sql/sql_admin.cc
@@ -765,8 +765,18 @@ static bool mysql_admin_table(THD* thd, TABLE_LIST* tables,
       {
         compl_result_code= result_code= HA_ADMIN_INVALID;
       }
+
+      /*
+        The check for Alter_info::ALTER_ADMIN_PARTITION implements this logic:
+        do not collect EITS STATS for this syntax:
+          ALTER TABLE ... ANALYZE PARTITION p
+        EITS statistics is global (not per-partition). Collecting global stats
+        is much more expensive processing just one partition, so the most
+        appropriate action is to just not collect EITS stats for this command.
+      */
       collect_eis=
         (table->table->s->table_category == TABLE_CATEGORY_USER &&
+        !(lex->alter_info.flags &= Alter_info::ALTER_ADMIN_PARTITION) &&
          (get_use_stat_tables_mode(thd) > NEVER ||
           lex->with_persistent_for_clause));
     }