Merge branch '3.1' of https://github.com/MariaDB/mariadb-connector-c …

…into 3.1

plugins/auth/caching_sha2_pw.c

@@ -275,14 +275,6 @@ static int auth_caching_sha2_client(MYSQL_PLUGIN_VIO *vio, MYSQL *mysql)
   memmove(mysql->scramble_buff, packet, SCRAMBLE_LENGTH);
   mysql->scramble_buff[SCRAMBLE_LENGTH]= 0;
 
-  /* if a tls session is active we need to send plain password */
-  if (mysql->client_flag & CLIENT_SSL)
-  {
-    if (vio->write_packet(vio, (unsigned char *)mysql->passwd, (int)strlen(mysql->passwd) + 1))
-      return CR_ERROR;
-    return CR_OK;
-  }
-
   /* send empty packet if no password was provided */
   if (!mysql->passwd || !mysql->passwd[0])
   {

plugins/auth/gssapi_errmsg.c

@@ -26,7 +26,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 */
 
-#ifdef  __FreeBSD__
+#if defined(__FreeBSD__) ||  defined(SOLARIS) || defined(__sun)
 #include <gssapi/gssapi.h>
 #else
 #include <gssapi.h>