Bug#35054579 Issue in Oracle MySQL Client using utf16 charset

Summary:
Porting fix for Bug#35054579 from 8.0.33 back to 8.0.32.
Drop patch when porting forward past 8.0.33.

Description:
If we try to connect the server with mysql client using
--default-character-set=utf1 using a authentication plugin,
the client connection is failing with below error
ERROR 2059 (HY000): Authentication plugin '../../mysql_native_password' cannot be loaded:
'../../mysql_native_password.so': cannot open shared object file: No such file or directory
instead of
ERROR 2059 (HY000): Authentication plugin '../../mysql_native_password' cannot be loaded:
No paths allowed for shared library

Analysis:
As per mysql documentation utf16, utf32, ucs2 and utf16le are
Impermissible Client Character Sets, so when the client tries to
connect the server with these charsets, the client has to reject the
connections.

Fix:
While parsing the mysq client options, detecting the
Impermissible Client Character Sets and rejecting the connection.

Change-Id: Ib0d6624c792214b7b44fbb7040646f04081fb3e0

Differential Revision: D55337684

fbshipit-source-id: ae3518a

Author: hermanlee

client/mysql.cc

@@ -4792,7 +4792,7 @@ static bool init_connection_options(MYSQL *mysql) {
     mysql_options(mysql, MYSQL_INIT_COMMAND, init_command);
   }
 
-  mysql_set_character_set(mysql, default_charset);
+  if (mysql_set_character_set(mysql, default_charset)) return true;
 
   if (opt_plugin_dir && *opt_plugin_dir)
     mysql_options(mysql, MYSQL_PLUGIN_DIR, opt_plugin_dir);

include/errmsg.h

@@ -132,7 +132,7 @@ extern const char *client_errors[]; /* Error messages */
 #define CR_MANDATORY_TRACKER_NOT_FOUND 2071
 #define CR_INVALID_FACTOR_NO 2072
 #define CR_CANT_GET_SESSION_DATA 2073
-#define CR_PLACEHOLDER_2074 2074
+#define CR_INVALID_CLIENT_CHARSET 2074
 #define CR_PLACEHOLDER_2075 2075
 #define CR_PLACEHOLDER_2076 2076
 #define CR_PLACEHOLDER_2077 2077
@@ -268,7 +268,7 @@ extern const char *client_errors[]; /* Error messages */
 #define CR_ERROR_LAST /*Copy last error nr:*/ 2203
 /* Add error numbers before CR_ERROR_LAST and change it accordingly. */
 
-#define CR_PLACEHOLDER_FIRST CR_PLACEHOLDER_2074
+#define CR_PLACEHOLDER_FIRST CR_PLACEHOLDER_2075
 #define CR_PLACEHOLDER_LAST CR_PLACEHOLDER_2199
 
 static inline bool isPlaceHolder(int client_errno) {

include/mysql.h.pp

@@ -414,7 +414,7 @@
 void finish_client_errs(void);
 extern const char *client_errors[];
 static inline bool isPlaceHolder(int client_errno) {
-  return client_errno >= 2074 &&
+  return client_errno >= 2075 &&
          client_errno <= 2199;
 }
 static inline const char *ER_CLIENT(int client_errno) {

libmysql/errmsg.cc

@@ -119,7 +119,9 @@ const char *client_errors[] = {
     "Invalid first argument for MYSQL_OPT_USER_PASSWORD option. Valid value "
     "should be between 1 and 3 inclusive.",
     "Can't get session data: %s",
-    "Placeholder 2074",
+    "'%-.32s' character set is having more than 1 byte minimum character "
+    "length, which cannot be used as a client character set. Please use any "
+    "of the single byte minimum ones, e.g. utf8mb4, latin1 etc.",
     "Placeholder 2075",
     "Placeholder 2076",
     "Placeholder 2077",

sql-common/client.cc

@@ -10248,6 +10248,17 @@ int STDCALL mysql_set_character_set(MYSQL *mysql, const char *cs_name) {
     cs_name = mysql->options.charset_name;
   }
 
+#ifndef MYSQL_SERVER
+  if (mysql->charset != nullptr) {
+    if (!is_supported_parser_charset(mysql->charset)) {
+      set_mysql_extended_error(mysql, CR_INVALID_CLIENT_CHARSET,
+                               unknown_sqlstate,
+                               ER_CLIENT(CR_INVALID_CLIENT_CHARSET), cs_name);
+      return 1;
+    }
+  }
+#endif
+
   if (strlen(cs_name) < MY_CS_NAME_SIZE &&
       (cs = get_charset_by_csname(cs_name, MY_CS_PRIMARY, MYF(0)))) {
     char buff[MY_CS_NAME_SIZE + 10];