Merge tag '11.1' into 11.2

MariaDB 11.1.3 release

sql/table.h

@@ -359,6 +359,9 @@ typedef struct st_grant_info
                      const char *table);
   inline privilege_t aggregate_privs();
   inline privilege_t aggregate_cols();
+
+  /* OR table and all column privileges */
+  privilege_t all_privilege();
 } GRANT_INFO;
 
 enum tmp_table_type