Merge branch '10.0' into 10.1

mysql-test/suite/plugins/r/pam_cleartext.result

@@ -5,6 +5,9 @@ grant proxy on pam_test to test_pam;
 show variables like 'pam_use_%';
 Variable_name	Value
 pam_use_cleartext_plugin	ON
+#
+# same test as in pam.test now fails
+#
 drop user test_pam;
 drop user pam_test;
 uninstall plugin pam;