10.0-base merge (roles)

sql/handler.h

@@ -712,12 +712,15 @@ struct TABLE;
 */
 enum enum_schema_tables
 {
-  SCH_CHARSETS= 0,
+  SCH_ALL_PLUGINS,
+  SCH_APPLICABLE_ROLES,
+  SCH_CHARSETS,
   SCH_CLIENT_STATS,
   SCH_COLLATIONS,
   SCH_COLLATION_CHARACTER_SET_APPLICABILITY,
   SCH_COLUMNS,
   SCH_COLUMN_PRIVILEGES,
+  SCH_ENABLED_ROLES,
   SCH_ENGINES,
   SCH_EVENTS,
   SCH_EXPLAIN,
@@ -731,7 +734,6 @@ enum enum_schema_tables
   SCH_PARAMETERS,
   SCH_PARTITIONS,
   SCH_PLUGINS,
-  SCH_ALL_PLUGINS,
   SCH_PROCESSLIST,
   SCH_PROFILES,
   SCH_REFERENTIAL_CONSTRAINTS,