Merge branch '10.1' of https://github.com/MariaDB/server into ok-debpkg-10.1

2025-07-29 05:21:33 +03:00 · 2015-09-05 21:28:14 +03:00
parent b9fee60871 67dbfab3d7
commit d6c5e7e2cc
943 changed files with 17455 additions and 9230 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -15,6 +15,7 @@
 *.dat -text -whitespace

 storage/connect/mysql-test/connect/std_data/*.txt -text
+pcre/testdata/greppatN4 -text

 # Denote all files that are truly binary and should not be modified.
 *.png binary
--- a/.gitignore
+++ b/.gitignore
@ -277,6 +277,10 @@ storage/mroonga/mysql-test/mroonga/storage/r/variable_version.result
 *.vcproj.*
 *.vcproj.*.*
 *.vcproj.*.*.*
+*.vcxproj
+*.vcxproj.*
+*.vcxproj.*.*
+*.vcxproj.*.*.*

 # Build results
 [Dd]ebug/
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -401,7 +401,6 @@ IF(WIN32)
  ADD_SUBDIRECTORY(win/upgrade_wizard)
  ADD_SUBDIRECTORY(win/packaging)
 ENDIF()
-ADD_SUBDIRECTORY(packaging/solaris)


 INCLUDE(for_clients)
--- a/client/mysql_upgrade.c
+++ b/client/mysql_upgrade.c
@ -1109,7 +1109,7 @@ int main(int argc, char **argv)
    printf("This installation of MySQL is already upgraded to %s, "
           "use --force if you still need to run mysql_upgrade\n",
           MYSQL_SERVER_VERSION);
-    die(NULL);
+    goto end;
  }

  if (opt_version_check && check_version_match())
@ -1138,6 +1138,7 @@ int main(int argc, char **argv)

  DBUG_ASSERT(phase == phases_total);

+end:
  free_used_memory();
  my_end(my_end_arg);
  exit(0);
--- a/client/mysqlbinlog.cc
+++ b/client/mysqlbinlog.cc
@ -2240,7 +2240,7 @@ static Exit_status check_header(IO_CACHE* file,
        Format_description_log_event *new_description_event;
        my_b_seek(file, tmp_pos); /* seek back to event's start */
        if (!(new_description_event= (Format_description_log_event*) 
-              Log_event::read_log_event(file, glob_description_event,
+              Log_event::read_log_event(file, 0, glob_description_event,
                                        opt_verify_binlog_checksum)))
          /* EOF can't be hit here normally, so it's a real error */
        {
@ -2274,7 +2274,7 @@ static Exit_status check_header(IO_CACHE* file,
      {
        Log_event *ev;
        my_b_seek(file, tmp_pos); /* seek back to event's start */
-        if (!(ev= Log_event::read_log_event(file, glob_description_event,
+        if (!(ev= Log_event::read_log_event(file, 0, glob_description_event,
                                            opt_verify_binlog_checksum)))
        {
          /* EOF can't be hit here normally, so it's a real error */
@ -2388,7 +2388,7 @@ static Exit_status dump_local_log_entries(PRINT_EVENT_INFO *print_event_info,
    char llbuff[21];
    my_off_t old_off = my_b_tell(file);

-    Log_event* ev = Log_event::read_log_event(file, glob_description_event,
+    Log_event* ev = Log_event::read_log_event(file, 0, glob_description_event,
                                              opt_verify_binlog_checksum);
    if (!ev)
    {
@ -2575,6 +2575,11 @@ void *sql_alloc(size_t size)
  return alloc_root(&s_mem_root, size);
 }

+struct encryption_service_st encryption_handler=
+{
+  0, 0, 0, 0, 0, 0, 0
+};
+
 /*
  We must include this here as it's compiled with different options for
  the server
--- a/client/mysqlimport.c
+++ b/client/mysqlimport.c
@ -36,7 +36,7 @@


 /* Global Thread counter */
-uint counter;
+uint counter= 0;
 pthread_mutex_t counter_mutex;
 pthread_cond_t count_threshhold;

@ -489,6 +489,11 @@ static void safe_exit(int error, MYSQL *mysql)
 {
  if (error && ignore_errors)
    return;
+
+  /* in multi-threaded mode protect from concurrent safe_exit's */
+  if (counter)
+    pthread_mutex_lock(&counter_mutex);
+
  if (mysql)
    mysql_close(mysql);

--- a/client/mysqlslap.c
+++ b/client/mysqlslap.c
@ -1,5 +1,6 @@
 /*
-   Copyright (c) 2005, 2012, Oracle and/or its affiliates.
+   Copyright (c) 2005, 2015, Oracle and/or its affiliates.
+   Copyright (c) 2010, 2015, MariaDB

   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@ -242,7 +243,7 @@ void print_conclusions_csv(conclusions *con);
 void generate_stats(conclusions *con, option_string *eng, stats *sptr);
 uint parse_comma(const char *string, uint **range);
 uint parse_delimiter(const char *script, statement **stmt, char delm);
-uint parse_option(const char *origin, option_string **stmt, char delm);
+int parse_option(const char *origin, option_string **stmt, char delm);
 static int drop_schema(MYSQL *mysql, const char *db);
 uint get_random_string(char *buf);
 static statement *build_table_string(void);
@ -1264,7 +1265,13 @@ get_options(int *argc,char ***argv)
  if (num_int_cols_opt)
  {
    option_string *str;
-    parse_option(num_int_cols_opt, &str, ',');
+    if(parse_option(num_int_cols_opt, &str, ',') == -1)
+    {
+      fprintf(stderr, "Invalid value specified for the option "
+              "'number-int-cols'\n");
+      option_cleanup(str);
+      return 1;
+    }
    num_int_cols= atoi(str->string);
    if (str->option)
      num_int_cols_index= atoi(str->option);
@ -1275,7 +1282,13 @@ get_options(int *argc,char ***argv)
  if (num_char_cols_opt)
  {
    option_string *str;
-    parse_option(num_char_cols_opt, &str, ',');
+    if(parse_option(num_char_cols_opt, &str, ',') == -1)
+    {
+      fprintf(stderr, "Invalid value specified for the option "
+              "'number-char-cols'\n");
+      option_cleanup(str);
+      return 1;
+    }
    num_char_cols= atoi(str->string);
    if (str->option)
      num_char_cols_index= atoi(str->option);
@ -1512,7 +1525,13 @@ get_options(int *argc,char ***argv)
    printf("Parsing engines to use.\n");

  if (default_engine)
-    parse_option(default_engine, &engine_options, ',');
+  {
+    if(parse_option(default_engine, &engine_options, ',') == -1)
+    {
+      fprintf(stderr, "Invalid value specified for the option 'engine'\n");
+      return 1;
+    }
+  }

  if (tty_password)
    opt_password= get_tty_password(NullS);
@ -1989,7 +2008,7 @@ end:
  DBUG_RETURN(0);
 }

-uint
+int
 parse_option(const char *origin, option_string **stmt, char delm)
 {
  char *retstr;
@ -2014,6 +2033,13 @@ parse_option(const char *origin, option_string **stmt, char delm)
    char buffer[HUGE_STRING_LENGTH]= "";
    char *buffer_ptr;

+    /*
+      Return an error if the length of the any of the comma seprated value
+      exceeds HUGE_STRING_LENGTH.
+    */
+    if ((size_t)(retstr - ptr) > HUGE_STRING_LENGTH)
+      return -1;
+
    count++;
    strncpy(buffer, ptr, (size_t)(retstr - ptr));
    /*
@ -2053,6 +2079,13 @@ parse_option(const char *origin, option_string **stmt, char delm)
  {
    char *origin_ptr;

+    /*
+      Return an error if the length of the any of the comma seprated value
+      exceeds HUGE_STRING_LENGTH.
+    */
+    if (strlen(ptr) > HUGE_STRING_LENGTH)
+      return -1;
+
    if ((origin_ptr= strchr(ptr, ':')))
    {
      char *option_ptr;
@ -2063,13 +2096,13 @@ parse_option(const char *origin, option_string **stmt, char delm)
      option_ptr= (char *)ptr + 1 + tmp->length;

      /* Move past the : and the first string */
-      tmp->option_length= (size_t)((ptr + length) - option_ptr);
+      tmp->option_length= strlen(option_ptr);
      tmp->option= my_strndup(option_ptr, tmp->option_length,
                              MYF(MY_FAE));
    }
    else
    {
-      tmp->length= (size_t)((ptr + length) - ptr);
+      tmp->length= strlen(ptr);
      tmp->string= my_strndup(ptr, tmp->length, MYF(MY_FAE));
    }

--- a/cmake/check_compiler_flag.cmake
+++ b/cmake/check_compiler_flag.cmake
@ -9,11 +9,13 @@ SET(fail_patterns
    FAIL_REGEX "unrecognized .*option"
    FAIL_REGEX "ignoring unknown option"
    FAIL_REGEX "warning:.*ignored"
+    FAIL_REGEX "warning:.*is valid for.*but not for"
    FAIL_REGEX "warning:.*redefined"
    FAIL_REGEX "[Ww]arning: [Oo]ption"
    )

-MACRO (MY_CHECK_C_COMPILER_FLAG flag result)
+MACRO (MY_CHECK_C_COMPILER_FLAG flag)
+  STRING(REGEX REPLACE "[-,= ]" "_" result "HAVE_C_${flag}")
  SET(SAVE_CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}")
  SET(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} ${flag}")
  CHECK_C_SOURCE_COMPILES("int main(void) { return 0; }" ${result}
@ -21,7 +23,8 @@ MACRO (MY_CHECK_C_COMPILER_FLAG flag result)
  SET(CMAKE_REQUIRED_FLAGS "${SAVE_CMAKE_REQUIRED_FLAGS}")
 ENDMACRO()

-MACRO (MY_CHECK_CXX_COMPILER_FLAG flag result)
+MACRO (MY_CHECK_CXX_COMPILER_FLAG flag)
+  STRING(REGEX REPLACE "[-,= ]" "_" result "HAVE_CXX_${flag}")
  SET(SAVE_CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}")
  SET(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} ${flag}")
  CHECK_CXX_SOURCE_COMPILES("int main(void) { return 0; }" ${result}
@ -35,10 +38,11 @@ FUNCTION(MY_CHECK_AND_SET_COMPILER_FLAG flag)
  IF(WIN32)
    RETURN()
  ENDIF()
-  MY_CHECK_C_COMPILER_FLAG(${flag} HAVE_C_${flag})
-  MY_CHECK_CXX_COMPILER_FLAG(${flag} HAVE_CXX_${flag})
+  MY_CHECK_C_COMPILER_FLAG(${flag})
+  MY_CHECK_CXX_COMPILER_FLAG(${flag})
+  STRING(REGEX REPLACE "[-,= ]" "_" result "${flag}")
  FOREACH(lang C CXX)
-    IF (HAVE_${lang}_${flag})
+    IF (HAVE_${lang}_${result})
      IF(ARGN)
        FOREACH(type ${ARGN})
          SET(CMAKE_${lang}_FLAGS_${type} "${CMAKE_${lang}_FLAGS_${type}} ${flag}" PARENT_SCOPE)
--- a/cmake/maintainer.cmake
+++ b/cmake/maintainer.cmake
@ -15,8 +15,8 @@

 # Common warning flags for GCC, G++, Clang and Clang++
 SET(MY_WARNING_FLAGS "-Wall -Wextra -Wformat-security -Wno-init-self")
-MY_CHECK_C_COMPILER_FLAG("-Wvla" HAVE_WVLA) # Requires GCC 4.3+ or Clang
-IF(HAVE_WVLA)
+MY_CHECK_C_COMPILER_FLAG("-Wvla") # Requires GCC 4.3+ or Clang
+IF(HAVE_C__Wvla)
  SET(MY_WARNING_FLAGS "${MY_WARNING_FLAGS} -Wvla")
 ENDIF()

--- a/cmake/ssl.cmake
+++ b/cmake/ssl.cmake
@ -147,7 +147,6 @@ MACRO (MYSQL_CHECK_SSL)
    IF (WITH_SSL_PATH)
      LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES)
    ENDIF()
-    MESSAGE(STATUS "suffixes <${CMAKE_FIND_LIBRARY_SUFFIXES}>")
    FIND_LIBRARY(OPENSSL_LIBRARIES
                 NAMES ssl ssleay32 ssleay32MD
                 HINTS ${OPENSSL_ROOT_DIR}/lib)
--- a/configure.cmake
+++ b/configure.cmake
@ -274,8 +274,8 @@ ENDIF()
 FIND_PACKAGE (Threads)

 FUNCTION(MY_CHECK_PTHREAD_ONCE_INIT)
-  CHECK_C_COMPILER_FLAG("-Werror" HAVE_WERROR_FLAG)
-  IF(NOT HAVE_WERROR_FLAG)
+  MY_CHECK_C_COMPILER_FLAG("-Werror")
+  IF(NOT HAVE_C__Werror)
    RETURN()
  ENDIF()
  SET(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -Werror")
--- a/debian/additions/mysqld_safe_syslog.cnf
+++ b/debian/additions/mysqld_safe_syslog.cnf
@ -1,2 +1,3 @@
 [mysqld_safe]
+skip_log_error
 syslog
--- a/include/my_crypt.h
+++ b/include/my_crypt.h
@ -36,58 +36,54 @@ extern "C" {
 /* The max key length of all supported algorithms */
 #define MY_AES_MAX_KEY_LENGTH 32

+#define MY_AES_CTX_SIZE 512
+
+enum my_aes_mode {
+    MY_AES_ECB, MY_AES_CBC
 #ifdef HAVE_EncryptAes128Ctr
-
-int my_aes_encrypt_ctr(const uchar* source, uint source_length,
-                                uchar* dest, uint* dest_length,
-                                const uchar* key, uint key_length,
-                                const uchar* iv, uint iv_length);
-
-#define my_aes_decrypt_ctr my_aes_encrypt_ctr
-
+  , MY_AES_CTR
 #endif
-
 #ifdef HAVE_EncryptAes128Gcm
-
-int my_aes_encrypt_gcm(const uchar* source, uint source_length,
-                                uchar* dest, uint* dest_length,
-                                const uchar* key, uint key_length,
-                                const uchar* iv, uint iv_length);
-
-int my_aes_decrypt_gcm(const uchar* source, uint source_length,
-                                uchar* dest, uint* dest_length,
-                                const uchar* key, uint key_length,
-                                const uchar* iv, uint iv_length);
+  , MY_AES_GCM
 #endif
+};

-int my_aes_encrypt_cbc(const uchar* source, uint source_length,
-                                uchar* dest, uint* dest_length,
-                                const uchar* key, uint key_length,
-                                const uchar* iv, uint iv_length,
-                                int no_padding);
+int my_aes_crypt_init(void *ctx, enum my_aes_mode mode, int flags,
+                      const unsigned char* key, unsigned int klen,
+                      const unsigned char* iv, unsigned int ivlen);
+int my_aes_crypt_update(void *ctx, const uchar *src, uint slen,
+                        uchar *dst, uint *dlen);
+int my_aes_crypt_finish(void *ctx, uchar *dst, uint *dlen);
+int my_aes_crypt(enum my_aes_mode mode, int flags,
+                 const uchar *src, uint slen, uchar *dst, uint *dlen,
+                 const uchar *key, uint klen, const uchar *iv, uint ivlen);

-int my_aes_decrypt_cbc(const uchar* source, uint source_length,
-                                uchar* dest, uint* dest_length,
-                                const uchar* key, uint key_length,
-                                const uchar* iv, uint iv_length,
-                                int no_padding);
+/*
+  calculate the length of the cyphertext from the length of the plaintext
+  for different AES encryption modes with padding enabled.
+  Without padding (ENCRYPTION_FLAG_NOPAD) cyphertext has the same length
+  as the plaintext
+*/
+static inline uint my_aes_get_size(enum my_aes_mode mode __attribute__((unused)), uint source_length)
+{
+#ifdef HAVE_EncryptAes128Ctr
+  if (mode == MY_AES_CTR)
+    return source_length;
+#ifdef HAVE_EncryptAes128Gcm
+  if (mode == MY_AES_GCM)
+    return source_length + MY_AES_BLOCK_SIZE;
+#endif
+#endif
+  return (source_length / MY_AES_BLOCK_SIZE + 1) * MY_AES_BLOCK_SIZE;
+}

-int my_aes_encrypt_ecb(const uchar* source, uint source_length,
-                                uchar* dest, uint* dest_length,
-                                const uchar* key, uint key_length,
-                                const uchar* iv, uint iv_length,
-                                int no_padding);
-
-int my_aes_decrypt_ecb(const uchar* source, uint source_length,
-                                uchar* dest, uint* dest_length,
-                                const uchar* key, uint key_length,
-                                const uchar* iv, uint iv_length,
-                                int no_padding);
+static inline uint my_aes_ctx_size(enum my_aes_mode mode __attribute__((unused)))
+{
+  return MY_AES_CTX_SIZE;
+}

 int my_random_bytes(uchar* buf, int num);

-uint my_aes_get_size(uint source_length);
-
 #ifdef __cplusplus
 }
 #endif
--- a/include/my_getopt.h
+++ b/include/my_getopt.h
@ -40,7 +40,8 @@ C_MODE_START
 #define GET_FLAGSET   15

 #define GET_ASK_ADDR     128
-#define GET_TYPE_MASK	 127
+#define GET_AUTO          64
+#define GET_TYPE_MASK     63

 /**
  Enumeration of the my_option::arg_type attributes.
@ -100,6 +101,7 @@ typedef void *(*my_getopt_value)(const char *, uint, const struct my_option *,


 extern char *disabled_my_option;
+extern char *autoset_my_option;
 extern my_bool my_getopt_print_errors;
 extern my_bool my_getopt_skip_unknown;
 extern my_bool my_getopt_prefix_matching;
--- a/include/my_sys.h
+++ b/include/my_sys.h
@ -175,6 +175,7 @@ extern void set_malloc_size_cb(MALLOC_SIZE_CB func);
 	/* defines when allocating data */
 extern void *my_malloc(size_t Size,myf MyFlags);
 extern void *my_multi_malloc(myf MyFlags, ...);
+extern void *my_multi_malloc_large(myf MyFlags, ...);
 extern void *my_realloc(void *oldpoint, size_t Size, myf MyFlags);
 extern void my_free(void *ptr);
 extern void *my_memdup(const void *from,size_t length,myf MyFlags);
@ -204,16 +205,17 @@ extern void my_large_free(uchar *ptr);
 #endif /* GNUC */
 #define my_alloca(SZ) alloca((size_t) (SZ))
 #define my_afree(PTR) ((void)0)
-#define my_safe_alloca(size, max_alloca_sz) ((size <= max_alloca_sz) ? \
+#define MAX_ALLOCA_SZ 4096
+#define my_safe_alloca(size) (((size) <= MAX_ALLOCA_SZ) ? \
                               my_alloca(size) : \
-                                             my_malloc(size, MYF(0)))
-#define my_safe_afree(ptr, size, max_alloca_sz) if (size > max_alloca_sz) \
-                                               my_free(ptr)
+                               my_malloc((size), MYF(MY_THREAD_SPECIFIC|MY_WME)))
+#define my_safe_afree(ptr, size) \
+                  do { if ((size) > MAX_ALLOCA_SZ) my_free(ptr); } while(0)
 #else
 #define my_alloca(SZ) my_malloc(SZ,MYF(MY_FAE))
 #define my_afree(PTR) my_free(PTR)
-#define my_safe_alloca(size, max_alloca_sz) my_alloca(size)
-#define my_safe_afree(ptr, size, max_alloca_sz) my_afree(ptr)
+#define my_safe_alloca(size) my_alloca(size)
+#define my_safe_afree(ptr, size) my_afree(ptr)
 #endif /* HAVE_ALLOCA */

 #ifndef errno				/* did we already get it? */
@ -613,7 +615,6 @@ my_off_t my_b_safe_tell(IO_CACHE* info); /* picks the correct tell() */
 int my_b_pread(IO_CACHE *info, uchar *Buffer, size_t Count, my_off_t pos);

 typedef uint32 ha_checksum;
-extern ulong my_crc_dbug_check;

 #include <my_alloc.h>

--- a/include/mysql/plugin_audit.h.pp
+++ b/include/mysql/plugin_audit.h.pp
@ -181,21 +181,46 @@ int thd_key_create(MYSQL_THD_KEY_T *key);
 void thd_key_delete(MYSQL_THD_KEY_T *key);
 void* thd_getspecific(void* thd, MYSQL_THD_KEY_T key);
 int thd_setspecific(void* thd, MYSQL_THD_KEY_T key, void *value);
-typedef int (*encrypt_decrypt_func)(const unsigned char* src, unsigned int slen,
+struct encryption_service_st {
+  unsigned int (*encryption_key_get_latest_version_func)(unsigned int key_id);
+  unsigned int (*encryption_key_get_func)(unsigned int key_id, unsigned int key_version,
+                                          unsigned char* buffer, unsigned int* length);
+  unsigned int (*encryption_ctx_size_func)(unsigned int key_id, unsigned int key_version);
+  int (*encryption_ctx_init_func)(void *ctx, const unsigned char* key, unsigned int klen,
+                                  const unsigned char* iv, unsigned int ivlen,
+                                  int flags, unsigned int key_id,
+                                  unsigned int key_version);
+  int (*encryption_ctx_update_func)(void *ctx, const unsigned char* src, unsigned int slen,
+                                    unsigned char* dst, unsigned int* dlen);
+  int (*encryption_ctx_finish_func)(void *ctx, unsigned char* dst, unsigned int* dlen);
+  unsigned int (*encryption_encrypted_length_func)(unsigned int slen, unsigned int key_id, unsigned int key_version);
+};
+extern struct encryption_service_st encryption_handler;
+static inline unsigned int encryption_key_id_exists(unsigned int id)
+{
+  return encryption_handler.encryption_key_get_latest_version_func(id) != (~(unsigned int)0);
+}
+static inline unsigned int encryption_key_version_exists(unsigned int id, unsigned int version)
+{
+  unsigned int unused;
+  return encryption_handler.encryption_key_get_func((id),(version),(NULL),(&unused)) != (~(unsigned int)0);
+}
+static inline int encryption_crypt(const unsigned char* src, unsigned int slen,
                                   unsigned char* dst, unsigned int* dlen,
                                   const unsigned char* key, unsigned int klen,
                                   const unsigned char* iv, unsigned int ivlen,
-                                    int no_padding, unsigned int key_id,
-                                    unsigned int key_version);
-struct encryption_service_st {
-  unsigned int (*encryption_key_get_latest_version_func)(unsigned int);
-  unsigned int (*encryption_key_id_exists_func)(unsigned int);
-  unsigned int (*encryption_key_version_exists_func)(unsigned int, unsigned int);
-  unsigned int (*encryption_key_get_func)(unsigned int, unsigned int, unsigned char*, unsigned int*);
-  encrypt_decrypt_func encryption_encrypt_func;
-  encrypt_decrypt_func encryption_decrypt_func;
-};
-extern struct encryption_service_st encryption_handler;
+                                   int flags, unsigned int key_id, unsigned int key_version)
+{
+  void *ctx= alloca(encryption_handler.encryption_ctx_size_func((key_id),(key_version)));
+  int res1, res2;
+  unsigned int d1, d2;
+  if ((res1= encryption_handler.encryption_ctx_init_func((ctx),(key),(klen),(iv),(ivlen),(flags),(key_id),(key_version))))
+    return res1;
+  res1= encryption_handler.encryption_ctx_update_func((ctx),(src),(slen),(dst),(&d1));
+  res2= encryption_handler.encryption_ctx_finish_func((ctx),(dst + d1),(&d2));
+  *dlen= d1 + d2;
+  return res1 ? res1 : res2;
+}
 struct st_encryption_scheme_key {
  unsigned int version;
  unsigned char key[16];
--- a/include/mysql/plugin_auth.h.pp
+++ b/include/mysql/plugin_auth.h.pp
@ -181,21 +181,46 @@ int thd_key_create(MYSQL_THD_KEY_T *key);
 void thd_key_delete(MYSQL_THD_KEY_T *key);
 void* thd_getspecific(void* thd, MYSQL_THD_KEY_T key);
 int thd_setspecific(void* thd, MYSQL_THD_KEY_T key, void *value);
-typedef int (*encrypt_decrypt_func)(const unsigned char* src, unsigned int slen,
+struct encryption_service_st {
+  unsigned int (*encryption_key_get_latest_version_func)(unsigned int key_id);
+  unsigned int (*encryption_key_get_func)(unsigned int key_id, unsigned int key_version,
+                                          unsigned char* buffer, unsigned int* length);
+  unsigned int (*encryption_ctx_size_func)(unsigned int key_id, unsigned int key_version);
+  int (*encryption_ctx_init_func)(void *ctx, const unsigned char* key, unsigned int klen,
+                                  const unsigned char* iv, unsigned int ivlen,
+                                  int flags, unsigned int key_id,
+                                  unsigned int key_version);
+  int (*encryption_ctx_update_func)(void *ctx, const unsigned char* src, unsigned int slen,
+                                    unsigned char* dst, unsigned int* dlen);
+  int (*encryption_ctx_finish_func)(void *ctx, unsigned char* dst, unsigned int* dlen);
+  unsigned int (*encryption_encrypted_length_func)(unsigned int slen, unsigned int key_id, unsigned int key_version);
+};
+extern struct encryption_service_st encryption_handler;
+static inline unsigned int encryption_key_id_exists(unsigned int id)
+{
+  return encryption_handler.encryption_key_get_latest_version_func(id) != (~(unsigned int)0);
+}
+static inline unsigned int encryption_key_version_exists(unsigned int id, unsigned int version)
+{
+  unsigned int unused;
+  return encryption_handler.encryption_key_get_func((id),(version),(NULL),(&unused)) != (~(unsigned int)0);
+}
+static inline int encryption_crypt(const unsigned char* src, unsigned int slen,
                                   unsigned char* dst, unsigned int* dlen,
                                   const unsigned char* key, unsigned int klen,
                                   const unsigned char* iv, unsigned int ivlen,
-                                    int no_padding, unsigned int key_id,
-                                    unsigned int key_version);
-struct encryption_service_st {
-  unsigned int (*encryption_key_get_latest_version_func)(unsigned int);
-  unsigned int (*encryption_key_id_exists_func)(unsigned int);
-  unsigned int (*encryption_key_version_exists_func)(unsigned int, unsigned int);
-  unsigned int (*encryption_key_get_func)(unsigned int, unsigned int, unsigned char*, unsigned int*);
-  encrypt_decrypt_func encryption_encrypt_func;
-  encrypt_decrypt_func encryption_decrypt_func;
-};
-extern struct encryption_service_st encryption_handler;
+                                   int flags, unsigned int key_id, unsigned int key_version)
+{
+  void *ctx= alloca(encryption_handler.encryption_ctx_size_func((key_id),(key_version)));
+  int res1, res2;
+  unsigned int d1, d2;
+  if ((res1= encryption_handler.encryption_ctx_init_func((ctx),(key),(klen),(iv),(ivlen),(flags),(key_id),(key_version))))
+    return res1;
+  res1= encryption_handler.encryption_ctx_update_func((ctx),(src),(slen),(dst),(&d1));
+  res2= encryption_handler.encryption_ctx_finish_func((ctx),(dst + d1),(&d2));
+  *dlen= d1 + d2;
+  return res1 ? res1 : res2;
+}
 struct st_encryption_scheme_key {
  unsigned int version;
  unsigned char key[16];
--- a/include/mysql/plugin_encryption.h
+++ b/include/mysql/plugin_encryption.h
@ -27,7 +27,7 @@

 #include <mysql/plugin.h>

-#define MariaDB_ENCRYPTION_INTERFACE_VERSION 0x0200
+#define MariaDB_ENCRYPTION_INTERFACE_VERSION 0x0300

 /**
  Encryption plugin descriptor
@ -36,6 +36,8 @@ struct st_mariadb_encryption
 {
  int interface_version;                        /**< version plugin uses */

+  /*********** KEY MANAGEMENT ********************************************/
+
  /**
    function returning latest key version for a given key id

@ -66,8 +68,51 @@ struct st_mariadb_encryption
  unsigned int (*get_key)(unsigned int key_id, unsigned int version,
                          unsigned char *key, unsigned int *key_length);

-  encrypt_decrypt_func encrypt;
-  encrypt_decrypt_func decrypt;
+  /*********** ENCRYPTION ************************************************/
+  /*
+    the caller uses encryption as follows:
+      1. create the encryption context object of the crypt_ctx_size() bytes.
+      2. initialize it with crypt_ctx_init().
+      3. repeat crypt_ctx_update() until there are no more data to encrypt.
+      4. write the remaining output bytes and destroy the context object
+         with crypt_ctx_finish().
+  */
+
+  /**
+    returns the size of the encryption context object in bytes
+  */
+  unsigned int (*crypt_ctx_size)(unsigned int key_id, unsigned int key_version);
+  /**
+    initializes the encryption context object.
+  */
+  int (*crypt_ctx_init)(void *ctx, const unsigned char* key, unsigned int klen,
+                        const unsigned char* iv, unsigned int ivlen,
+                        int flags, unsigned int key_id,
+                        unsigned int key_version);
+  /**
+    processes (encrypts or decrypts) a chunk of data
+
+    writes the output to th dst buffer. note that it might write
+    more bytes that were in the input. or less. or none at all.
+  */
+  int (*crypt_ctx_update)(void *ctx, const unsigned char* src, unsigned int slen,
+                          unsigned char* dst, unsigned int* dlen);
+  /**
+    writes the remaining output bytes and destroys the encryption context
+
+    crypt_ctx_update might've cached part of the output in the context,
+    this method will flush these data out.
+  */
+  int (*crypt_ctx_finish)(void *ctx, unsigned char* dst, unsigned int* dlen);
+  /**
+    returns the length of the encrypted data
+
+    it returns the exact length, given only the source length.
+    which means, this API only supports encryption algorithms where
+    the length of the encrypted data only depends on the length of the
+    input (a.k.a. compression is not supported).
+  */
+  unsigned int (*encrypted_length)(unsigned int slen, unsigned int key_id, unsigned int key_version);
 };
 #endif

--- a/include/mysql/plugin_encryption.h.pp
+++ b/include/mysql/plugin_encryption.h.pp
@ -181,21 +181,46 @@ int thd_key_create(MYSQL_THD_KEY_T *key);
 void thd_key_delete(MYSQL_THD_KEY_T *key);
 void* thd_getspecific(void* thd, MYSQL_THD_KEY_T key);
 int thd_setspecific(void* thd, MYSQL_THD_KEY_T key, void *value);
-typedef int (*encrypt_decrypt_func)(const unsigned char* src, unsigned int slen,
+struct encryption_service_st {
+  unsigned int (*encryption_key_get_latest_version_func)(unsigned int key_id);
+  unsigned int (*encryption_key_get_func)(unsigned int key_id, unsigned int key_version,
+                                          unsigned char* buffer, unsigned int* length);
+  unsigned int (*encryption_ctx_size_func)(unsigned int key_id, unsigned int key_version);
+  int (*encryption_ctx_init_func)(void *ctx, const unsigned char* key, unsigned int klen,
+                                  const unsigned char* iv, unsigned int ivlen,
+                                  int flags, unsigned int key_id,
+                                  unsigned int key_version);
+  int (*encryption_ctx_update_func)(void *ctx, const unsigned char* src, unsigned int slen,
+                                    unsigned char* dst, unsigned int* dlen);
+  int (*encryption_ctx_finish_func)(void *ctx, unsigned char* dst, unsigned int* dlen);
+  unsigned int (*encryption_encrypted_length_func)(unsigned int slen, unsigned int key_id, unsigned int key_version);
+};
+extern struct encryption_service_st encryption_handler;
+static inline unsigned int encryption_key_id_exists(unsigned int id)
+{
+  return encryption_handler.encryption_key_get_latest_version_func(id) != (~(unsigned int)0);
+}
+static inline unsigned int encryption_key_version_exists(unsigned int id, unsigned int version)
+{
+  unsigned int unused;
+  return encryption_handler.encryption_key_get_func((id),(version),(NULL),(&unused)) != (~(unsigned int)0);
+}
+static inline int encryption_crypt(const unsigned char* src, unsigned int slen,
                                   unsigned char* dst, unsigned int* dlen,
                                   const unsigned char* key, unsigned int klen,
                                   const unsigned char* iv, unsigned int ivlen,
-                                    int no_padding, unsigned int key_id,
-                                    unsigned int key_version);
-struct encryption_service_st {
-  unsigned int (*encryption_key_get_latest_version_func)(unsigned int);
-  unsigned int (*encryption_key_id_exists_func)(unsigned int);
-  unsigned int (*encryption_key_version_exists_func)(unsigned int, unsigned int);
-  unsigned int (*encryption_key_get_func)(unsigned int, unsigned int, unsigned char*, unsigned int*);
-  encrypt_decrypt_func encryption_encrypt_func;
-  encrypt_decrypt_func encryption_decrypt_func;
-};
-extern struct encryption_service_st encryption_handler;
+                                   int flags, unsigned int key_id, unsigned int key_version)
+{
+  void *ctx= alloca(encryption_handler.encryption_ctx_size_func((key_id),(key_version)));
+  int res1, res2;
+  unsigned int d1, d2;
+  if ((res1= encryption_handler.encryption_ctx_init_func((ctx),(key),(klen),(iv),(ivlen),(flags),(key_id),(key_version))))
+    return res1;
+  res1= encryption_handler.encryption_ctx_update_func((ctx),(src),(slen),(dst),(&d1));
+  res2= encryption_handler.encryption_ctx_finish_func((ctx),(dst + d1),(&d2));
+  *dlen= d1 + d2;
+  return res1 ? res1 : res2;
+}
 struct st_encryption_scheme_key {
  unsigned int version;
  unsigned char key[16];
@ -392,6 +417,13 @@ struct st_mariadb_encryption
  unsigned int (*get_latest_key_version)(unsigned int key_id);
  unsigned int (*get_key)(unsigned int key_id, unsigned int version,
                          unsigned char *key, unsigned int *key_length);
-  encrypt_decrypt_func encrypt;
-  encrypt_decrypt_func decrypt;
+  unsigned int (*crypt_ctx_size)(unsigned int key_id, unsigned int key_version);
+  int (*crypt_ctx_init)(void *ctx, const unsigned char* key, unsigned int klen,
+                        const unsigned char* iv, unsigned int ivlen,
+                        int flags, unsigned int key_id,
+                        unsigned int key_version);
+  int (*crypt_ctx_update)(void *ctx, const unsigned char* src, unsigned int slen,
+                          unsigned char* dst, unsigned int* dlen);
+  int (*crypt_ctx_finish)(void *ctx, unsigned char* dst, unsigned int* dlen);
+  unsigned int (*encrypted_length)(unsigned int slen, unsigned int key_id, unsigned int key_version);
 };
--- a/include/mysql/plugin_ftparser.h.pp
+++ b/include/mysql/plugin_ftparser.h.pp
@ -181,21 +181,46 @@ int thd_key_create(MYSQL_THD_KEY_T *key);
 void thd_key_delete(MYSQL_THD_KEY_T *key);
 void* thd_getspecific(void* thd, MYSQL_THD_KEY_T key);
 int thd_setspecific(void* thd, MYSQL_THD_KEY_T key, void *value);
-typedef int (*encrypt_decrypt_func)(const unsigned char* src, unsigned int slen,
+struct encryption_service_st {
+  unsigned int (*encryption_key_get_latest_version_func)(unsigned int key_id);
+  unsigned int (*encryption_key_get_func)(unsigned int key_id, unsigned int key_version,
+                                          unsigned char* buffer, unsigned int* length);
+  unsigned int (*encryption_ctx_size_func)(unsigned int key_id, unsigned int key_version);
+  int (*encryption_ctx_init_func)(void *ctx, const unsigned char* key, unsigned int klen,
+                                  const unsigned char* iv, unsigned int ivlen,
+                                  int flags, unsigned int key_id,
+                                  unsigned int key_version);
+  int (*encryption_ctx_update_func)(void *ctx, const unsigned char* src, unsigned int slen,
+                                    unsigned char* dst, unsigned int* dlen);
+  int (*encryption_ctx_finish_func)(void *ctx, unsigned char* dst, unsigned int* dlen);
+  unsigned int (*encryption_encrypted_length_func)(unsigned int slen, unsigned int key_id, unsigned int key_version);
+};
+extern struct encryption_service_st encryption_handler;
+static inline unsigned int encryption_key_id_exists(unsigned int id)
+{
+  return encryption_handler.encryption_key_get_latest_version_func(id) != (~(unsigned int)0);
+}
+static inline unsigned int encryption_key_version_exists(unsigned int id, unsigned int version)
+{
+  unsigned int unused;
+  return encryption_handler.encryption_key_get_func((id),(version),(NULL),(&unused)) != (~(unsigned int)0);
+}
+static inline int encryption_crypt(const unsigned char* src, unsigned int slen,
                                   unsigned char* dst, unsigned int* dlen,
                                   const unsigned char* key, unsigned int klen,
                                   const unsigned char* iv, unsigned int ivlen,
-                                    int no_padding, unsigned int key_id,
-                                    unsigned int key_version);
-struct encryption_service_st {
-  unsigned int (*encryption_key_get_latest_version_func)(unsigned int);
-  unsigned int (*encryption_key_id_exists_func)(unsigned int);
-  unsigned int (*encryption_key_version_exists_func)(unsigned int, unsigned int);
-  unsigned int (*encryption_key_get_func)(unsigned int, unsigned int, unsigned char*, unsigned int*);
-  encrypt_decrypt_func encryption_encrypt_func;
-  encrypt_decrypt_func encryption_decrypt_func;
-};
-extern struct encryption_service_st encryption_handler;
+                                   int flags, unsigned int key_id, unsigned int key_version)
+{
+  void *ctx= alloca(encryption_handler.encryption_ctx_size_func((key_id),(key_version)));
+  int res1, res2;
+  unsigned int d1, d2;
+  if ((res1= encryption_handler.encryption_ctx_init_func((ctx),(key),(klen),(iv),(ivlen),(flags),(key_id),(key_version))))
+    return res1;
+  res1= encryption_handler.encryption_ctx_update_func((ctx),(src),(slen),(dst),(&d1));
+  res2= encryption_handler.encryption_ctx_finish_func((ctx),(dst + d1),(&d2));
+  *dlen= d1 + d2;
+  return res1 ? res1 : res2;
+}
 struct st_encryption_scheme_key {
  unsigned int version;
  unsigned char key[16];
--- a/include/mysql/plugin_password_validation.h.pp
+++ b/include/mysql/plugin_password_validation.h.pp
@ -181,21 +181,46 @@ int thd_key_create(MYSQL_THD_KEY_T *key);
 void thd_key_delete(MYSQL_THD_KEY_T *key);
 void* thd_getspecific(void* thd, MYSQL_THD_KEY_T key);
 int thd_setspecific(void* thd, MYSQL_THD_KEY_T key, void *value);
-typedef int (*encrypt_decrypt_func)(const unsigned char* src, unsigned int slen,
+struct encryption_service_st {
+  unsigned int (*encryption_key_get_latest_version_func)(unsigned int key_id);
+  unsigned int (*encryption_key_get_func)(unsigned int key_id, unsigned int key_version,
+                                          unsigned char* buffer, unsigned int* length);
+  unsigned int (*encryption_ctx_size_func)(unsigned int key_id, unsigned int key_version);
+  int (*encryption_ctx_init_func)(void *ctx, const unsigned char* key, unsigned int klen,
+                                  const unsigned char* iv, unsigned int ivlen,
+                                  int flags, unsigned int key_id,
+                                  unsigned int key_version);
+  int (*encryption_ctx_update_func)(void *ctx, const unsigned char* src, unsigned int slen,
+                                    unsigned char* dst, unsigned int* dlen);
+  int (*encryption_ctx_finish_func)(void *ctx, unsigned char* dst, unsigned int* dlen);
+  unsigned int (*encryption_encrypted_length_func)(unsigned int slen, unsigned int key_id, unsigned int key_version);
+};
+extern struct encryption_service_st encryption_handler;
+static inline unsigned int encryption_key_id_exists(unsigned int id)
+{
+  return encryption_handler.encryption_key_get_latest_version_func(id) != (~(unsigned int)0);
+}
+static inline unsigned int encryption_key_version_exists(unsigned int id, unsigned int version)
+{
+  unsigned int unused;
+  return encryption_handler.encryption_key_get_func((id),(version),(NULL),(&unused)) != (~(unsigned int)0);
+}
+static inline int encryption_crypt(const unsigned char* src, unsigned int slen,
                                   unsigned char* dst, unsigned int* dlen,
                                   const unsigned char* key, unsigned int klen,
                                   const unsigned char* iv, unsigned int ivlen,
-                                    int no_padding, unsigned int key_id,
-                                    unsigned int key_version);
-struct encryption_service_st {
-  unsigned int (*encryption_key_get_latest_version_func)(unsigned int);
-  unsigned int (*encryption_key_id_exists_func)(unsigned int);
-  unsigned int (*encryption_key_version_exists_func)(unsigned int, unsigned int);
-  unsigned int (*encryption_key_get_func)(unsigned int, unsigned int, unsigned char*, unsigned int*);
-  encrypt_decrypt_func encryption_encrypt_func;
-  encrypt_decrypt_func encryption_decrypt_func;
-};
-extern struct encryption_service_st encryption_handler;
+                                   int flags, unsigned int key_id, unsigned int key_version)
+{
+  void *ctx= alloca(encryption_handler.encryption_ctx_size_func((key_id),(key_version)));
+  int res1, res2;
+  unsigned int d1, d2;
+  if ((res1= encryption_handler.encryption_ctx_init_func((ctx),(key),(klen),(iv),(ivlen),(flags),(key_id),(key_version))))
+    return res1;
+  res1= encryption_handler.encryption_ctx_update_func((ctx),(src),(slen),(dst),(&d1));
+  res2= encryption_handler.encryption_ctx_finish_func((ctx),(dst + d1),(&d2));
+  *dlen= d1 + d2;
+  return res1 ? res1 : res2;
+}
 struct st_encryption_scheme_key {
  unsigned int version;
  unsigned char key[16];
--- a/include/mysql/service_encryption.h
+++ b/include/mysql/service_encryption.h
@ -20,7 +20,7 @@

  Functions to support data encryption and encryption key management.
  They are normally implemented in an encryption plugin, so this service
-  connects encryption *consumers* (storage engines) to the encryption
+  connects encryption *consumers* (e.g. storage engines) to the encryption
  *provider* (encryption plugin).
 */

@ -28,6 +28,15 @@
 extern "C" {
 #endif

+#ifndef MYSQL_ABI_CHECK
+#ifdef _WIN32
+#include <malloc.h>
+#define inline __inline
+#else
+#include <alloca.h>
+#endif
+#endif
+
 /* returned from encryption_key_get_latest_version() */
 #define ENCRYPTION_KEY_VERSION_INVALID        (~(unsigned int)0)
 #define ENCRYPTION_KEY_NOT_ENCRYPTED          (0)
@ -38,20 +47,23 @@ extern "C" {
 /* returned from encryption_key_get()  */
 #define ENCRYPTION_KEY_BUFFER_TOO_SMALL    (100)

-typedef int (*encrypt_decrypt_func)(const unsigned char* src, unsigned int slen,
-                                    unsigned char* dst, unsigned int* dlen,
-                                    const unsigned char* key, unsigned int klen,
-                                    const unsigned char* iv, unsigned int ivlen,
-                                    int no_padding, unsigned int key_id,
-                                    unsigned int key_version);
+#define ENCRYPTION_FLAG_DECRYPT     0
+#define ENCRYPTION_FLAG_ENCRYPT     1
+#define ENCRYPTION_FLAG_NOPAD       2

 struct encryption_service_st {
-  unsigned int (*encryption_key_get_latest_version_func)(unsigned int);
-  unsigned int (*encryption_key_id_exists_func)(unsigned int);
-  unsigned int (*encryption_key_version_exists_func)(unsigned int, unsigned int);
-  unsigned int (*encryption_key_get_func)(unsigned int, unsigned int, unsigned char*, unsigned int*);
-  encrypt_decrypt_func encryption_encrypt_func;
-  encrypt_decrypt_func encryption_decrypt_func;
+  unsigned int (*encryption_key_get_latest_version_func)(unsigned int key_id);
+  unsigned int (*encryption_key_get_func)(unsigned int key_id, unsigned int key_version,
+                                          unsigned char* buffer, unsigned int* length);
+  unsigned int (*encryption_ctx_size_func)(unsigned int key_id, unsigned int key_version);
+  int (*encryption_ctx_init_func)(void *ctx, const unsigned char* key, unsigned int klen,
+                                  const unsigned char* iv, unsigned int ivlen,
+                                  int flags, unsigned int key_id,
+                                  unsigned int key_version);
+  int (*encryption_ctx_update_func)(void *ctx, const unsigned char* src, unsigned int slen,
+                                    unsigned char* dst, unsigned int* dlen);
+  int (*encryption_ctx_finish_func)(void *ctx, unsigned char* dst, unsigned int* dlen);
+  unsigned int (*encryption_encrypted_length_func)(unsigned int slen, unsigned int key_id, unsigned int key_version);
 };

 #ifdef MYSQL_DYNAMIC_PLUGIN
@ -59,23 +71,53 @@ struct encryption_service_st {
 extern struct encryption_service_st *encryption_service;

 #define encryption_key_get_latest_version(KI) encryption_service->encryption_key_get_latest_version_func(KI)
-#define encryption_key_id_exists(KI) encryption_service->encryption_key_id_exists_func((KI))
-#define encryption_key_version_exists(KI,KV) encryption_service->encryption_key_version_exists_func((KI),(KV))
 #define encryption_key_get(KI,KV,K,S) encryption_service->encryption_key_get_func((KI),(KV),(K),(S))
-#define encryption_encrypt(S,SL,D,DL,K,KL,I,IL,NP,KI,KV) encryption_service->encryption_encrypt_func((S),(SL),(D),(DL),(K),(KL),(I),(IL),(NP),(KI),(KV))
-#define encryption_decrypt(S,SL,D,DL,K,KL,I,IL,NP,KI,KV) encryption_service->encryption_decrypt_func((S),(SL),(D),(DL),(K),(KL),(I),(IL),(NP),(KI),(KV))
+#define encryption_ctx_size(KI,KV) encryption_service->encryption_ctx_size_func((KI),(KV))
+#define encryption_ctx_init(CTX,K,KL,IV,IVL,F,KI,KV) encryption_service->encryption_ctx_init_func((CTX),(K),(KL),(IV),(IVL),(F),(KI),(KV))
+#define encryption_ctx_update(CTX,S,SL,D,DL) encryption_service->encryption_ctx_update_func((CTX),(S),(SL),(D),(DL))
+#define encryption_ctx_finish(CTX,D,DL) encryption_service->encryption_ctx_finish_func((CTX),(D),(DL))
+#define encryption_encrypted_length(SL,KI,KV) encryption_service->encryption_encrypted_length_func((SL),(KI),(KV))
 #else

 extern struct encryption_service_st encryption_handler;

 #define encryption_key_get_latest_version(KI) encryption_handler.encryption_key_get_latest_version_func(KI)
-#define encryption_key_id_exists(KI) encryption_handler.encryption_key_id_exists_func((KI))
-#define encryption_key_version_exists(KI,KV) encryption_handler.encryption_key_version_exists_func((KI),(KV))
 #define encryption_key_get(KI,KV,K,S) encryption_handler.encryption_key_get_func((KI),(KV),(K),(S))
-#define encryption_encrypt(S,SL,D,DL,K,KL,I,IL,NP,KI,KV) encryption_handler.encryption_encrypt_func((S),(SL),(D),(DL),(K),(KL),(I),(IL),(NP),(KI),(KV))
-#define encryption_decrypt(S,SL,D,DL,K,KL,I,IL,NP,KI,KV) encryption_handler.encryption_decrypt_func((S),(SL),(D),(DL),(K),(KL),(I),(IL),(NP),(KI),(KV))
+#define encryption_ctx_size(KI,KV) encryption_handler.encryption_ctx_size_func((KI),(KV))
+#define encryption_ctx_init(CTX,K,KL,IV,IVL,F,KI,KV) encryption_handler.encryption_ctx_init_func((CTX),(K),(KL),(IV),(IVL),(F),(KI),(KV))
+#define encryption_ctx_update(CTX,S,SL,D,DL) encryption_handler.encryption_ctx_update_func((CTX),(S),(SL),(D),(DL))
+#define encryption_ctx_finish(CTX,D,DL) encryption_handler.encryption_ctx_finish_func((CTX),(D),(DL))
+#define encryption_encrypted_length(SL,KI,KV) encryption_handler.encryption_encrypted_length_func((SL),(KI),(KV))
 #endif

+static inline unsigned int encryption_key_id_exists(unsigned int id)
+{
+  return encryption_key_get_latest_version(id) != ENCRYPTION_KEY_VERSION_INVALID;
+}
+
+static inline unsigned int encryption_key_version_exists(unsigned int id, unsigned int version)
+{
+  unsigned int unused;
+  return encryption_key_get(id, version, NULL, &unused) != ENCRYPTION_KEY_VERSION_INVALID;
+}
+
+static inline int encryption_crypt(const unsigned char* src, unsigned int slen,
+                                   unsigned char* dst, unsigned int* dlen,
+                                   const unsigned char* key, unsigned int klen,
+                                   const unsigned char* iv, unsigned int ivlen,
+                                   int flags, unsigned int key_id, unsigned int key_version)
+{
+  void *ctx= alloca(encryption_ctx_size(key_id, key_version));
+  int res1, res2;
+  unsigned int d1, d2;
+  if ((res1= encryption_ctx_init(ctx, key, klen, iv, ivlen, flags, key_id, key_version)))
+    return res1;
+  res1= encryption_ctx_update(ctx, src, slen, dst, &d1);
+  res2= encryption_ctx_finish(ctx, dst + d1, &d2);
+  *dlen= d1 + d2;
+  return res1 ? res1 : res2;
+}
+
 #ifdef __cplusplus
 }
 #endif
--- a/include/service_versions.h
+++ b/include/service_versions.h
@ -35,6 +35,6 @@
 #define VERSION_thd_autoinc             0x0100
 #define VERSION_thd_error_context       0x0100
 #define VERSION_thd_specifics           0x0100
-#define VERSION_encryption              0x0200
+#define VERSION_encryption              0x0300
 #define VERSION_encryption_scheme       0x0100

--- a/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test
+++ b/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test
@ -228,7 +228,7 @@ rollback;
 create table t0 (n int);
 insert t0 select * from t1;
 set autocommit=1;
-insert into t0 select GET_LOCK("lock1",null);
+insert into t0 select GET_LOCK("lock1",0);
 set autocommit=0;
 create table t2 (n int) engine=innodb;
 insert into t2 values (3); 
--- a/mysql-test/extra/binlog_tests/mysqlbinlog_row_engine.inc
+++ b/mysql-test/extra/binlog_tests/mysqlbinlog_row_engine.inc
@ -16,6 +16,7 @@
 #

 --source include/have_log_bin.inc
+set sql_mode="";

 SET NAMES 'utf8';
 #SHOW VARIABLES LIKE 'character_set%';
--- a/mysql-test/extra/rpl_tests/rpl_ddl.test
+++ b/mysql-test/extra/rpl_tests/rpl_ddl.test
@ -128,6 +128,8 @@
 ###############################################################
 # Some preparations
 ###############################################################
+set global sql_mode='';
+set local sql_mode='';
 # The sync_slave_with_master is needed to make the xids deterministic.
 sync_slave_with_master;

@ -609,3 +611,5 @@ DROP TEMPORARY TABLE mysqltest1.t22;
 DROP DATABASE mysqltest1;
 # mysqltest2 was alreday DROPPED some tests before.
 DROP DATABASE mysqltest3;
+
+set global sql_mode=default;
--- a/mysql-test/include/binlog_start_pos.inc
+++ b/mysql-test/include/binlog_start_pos.inc
@ -10,19 +10,19 @@
 #
 #   Format_description_log_event length = 
 #                      19 /* event common header */ +
-#                      57 /* misc stuff in the Format description header */ +
+#                      58 /* misc stuff in the Format description header */ +
 #                      number of events +
 #                      1 /* Checksum algorithm */ +
 #                      4 /* CRC32 length */
 # 
-# With current number of events = 163,
+# With current number of events = 164,
 #
-#   binlog_start_pos = 4 + 19 + 57 + 163 + 1 + 4 = 248.
+#   binlog_start_pos = 4 + 19 + 57 + 163 + 1 + 4 = 249.
 #
 ##############################################################################

-let $binlog_start_pos=248;
+let $binlog_start_pos=249;
 --disable_query_log
-SET @binlog_start_pos=248;
+SET @binlog_start_pos=249;
 --enable_query_log

--- a/mysql-test/include/check-warnings.test
+++ b/mysql-test/include/check-warnings.test
@ -11,6 +11,10 @@
 # Don't write these queries to binlog
 set SQL_LOG_BIN=0;

+# Do not replicate updates to other galera nodes
+--error 0,1193
+set WSREP_ON=0;
+
 # Turn off any debug crashes, allow the variable to be
 # non existent in release builds
 --error 0,1193
--- a/mysql-test/include/concurrent.inc
+++ b/mysql-test/include/concurrent.inc
@ -26,6 +26,7 @@
 #

 connection default;
+SET SQL_MODE="";
 #
 # Show prerequisites for this test.
 #
@ -670,3 +671,4 @@ connection default;
 drop table t1;
 drop user mysqltest@localhost;

+SET SQL_MODE=default;
--- a/mysql-test/include/ctype_innodb_like.inc
+++ b/mysql-test/include/ctype_innodb_like.inc
@ -2,6 +2,10 @@
 # Bug#11650: LIKE pattern matching using prefix index
 # doesn't return correct result
 #
+--disable_query_log
+set @ctype_save_sql_mode=@@sql_mode;
+set sql_mode="";
+--enable_query_log
 --disable_warnings
 #
 # This query creates a column using
@ -10,6 +14,9 @@
 #
 create table t1 engine=innodb select repeat('a',50) as c1;
 --enable_warnings
+--disable_query_log
+set sql_mode=@ctype_save_sql_mode;
+--enable_query_log
 alter table t1 add index(c1(5));

 insert into t1 values ('abcdefg'),('abcde100'),('abcde110'),('abcde111');
--- a/mysql-test/include/ctype_utf8mb4.inc
+++ b/mysql-test/include/ctype_utf8mb4.inc
@ -688,9 +688,16 @@ eval create table t1 (
 insert into t1 values(1,'foo'),(2,'foobar');
 --sorted_result
 select * from t1 where b like 'foob%';
+--disable_query_log
+set @ctype_save_sql_mode=@@sql_mode;
+set sql_mode="";
+--enable_query_log
 --disable_warnings
 alter table t1 engine=innodb;
 --enable_warnings
+--disable_query_log
+set sql_mode=@ctype_save_sql_mode;
+--enable_query_log
 --sorted_result
 select * from t1 where b like 'foob%';
 drop table t1;
--- a/mysql-test/include/explain_non_select.inc
+++ b/mysql-test/include/explain_non_select.inc
@ -771,7 +771,7 @@ DROP TABLE t1,t2;

 --echo #74

-CREATE TABLE t1(a INT PRIMARY KEY) ENGINE=InnoDB;
+CREATE TABLE t1(a INT PRIMARY KEY);
 INSERT INTO t1 VALUES (1), (2), (3), (4), (5);

 --echo # used key is modified & Using temporary
--- a/mysql-test/include/grant_cache.inc
+++ b/mysql-test/include/grant_cache.inc
@ -37,12 +37,16 @@

 --source include/add_anonymous_users.inc

+set GLOBAL sql_mode="";
+set LOCAL sql_mode="";
 #
 --disable_warnings
 drop table if exists test.t1,mysqltest.t1,mysqltest.t2;
 drop database if exists mysqltest;
 --enable_warnings

+set GLOBAL query_cache_type=ON;
+set LOCAL query_cache_type=ON;
 set GLOBAL query_cache_size=1355776;

 reset query cache;
@ -214,5 +218,9 @@ drop table test.t1,mysqltest.t1,mysqltest.t2;
 drop database mysqltest;

 set GLOBAL query_cache_size=default;
+set GLOBAL query_cache_type=ON;
+set LOCAL query_cache_type=ON;

 --source include/delete_anonymous_users.inc
+set GLOBAL sql_mode=default;
+set GLOBAL query_cache_type=default;
--- a/mysql-test/include/icp_tests.inc
+++ b/mysql-test/include/icp_tests.inc
@ -443,13 +443,13 @@ DROP TABLE t1;
 --echo #            when ICP is on"
 --echo #

-CREATE TABLE t1 (pk INTEGER PRIMARY KEY, i INTEGER NOT NULL) ENGINE=InnoDB;
+CREATE TABLE t1 (pk INTEGER PRIMARY KEY, i INTEGER NOT NULL);

 INSERT INTO t1 VALUES (11,0);
 INSERT INTO t1 VALUES (12,5);
 INSERT INTO t1 VALUES (15,0);

-CREATE TABLE t2 (pk INTEGER PRIMARY KEY, i INTEGER NOT NULL) ENGINE=InnoDB;
+CREATE TABLE t2 (pk INTEGER PRIMARY KEY, i INTEGER NOT NULL);

 INSERT INTO t2 VALUES (11,1);
 INSERT INTO t2 VALUES (12,2);
--- a/mysql-test/include/query_cache.inc
+++ b/mysql-test/include/query_cache.inc
@ -15,6 +15,8 @@
 #               main code went into include/query_cache.inc
 #

+SET global query_cache_type=ON;
+SET local query_cache_type=ON;
 eval SET SESSION STORAGE_ENGINE = $engine_type;

 # Initialise
@ -193,3 +195,5 @@ disconnect connection1;
 connection default;
 set @@global.query_cache_size = @save_query_cache_size;
 drop table t2;
+
+SET global query_cache_type=default;
--- a/mysql-test/include/query_cache_partitions.inc
+++ b/mysql-test/include/query_cache_partitions.inc
@ -4,6 +4,8 @@
 #     $engine_type       -- storage engine to be tested
 # have to be set before sourcing this script.

+SET global query_cache_type=ON;
+SET local query_cache_type=ON;
 eval SET SESSION STORAGE_ENGINE = $engine_type;

 # Initialise
@ -124,3 +126,4 @@ show status like "Qcache_hits";
 drop table t1;

 set @@global.query_cache_size = @save_query_cache_size;
+SET global query_cache_type=default;
--- a/mysql-test/include/query_cache_sql_prepare.inc
+++ b/mysql-test/include/query_cache_sql_prepare.inc
@ -20,6 +20,8 @@
 --source include/have_query_cache.inc
 # embedded can't make more than one connection, which this test needs
 -- source include/not_embedded.inc
+set GLOBAL query_cache_type=ON;
+set LOCAL query_cache_type=ON;

 --echo ---- establish connection con1 (root) ----
 connect (con1,localhost,root,,test,$MASTER_MYPORT,);
@ -528,3 +530,4 @@ drop table t1;

 set @@global.query_cache_size=@initial_query_cache_size;
 flush status; # reset Qcache status variables for next tests
+set GLOBAL query_cache_type=default;
--- a/mysql-test/include/show_binlog_events2.inc
+++ b/mysql-test/include/show_binlog_events2.inc
@ -4,7 +4,7 @@ if ($binlog_start)
 }
 if (!$binlog_start)
 {
-  --let $_binlog_start=248
+  --let $_binlog_start=249
 }
 if ($binlog_file)
 {
--- a/mysql-test/include/show_events.inc
+++ b/mysql-test/include/show_events.inc
@ -15,7 +15,19 @@
 --let $statement=show BINLOG events
 if ($is_relay_log)
 {
-  --let $statement=show relaylog events
+  if ($master_name)
+  {
+    let _master_name='$master_name';
+  }
+  if (!$master_name)
+  {
+    let _master_name=`select @@default_master_connection`;
+    if ($_master_name)
+    {
+      let _master_name='$_master_name';
+    }
+  }
+  --let $statement=show relaylog $_master_name events
 }

 if ($binlog_file)
@ -25,7 +37,7 @@ if ($binlog_file)
  {
    if ($is_relay_log)
    {
-      --let $_binlog_file= query_get_value(SHOW SLAVE STATUS, Relay_Log_File, 1)
+      --let $_binlog_file= query_get_value(SHOW SLAVE $_master_name STATUS, Relay_Log_File, 1)
    }
    if (!$is_relay_log)
    {
--- a/mysql-test/include/show_relaylog_events.inc
+++ b/mysql-test/include/show_relaylog_events.inc
@ -1,10 +1,11 @@
 ##############################################################################
 # Show relay log events 
 #
-# Useage: 
+# Usage:
 # let $binlog_file= slave-relay-bin.000002; 
 # let $binlog_start= 106; 
 # let $binlog_limit= 1, 3; 
+# let $master_name= master1;
 # source include/show_relaylog_events.inc;
 #
 # It shows the first relay log file if $binlog_file is not given. 
--- a/mysql-test/lib/My/SafeProcess/safe_process.cc
+++ b/mysql-test/lib/My/SafeProcess/safe_process.cc
@ -148,6 +148,14 @@ extern "C" void handle_signal(int sig)
 }


+void setlimit(int what, uint soft, uint hard)
+{
+  struct rlimit lim = { soft, hard };
+  if (setrlimit (what, &lim) < 0)
+    message("setrlimit failed, errno=%d", errno);
+}
+
+
 int main(int argc, char* const argv[] )
 {
  char* const* child_argv= 0;
@ -249,13 +257,13 @@ int main(int argc, char* const argv[] )
    signal(SIGCHLD, SIG_DFL);

    if (nocore)
-    {
-      struct rlimit corelim = { 0, 0 };
-      if (setrlimit (RLIMIT_CORE, &corelim) < 0)
-      {
-        message("setrlimit failed, errno=%d", errno);
-      }
-    }
+      setlimit(RLIMIT_CORE, 0, 0);
+
+    /*
+      mysqld defaults depend on that. make test results stable and independent
+      from the environment
+    */
+    setlimit(RLIMIT_NOFILE, 1024, 1024);

    // Signal that child is ready
    buf= 37;
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@ -2579,7 +2579,9 @@ sub setup_vardir() {
  {
    $plugindir="$opt_vardir/plugins";
    mkpath($plugindir);
-    if (IS_WINDOWS && !$opt_embedded_server)
+    if (IS_WINDOWS)
+    {
+      if (!$opt_embedded_server)
      {
        for (<$bindir/storage/*$opt_vs_config/*.dll>,
             <$bindir/plugin/*$opt_vs_config/*.dll>,
@ -2590,6 +2592,7 @@ sub setup_vardir() {
          set_plugin_var($pname);
        }
      }
+    }
    else
    {
      my $opt_use_copy= 1;
@ -4430,6 +4433,22 @@ sub extract_warning_lines ($$) {
     qr|InnoDB: Setting thread \d+ nice to \d+ failed, current nice \d+, errno 13|, # setpriority() fails under valgrind
     qr|Failed to setup SSL|,
     qr|SSL error: Failed to set ciphers to use|,
+     qr/Plugin 'InnoDB' will be forced to shutdown/,
+     qr|Could not increase number of max_open_files to more than|,
+     qr/InnoDB: Error table encrypted but encryption service not available.*/,
+     qr/InnoDB: Could not find a valid tablespace file for*/,
+     qr/InnoDB: Tablespace open failed for*/,
+     qr/InnoDB: Failed to find tablespace for table*/,
+     qr/InnoDB: Space */,
+     qr|InnoDB: You may have to recover from a backup|,
+     qr|InnoDB: It is also possible that your operatingsystem has corrupted its own file cache|,
+     qr|InnoDB: and rebooting your computer removes the error|,
+     qr|InnoDB: If the corrupt page is an index page you can also try to|,
+     qr|nnoDB: fix the corruption by dumping, dropping, and reimporting|,
+     qr|InnoDB: the corrupt table. You can use CHECK|,
+     qr|InnoDB: TABLE to scan your table for corruption|,
+     qr/InnoDB: See also */
+
    );

  my $matched_lines= [];
--- a/mysql-test/r/alter_table.result
+++ b/mysql-test/r/alter_table.result
@ -1782,8 +1782,8 @@ ALTER TABLE tm1 DROP INDEX im3;
 affected rows: 2
 info: Records: 2  Duplicates: 0  Warnings: 0
 ALTER TABLE ti1 DROP COLUMN d2;
-affected rows: 2
-info: Records: 2  Duplicates: 0  Warnings: 0
+affected rows: 0
+info: Records: 0  Duplicates: 0  Warnings: 0
 ALTER TABLE tm1 DROP COLUMN d2;
 affected rows: 2
 info: Records: 2  Duplicates: 0  Warnings: 0
--- a/mysql-test/r/analyze_format_json.result
+++ b/mysql-test/r/analyze_format_json.result
@ -143,7 +143,7 @@ ANALYZE
        "attached_condition": "(tbl2.b < 60)"
      },
      "buffer_type": "flat",
-      "buffer_size": "128Kb",
+      "buffer_size": "256Kb",
      "join_type": "BNL",
      "r_filtered": 100
    }
@ -181,7 +181,7 @@ ANALYZE
        "attached_condition": "(tbl2.b < 60)"
      },
      "buffer_type": "flat",
-      "buffer_size": "128Kb",
+      "buffer_size": "256Kb",
      "join_type": "BNL",
      "attached_condition": "(tbl1.c > tbl2.c)",
      "r_filtered": 15.833
--- a/mysql-test/r/analyze_stmt_orderby.result
+++ b/mysql-test/r/analyze_stmt_orderby.result
@ -422,7 +422,7 @@ ANALYZE
            "r_filtered": 100
          },
          "buffer_type": "flat",
-          "buffer_size": "128Kb",
+          "buffer_size": "256Kb",
          "join_type": "BNL",
          "attached_condition": "(t3.a = t0.a)",
          "r_filtered": 10
@ -491,7 +491,7 @@ ANALYZE
                "r_filtered": 100
              },
              "buffer_type": "flat",
-              "buffer_size": "128Kb",
+              "buffer_size": "256Kb",
              "join_type": "BNL",
              "attached_condition": "(t5.a = t6.a)",
              "r_filtered": 21.429
@ -528,7 +528,7 @@ EXPLAIN
            "filtered": 100
          },
          "buffer_type": "flat",
-          "buffer_size": "128Kb",
+          "buffer_size": "256Kb",
          "join_type": "BNL",
          "attached_condition": "(t5.a = t6.a)"
        }
--- a/mysql-test/r/analyze_stmt_privileges.result
+++ b/mysql-test/r/analyze_stmt_privileges.result
@ -7,6 +7,7 @@ use db;
 create table t1 (i int, c varchar(8));
 insert into t1 values (1,'foo'),(2,'bar'),(3,'baz'),(4,'qux');
 create view v1 as select * from t1 where i > 1;
+CREATE USER u1@localhost;
 grant ALL on db.v1 to u1@localhost;
 connect  con1,localhost,u1,,;
 select * from db.t1;
--- a/mysql-test/r/analyze_stmt_privileges2.result
+++ b/mysql-test/r/analyze_stmt_privileges2.result
@ -1,3 +1,5 @@
+set GLOBAL sql_mode="";
+set LOCAL sql_mode="";
 CREATE DATABASE privtest_db;
 CREATE TABLE privtest_db.t1 (a INT, b VARCHAR(3)) ENGINE=MyISAM;
 CREATE TABLE privtest_db.t2 (a INT, b VARCHAR(3)) ENGINE=MyISAM;
@ -5232,3 +5234,4 @@ connection default;
 DROP USER 'privtest'@localhost;
 USE test;
 DROP DATABASE privtest_db;
+set GLOBAL sql_mode=default;
--- a/mysql-test/r/blackhole_plugin.result
+++ b/mysql-test/r/blackhole_plugin.result
@ -1,11 +1,13 @@
+set sql_mode="";
 CREATE TABLE t1(a int) ENGINE=BLACKHOLE;
 Warnings:
 Warning	1286	Unknown storage engine 'BLACKHOLE'
 Warning	1266	Using storage engine MyISAM for table 't1'
+set sql_mode=default;
 DROP TABLE t1;
 INSTALL PLUGIN blackhole SONAME 'ha_blackhole.so';
 INSTALL PLUGIN BLACKHOLE SONAME 'ha_blackhole.so';
-ERROR HY000: Function 'BLACKHOLE' already exists
+ERROR HY000: Plugin 'BLACKHOLE' already installed
 UNINSTALL PLUGIN blackhole;
 INSTALL PLUGIN blackhole SONAME 'ha_blackhole.so';
 CREATE TABLE t1(a int) ENGINE=BLACKHOLE;
--- a/mysql-test/r/cache_innodb.result
+++ b/mysql-test/r/cache_innodb.result
@ -1,3 +1,5 @@
+SET global query_cache_type=ON;
+SET local query_cache_type=ON;
 SET SESSION STORAGE_ENGINE = InnoDB;
 drop table if exists t1,t2,t3;
 set @save_query_cache_size = @@global.query_cache_size;
@ -221,6 +223,7 @@ Variable_name	Value
 Qcache_hits	1
 set @@global.query_cache_size = @save_query_cache_size;
 drop table t2;
+SET global query_cache_type=default;
 CREATE TABLE t1 (a INT) ENGINE=InnoDB;
 BEGIN;
 INSERT INTO t1 VALUES(1);
--- a/mysql-test/r/change_user.result
+++ b/mysql-test/r/change_user.result
@ -1,6 +1,10 @@
+set global secure_auth=0;
+create user test_nopw;
 grant select on test.* to test_nopw;
-grant select on test.* to test_oldpw identified by password "09301740536db389";
-grant select on test.* to test_newpw identified by "newpw";
+create user test_oldpw identified by password "09301740536db389";
+grant select on test.* to test_oldpw;
+create user test_newpw identified by "newpw";
+grant select on test.* to test_newpw;
 select concat('<', user(), '>'), concat('<', current_user(), '>'), database();
 concat('<', user(), '>')	concat('<', current_user(), '>')	database()
 <root@localhost>	<root@localhost>	test
@ -85,3 +89,4 @@ IS_USED_LOCK('bug31418')
 NULL
 FLUSH STATUS;
 Value of com_select did not change
+set global secure_auth=default;
--- a/mysql-test/r/compound.result
+++ b/mysql-test/r/compound.result
@ -155,7 +155,7 @@ drop function fn|
 drop table t1|
 begin not atomic select @@sql_mode; end|
@@sql_mode
-
+NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION
 create table t1 (a int)|
 select a from t1 having a > 1|
 a
--- a/mysql-test/r/concurrent_innodb_safelog.result
+++ b/mysql-test/r/concurrent_innodb_safelog.result
@ -1,4 +1,5 @@
 SET GLOBAL TRANSACTION ISOLATION LEVEL REPEATABLE READ;
+SET SQL_MODE="";
 SELECT @@global.tx_isolation;
@@global.tx_isolation
 REPEATABLE-READ
@ -790,3 +791,4 @@ eta	tipo	c
 ** connection default
 drop table t1;
 drop user mysqltest@localhost;
+SET SQL_MODE=default;
--- a/mysql-test/r/concurrent_innodb_unsafelog.result
+++ b/mysql-test/r/concurrent_innodb_unsafelog.result
@ -1,4 +1,5 @@
 SET GLOBAL TRANSACTION ISOLATION LEVEL REPEATABLE READ;
+SET SQL_MODE="";
 SELECT @@global.tx_isolation;
@@global.tx_isolation
 REPEATABLE-READ
@ -786,3 +787,4 @@ eta	tipo	c
 ** connection default
 drop table t1;
 drop user mysqltest@localhost;
+SET SQL_MODE=default;
--- a/mysql-test/r/connect.result
+++ b/mysql-test/r/connect.result
@ -1,3 +1,4 @@
+SET global secure_auth=0;
 drop table if exists t1,t2;
 show tables;
 Tables_in_mysql
@ -143,6 +144,7 @@ drop table t1;
 # -- Bug#33507: Event scheduler creates more threads than max_connections
 # -- which results in user lockout.

+CREATE USER mysqltest_u1@localhost;
 GRANT USAGE ON *.* TO mysqltest_u1@localhost;

 SET GLOBAL max_connections = 3;
@ -313,3 +315,4 @@ test
 test
 test
 drop procedure p1;
+SET global secure_auth=default;
--- a/mysql-test/r/create_drop_binlog.result
+++ b/mysql-test/r/create_drop_binlog.result
@ -187,11 +187,11 @@ DROP ROLE r1;
 CREATE ROLE IF NOT EXISTS r1;
 CREATE ROLE IF NOT EXISTS r1;
 Warnings:
-Note	1974	Can't create role 'r1'; it already exists
+Note	1975	Can't create role 'r1'; it already exists
 DROP ROLE IF EXISTS r1;
 DROP ROLE IF EXISTS r1;
 Warnings:
-Note	1975	Can't drop role 'r1'; it doesn't exist
+Note	1976	Can't drop role 'r1'; it doesn't exist
 SHOW BINLOG EVENTS;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 #	#	Format_desc	1	#	VER
@ -218,11 +218,11 @@ DROP USER u1@localhost;
 CREATE USER IF NOT EXISTS u1@localhost;
 CREATE USER IF NOT EXISTS u1@localhost;
 Warnings:
-Note	1972	Can't create user 'u1'@'localhost'; it already exists
+Note	1973	Can't create user 'u1'@'localhost'; it already exists
 DROP USER IF EXISTS u1@localhost;
 DROP USER IF EXISTS u1@localhost;
 Warnings:
-Note	1973	Can't drop user 'u1'@'localhost'; it doesn't exist
+Note	1974	Can't drop user 'u1'@'localhost'; it doesn't exist
 SHOW BINLOG EVENTS;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 #	#	Format_desc	1	#	VER
@ -336,12 +336,12 @@ RESET MASTER;
 RESET MASTER;
 SHOW MASTER STATUS;
 File	Position	Binlog_Do_DB	Binlog_Ignore_DB
-master-bin.000001	313		
+master-bin.000001	<pos>		
 RESET MASTER TO 100;
 SHOW MASTER STATUS;
 File	Position	Binlog_Do_DB	Binlog_Ignore_DB
-master-bin.000100	313		
+master-bin.000100	<pos>		
 RESET MASTER;
 SHOW MASTER STATUS;
 File	Position	Binlog_Do_DB	Binlog_Ignore_DB
-master-bin.000001	313		
+master-bin.000001	<pos>		
--- a/mysql-test/r/create_drop_function.result
+++ b/mysql-test/r/create_drop_function.result
@ -4,7 +4,7 @@ RETURNS CHAR(100)
 RETURN CONCAT('Hello, ', str, '!');
 SELECT * FROM mysql.proc WHERE name like 'f1';
 db	name	type	specific_name	language	sql_data_access	is_deterministic	security_type	param_list	returns	body	definer	created	modified	sql_mode	comment	character_set_client	collation_connection	db_collation	body_utf8
-test	f1	FUNCTION	f1	SQL	CONTAINS_SQL	NO	DEFINER	str char(20)	char(100) CHARSET latin1	RETURN CONCAT('Hello, ', str, '!')	root@localhost	2014-09-30 08:00:00	2014-09-30 08:00:00			latin1	latin1_swedish_ci	latin1_swedish_ci	RETURN CONCAT('Hello, ', str, '!')
+test	f1	FUNCTION	f1	SQL	CONTAINS_SQL	NO	DEFINER	str char(20)	char(100) CHARSET latin1	RETURN CONCAT('Hello, ', str, '!')	root@localhost	2014-09-30 08:00:00	2014-09-30 08:00:00	NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION		latin1	latin1_swedish_ci	latin1_swedish_ci	RETURN CONCAT('Hello, ', str, '!')
 SELECT f1('world');
 f1('world')
 Hello, world!
--- a/mysql-test/r/create_drop_role.result
+++ b/mysql-test/r/create_drop_role.result
@ -20,7 +20,7 @@ Host	User	Role	Admin_option
 CREATE ROLE IF NOT EXISTS role1 WITH ADMIN user4;
 Warnings:
 Note	1449	The user specified as a definer ('user4'@'%') does not exist
-Note	1974	Can't create role 'role1'; it already exists
+Note	1975	Can't create role 'role1'; it already exists
 SELECT * FROM mysql.roles_mapping WHERE Role='role1';
 Host	User	Role	Admin_option
 %	user3	role1	Y
@ -29,11 +29,11 @@ SELECT * FROM mysql.roles_mapping WHERE Role='role1';
 Host	User	Role	Admin_option
 DROP ROLE IF EXISTS role1;
 Warnings:
-Note	1975	Can't drop role 'role1'; it doesn't exist
+Note	1976	Can't drop role 'role1'; it doesn't exist
 CREATE ROLE role_1;
 CREATE ROLE IF NOT EXISTS role_1;
 Warnings:
-Note	1974	Can't create role 'role_1'; it already exists
+Note	1975	Can't create role 'role_1'; it already exists
 CREATE OR REPLACE ROLE role_1;
 CREATE OR REPLACE ROLE IF NOT EXISTS role_1;
 ERROR HY000: Incorrect usage of OR REPLACE and IF NOT EXISTS
@ -69,7 +69,7 @@ SET ROLE NONE;
 DROP ROLE role_1;
 DROP ROLE IF EXISTS role_1;
 Warnings:
-Note	1975	Can't drop role 'role_1'; it doesn't exist
+Note	1976	Can't drop role 'role_1'; it doesn't exist
 DROP ROLE role_1;
 ERROR HY000: Operation DROP ROLE failed for 'role_1'
 DROP USER u1@localhost;
--- a/mysql-test/r/create_drop_user.result
+++ b/mysql-test/r/create_drop_user.result
@ -4,7 +4,7 @@ password
 *2B602296A79E0A8784ACC5C88D92E46588CCA3C3
 CREATE USER IF NOT EXISTS u1@localhost IDENTIFIED BY 'pw2';
 Warnings:
-Note	1972	Can't create user 'u1'@'localhost'; it already exists
+Note	1973	Can't create user 'u1'@'localhost'; it already exists
 SELECT password FROM mysql.user WHERE user='u1';
 password
 *2B602296A79E0A8784ACC5C88D92E46588CCA3C3
@ -20,7 +20,7 @@ password
 DROP USER IF EXISTS u1@localhost;
 DROP USER IF EXISTS u1@localhost;
 Warnings:
-Note	1973	Can't drop user 'u1'@'localhost'; it doesn't exist
+Note	1974	Can't drop user 'u1'@'localhost'; it doesn't exist
 DROP USER u1@localhost;
 ERROR HY000: Operation DROP USER failed for 'u1'@'localhost'
 CREATE OR REPLACE USER u1@localhost;
@ -38,6 +38,6 @@ CREATE OR REPLACE USER u1 IDENTIFIED BY PASSWORD 'abcdefghijklmnop', u2;
 DROP USER u1;
 DROP USER IF EXISTS u1, u2;
 Warnings:
-Note	1973	Can't drop user 'u1'@'%'; it doesn't exist
+Note	1974	Can't drop user 'u1'@'%'; it doesn't exist
 DROP USER u2;
 ERROR HY000: Operation DROP USER failed for 'u2'@'%'
--- a/mysql-test/r/create_or_replace_permission.result
+++ b/mysql-test/r/create_or_replace_permission.result
@ -1,3 +1,5 @@
+set local sql_mode="";
+set global sql_mode="";
 #
 # Tests for checking permission denied on CREATE OR REPLACE if DROP
 # access is revoked
@ -48,3 +50,4 @@ Warnings:
 Note	1008	Can't drop database 'db2'; database doesn't exist
 DROP DATABASE db1;
 DROP USER mysqltest_1@localhost;
+set global sql_mode=default;
--- a/mysql-test/r/ctype_big5.result
+++ b/mysql-test/r/ctype_big5.result
@ -512,7 +512,7 @@ select hex(convert(_big5 0xC84041 using ucs2));
 hex(convert(_big5 0xC84041 using ucs2))
 003F0041
 Warnings:
-Warning	1976	Cannot convert 'big5' character 0xC840 to 'ucs2'
+Warning	1977	Cannot convert 'big5' character 0xC840 to 'ucs2'
 End of 4.1 tests
 set names big5;
 create table t1 (a blob);
@ -789,70 +789,70 @@ A2C0	Ⅷ
 A2C1	Ⅸ
 A2C2	Ⅹ
 Warnings:
-Warning	1976	Cannot convert 'big5' character 0xA3C0 to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3C0 to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3C1 to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3C1 to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3C2 to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3C2 to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3C3 to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3C3 to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3C4 to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3C4 to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3C5 to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3C5 to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3C6 to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3C6 to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3C7 to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3C7 to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3C8 to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3C8 to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3C9 to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3C9 to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3CA to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3CA to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3CB to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3CB to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3CC to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3CC to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3CD to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3CD to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3CE to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3CE to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3CF to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3CF to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3D0 to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3D0 to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3D1 to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3D1 to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3D2 to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3D2 to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3D3 to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3D3 to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3D4 to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3D4 to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3D5 to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3D5 to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3D6 to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3D6 to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3D7 to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3D7 to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3D8 to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3D8 to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3D9 to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3D9 to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3DA to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3DA to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3DB to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3DB to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3DC to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3DC to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3DD to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3DD to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3DE to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3DE to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3DF to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3DF to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3C0 to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3C0 to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3C1 to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3C1 to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3C2 to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3C2 to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3C3 to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3C3 to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3C4 to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3C4 to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3C5 to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3C5 to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3C6 to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3C6 to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3C7 to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3C7 to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3C8 to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3C8 to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3C9 to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3C9 to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3CA to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3CA to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3CB to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3CB to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3CC to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3CC to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3CD to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3CD to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3CE to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3CE to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3CF to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3CF to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3D0 to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3D0 to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3D1 to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3D1 to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3D2 to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3D2 to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3D3 to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3D3 to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3D4 to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3D4 to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3D5 to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3D5 to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3D6 to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3D6 to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3D7 to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3D7 to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3D8 to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3D8 to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3D9 to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3D9 to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3DA to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3DA to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3DB to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3DB to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3DC to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3DC to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3DD to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3DD to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3DE to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3DE to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3DF to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3DF to 'utf8'
 SELECT * FROM t1
 WHERE HEX(CAST(UPPER(a) AS CHAR CHARACTER SET utf8)) <>
 HEX(UPPER(CAST(a AS CHAR CHARACTER SET utf8))) ORDER BY code;
@ -868,70 +868,70 @@ C7D9	р
 C7DA	с
 C7DB	т
 Warnings:
-Warning	1976	Cannot convert 'big5' character 0xA3C0 to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3C0 to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3C1 to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3C1 to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3C2 to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3C2 to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3C3 to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3C3 to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3C4 to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3C4 to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3C5 to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3C5 to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3C6 to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3C6 to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3C7 to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3C7 to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3C8 to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3C8 to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3C9 to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3C9 to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3CA to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3CA to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3CB to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3CB to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3CC to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3CC to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3CD to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3CD to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3CE to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3CE to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3CF to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3CF to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3D0 to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3D0 to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3D1 to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3D1 to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3D2 to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3D2 to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3D3 to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3D3 to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3D4 to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3D4 to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3D5 to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3D5 to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3D6 to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3D6 to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3D7 to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3D7 to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3D8 to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3D8 to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3D9 to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3D9 to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3DA to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3DA to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3DB to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3DB to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3DC to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3DC to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3DD to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3DD to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3DE to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3DE to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3DF to 'utf8'
-Warning	1976	Cannot convert 'big5' character 0xA3DF to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3C0 to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3C0 to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3C1 to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3C1 to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3C2 to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3C2 to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3C3 to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3C3 to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3C4 to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3C4 to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3C5 to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3C5 to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3C6 to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3C6 to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3C7 to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3C7 to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3C8 to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3C8 to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3C9 to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3C9 to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3CA to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3CA to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3CB to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3CB to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3CC to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3CC to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3CD to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3CD to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3CE to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3CE to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3CF to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3CF to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3D0 to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3D0 to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3D1 to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3D1 to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3D2 to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3D2 to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3D3 to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3D3 to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3D4 to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3D4 to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3D5 to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3D5 to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3D6 to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3D6 to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3D7 to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3D7 to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3D8 to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3D8 to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3D9 to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3D9 to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3DA to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3DA to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3DB to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3DB to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3DC to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3DC to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3DD to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3DD to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3DE to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3DE to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3DF to 'utf8'
+Warning	1977	Cannot convert 'big5' character 0xA3DF to 'utf8'
 DROP TABLE t1;
 #
 # End of 5.5 tests
--- a/mysql-test/r/ctype_cp1251.result
+++ b/mysql-test/r/ctype_cp1251.result
@ -386,7 +386,7 @@ FD	FD	FD	D18D	FD
 FE	FE	FE	D18E	FE	
 FF	FF	FF	D18F	FF	
 Warnings:
-Warning	1976	Cannot convert 'cp1251' character 0x98 to 'utf8'
+Warning	1977	Cannot convert 'cp1251' character 0x98 to 'utf8'
 DROP TABLE t1;
 set global LC_TIME_NAMES=convert((-8388608) using cp1251);
 ERROR HY000: Unknown locale: '-8388608'
@ -3363,5 +3363,31 @@ Warnings:
 Note	1003	select `test`.`t1`.`a` AS `a` from `test`.`t1` where ((`test`.`t1`.`a` = ' 1') and (`test`.`t1`.`a` in (1,2,3,'x')))
 DROP TABLE t1;
 #
+# MDEV-8671 Wrong result for SELECT..WHERE varchar_column=' 1' AND (varchar_column XOR '1')
+#
+CREATE TABLE t1 (a VARCHAR(10) CHARACTER SET cp1251 COLLATE cp1251_ukrainian_ci);
+INSERT INTO t1 VALUES (' 1'),('`1');
+SELECT * FROM t1 WHERE a=' 1';
+a
+ 1
+`1
+SELECT * FROM t1 WHERE (a XOR '0');
+a
+ 1
+Warnings:
+Warning	1292	Truncated incorrect INTEGER value: '`1'
+SELECT * FROM t1 WHERE a=' 1' AND (a XOR '0');
+a
+ 1
+Warnings:
+Warning	1292	Truncated incorrect INTEGER value: '`1'
+# ' 1' should not be propagated into (a XIR '0')
+EXPLAIN EXTENDED SELECT * FROM t1 WHERE a=' 1' AND (a XOR '0');
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	2	100.00	Using where
+Warnings:
+Note	1003	select `test`.`t1`.`a` AS `a` from `test`.`t1` where ((`test`.`t1`.`a` = ' 1') and (`test`.`t1`.`a` xor '0'))
+DROP TABLE t1;
+#
 # End of 10.1 tests
 #
--- a/mysql-test/r/ctype_cp932_binlog_stm.result
+++ b/mysql-test/r/ctype_cp932_binlog_stm.result
@ -387,139 +387,139 @@ HEX(LOWER(CAST(a AS CHAR CHARACTER SET utf8))) ORDER BY code;
 code	a
 81F0	Å
 Warnings:
-Warning	1976	Cannot convert 'cp932' character 0x81AD to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81AD to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81AE to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81AE to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81AF to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81AF to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81B0 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81B0 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81B1 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81B1 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81B2 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81B2 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81B3 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81B3 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81B4 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81B4 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81B5 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81B5 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81B6 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81B6 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81B7 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81B7 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81C0 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81C0 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81C1 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81C1 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81C2 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81C2 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81C3 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81C3 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81C4 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81C4 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81C5 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81C5 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81C6 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81C6 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81C7 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81C7 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81CF to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81CF to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81D0 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81D0 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81D1 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81D1 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81D2 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81D2 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81D3 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81D3 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81D4 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81D4 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81D5 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81D5 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81D6 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81D6 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81D7 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81D7 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81D8 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81D8 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81D9 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81D9 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81E9 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81E9 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81EA to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81EA to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81AD to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81AD to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81AE to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81AE to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81AF to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81AF to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81B0 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81B0 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81B1 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81B1 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81B2 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81B2 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81B3 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81B3 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81B4 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81B4 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81B5 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81B5 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81B6 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81B6 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81B7 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81B7 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81C0 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81C0 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81C1 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81C1 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81C2 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81C2 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81C3 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81C3 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81C4 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81C4 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81C5 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81C5 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81C6 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81C6 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81C7 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81C7 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81CF to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81CF to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81D0 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81D0 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81D1 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81D1 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81D2 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81D2 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81D3 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81D3 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81D4 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81D4 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81D5 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81D5 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81D6 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81D6 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81D7 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81D7 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81D8 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81D8 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81D9 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81D9 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81E9 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81E9 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81EA to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81EA to 'utf8'
 SELECT * FROM t1
 WHERE HEX(CAST(UPPER(a) AS CHAR CHARACTER SET utf8)) <>
 HEX(UPPER(CAST(a AS CHAR CHARACTER SET utf8))) ORDER BY code;
 code	a
 Warnings:
-Warning	1976	Cannot convert 'cp932' character 0x81AD to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81AD to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81AE to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81AE to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81AF to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81AF to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81B0 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81B0 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81B1 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81B1 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81B2 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81B2 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81B3 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81B3 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81B4 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81B4 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81B5 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81B5 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81B6 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81B6 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81B7 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81B7 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81C0 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81C0 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81C1 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81C1 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81C2 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81C2 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81C3 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81C3 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81C4 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81C4 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81C5 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81C5 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81C6 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81C6 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81C7 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81C7 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81CF to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81CF to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81D0 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81D0 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81D1 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81D1 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81D2 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81D2 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81D3 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81D3 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81D4 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81D4 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81D5 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81D5 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81D6 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81D6 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81D7 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81D7 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81D8 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81D8 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81D9 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81D9 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81E9 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81E9 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81EA to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81EA to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81AD to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81AD to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81AE to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81AE to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81AF to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81AF to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81B0 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81B0 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81B1 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81B1 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81B2 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81B2 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81B3 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81B3 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81B4 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81B4 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81B5 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81B5 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81B6 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81B6 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81B7 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81B7 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81C0 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81C0 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81C1 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81C1 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81C2 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81C2 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81C3 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81C3 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81C4 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81C4 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81C5 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81C5 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81C6 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81C6 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81C7 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81C7 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81CF to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81CF to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81D0 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81D0 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81D1 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81D1 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81D2 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81D2 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81D3 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81D3 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81D4 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81D4 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81D5 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81D5 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81D6 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81D6 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81D7 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81D7 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81D8 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81D8 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81D9 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81D9 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81E9 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81E9 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81EA to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81EA to 'utf8'
 #
 # WL#3090 Japanese Character Set adjustments
 # Test cp932->Unicode conversion
@ -10195,70 +10195,70 @@ FC49	EFA8AD
 FC4A	E9B899
 FC4B	E9BB91
 Warnings:
-Warning	1976	Cannot convert 'cp932' character 0x81AD to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81AE to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81AF to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81B0 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81B1 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81B2 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81B3 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81B4 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81B5 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81B6 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81B7 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81C0 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81C1 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81C2 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81C3 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81C4 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81C5 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81C6 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81C7 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81CF to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81D0 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81D1 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81D2 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81D3 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81D4 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81D5 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81D6 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81D7 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81D8 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81D9 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81E9 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81EA to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81EB to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81EC to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81ED to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81EE to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81EF to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81F8 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81F9 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81FA to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x81FB to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x8240 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x8241 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x8242 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x8243 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x8244 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x8245 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x8246 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x8247 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x8248 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x8249 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x824A to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x824B to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x824C to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x824D to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x824E to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x8259 to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x825A to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x825B to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x825C to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x825D to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x825E to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x825F to 'utf8'
-Warning	1976	Cannot convert 'cp932' character 0x827A to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81AD to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81AE to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81AF to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81B0 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81B1 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81B2 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81B3 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81B4 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81B5 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81B6 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81B7 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81C0 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81C1 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81C2 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81C3 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81C4 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81C5 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81C6 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81C7 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81CF to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81D0 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81D1 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81D2 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81D3 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81D4 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81D5 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81D6 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81D7 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81D8 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81D9 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81E9 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81EA to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81EB to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81EC to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81ED to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81EE to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81EF to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81F8 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81F9 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81FA to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x81FB to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x8240 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x8241 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x8242 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x8243 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x8244 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x8245 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x8246 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x8247 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x8248 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x8249 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x824A to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x824B to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x824C to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x824D to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x824E to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x8259 to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x825A to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x825B to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x825C to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x825D to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x825E to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x825F to 'utf8'
+Warning	1977	Cannot convert 'cp932' character 0x827A to 'utf8'
 DROP TABLE t1;
 #
 # WL#3090 Japanese Character Set adjustments
--- a/mysql-test/r/ctype_eucjpms.result
+++ b/mysql-test/r/ctype_eucjpms.result
@ -10017,12 +10017,12 @@ select hex(convert(_eucjpms 0xA5FE41 using ucs2));
 hex(convert(_eucjpms 0xA5FE41 using ucs2))
 003F0041
 Warnings:
-Warning	1976	Cannot convert 'eucjpms' character 0xA5FE to 'ucs2'
+Warning	1977	Cannot convert 'eucjpms' character 0xA5FE to 'ucs2'
 select hex(convert(_eucjpms 0x8FABF841 using ucs2));
 hex(convert(_eucjpms 0x8FABF841 using ucs2))
 003F0041
 Warnings:
-Warning	1976	Cannot convert 'eucjpms' character 0x8FABF8 to 'ucs2'
+Warning	1977	Cannot convert 'eucjpms' character 0x8FABF8 to 'ucs2'
 set global LC_TIME_NAMES=convert((convert((0x63) using eucjpms)) using utf8);
 ERROR HY000: Unknown locale: 'c'
 #
@ -10589,70 +10589,70 @@ HEX(LOWER(CAST(a AS CHAR CHARACTER SET utf8))) ORDER BY code;
 code	a
 8FAABC	Ģ
 Warnings:
-Warning	1976	Cannot convert 'eucjpms' character 0xA2AF to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2AF to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2B0 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2B0 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2B1 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2B1 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2B2 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2B2 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2B3 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2B3 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2B4 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2B4 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2B5 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2B5 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2B6 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2B6 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2B7 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2B7 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2B8 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2B8 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2B9 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2B9 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2C2 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2C2 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2C3 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2C3 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2C4 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2C4 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2C5 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2C5 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2C6 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2C6 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2C7 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2C7 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2C8 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2C8 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2C9 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2C9 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2D1 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2D1 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2D2 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2D2 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2D3 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2D3 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2D4 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2D4 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2D5 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2D5 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2D6 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2D6 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2D7 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2D7 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2D8 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2D8 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2D9 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2D9 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2DA to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2DA to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2DB to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2DB to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2EB to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2EB to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2EC to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2EC to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2AF to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2AF to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B0 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B0 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B1 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B1 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B2 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B2 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B3 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B3 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B4 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B4 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B5 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B5 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B6 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B6 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B7 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B7 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B8 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B8 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B9 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B9 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2C2 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2C2 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2C3 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2C3 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2C4 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2C4 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2C5 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2C5 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2C6 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2C6 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2C7 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2C7 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2C8 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2C8 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2C9 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2C9 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D1 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D1 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D2 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D2 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D3 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D3 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D4 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D4 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D5 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D5 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D6 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D6 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D7 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D7 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D8 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D8 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D9 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D9 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2DA to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2DA to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2DB to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2DB to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2EB to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2EB to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2EC to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2EC to 'utf8'
 SELECT * FROM t1
 WHERE HEX(CAST(UPPER(a) AS CHAR CHARACTER SET utf8)) <>
 HEX(UPPER(CAST(a AS CHAR CHARACTER SET utf8))) ORDER BY code;
@ -10660,70 +10660,70 @@ code	a
 8FA9C3	ð
 8FABB9	ǵ
 Warnings:
-Warning	1976	Cannot convert 'eucjpms' character 0xA2AF to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2AF to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2B0 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2B0 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2B1 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2B1 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2B2 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2B2 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2B3 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2B3 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2B4 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2B4 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2B5 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2B5 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2B6 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2B6 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2B7 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2B7 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2B8 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2B8 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2B9 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2B9 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2C2 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2C2 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2C3 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2C3 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2C4 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2C4 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2C5 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2C5 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2C6 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2C6 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2C7 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2C7 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2C8 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2C8 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2C9 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2C9 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2D1 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2D1 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2D2 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2D2 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2D3 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2D3 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2D4 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2D4 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2D5 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2D5 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2D6 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2D6 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2D7 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2D7 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2D8 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2D8 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2D9 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2D9 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2DA to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2DA to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2DB to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2DB to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2EB to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2EB to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2EC to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2EC to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2AF to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2AF to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B0 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B0 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B1 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B1 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B2 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B2 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B3 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B3 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B4 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B4 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B5 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B5 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B6 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B6 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B7 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B7 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B8 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B8 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B9 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B9 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2C2 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2C2 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2C3 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2C3 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2C4 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2C4 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2C5 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2C5 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2C6 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2C6 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2C7 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2C7 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2C8 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2C8 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2C9 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2C9 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D1 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D1 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D2 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D2 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D3 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D3 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D4 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D4 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D5 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D5 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D6 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D6 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D7 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D7 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D8 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D8 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D9 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D9 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2DA to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2DA to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2DB to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2DB to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2EB to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2EB to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2EC to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2EC to 'utf8'
 #
 # WL#3090 Japanese Character Set adjustments
 # Test sjis->Unicode conversion
@ -25810,70 +25810,70 @@ FEFC	EE8EA9
 FEFD	EE8EAA
 FEFE	EE8EAB
 Warnings:
-Warning	1976	Cannot convert 'eucjpms' character 0xA2AF to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2B0 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2B1 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2B2 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2B3 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2B4 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2B5 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2B6 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2B7 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2B8 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2B9 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2C2 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2C3 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2C4 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2C5 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2C6 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2C7 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2C8 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2C9 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2D1 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2D2 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2D3 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2D4 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2D5 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2D6 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2D7 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2D8 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2D9 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2DA to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2DB to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2EB to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2EC to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2ED to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2EE to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2EF to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2F0 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2F1 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2FA to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2FB to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2FC to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA2FD to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA3A1 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA3A2 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA3A3 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA3A4 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA3A5 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA3A6 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA3A7 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA3A8 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA3A9 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA3AA to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA3AB to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA3AC to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA3AD to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA3AE to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA3AF to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA3BA to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA3BB to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA3BC to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA3BD to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA3BE to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA3BF to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA3C0 to 'utf8'
-Warning	1976	Cannot convert 'eucjpms' character 0xA3DB to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2AF to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B0 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B1 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B2 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B3 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B4 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B5 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B6 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B7 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B8 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2B9 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2C2 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2C3 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2C4 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2C5 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2C6 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2C7 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2C8 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2C9 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D1 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D2 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D3 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D4 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D5 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D6 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D7 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D8 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2D9 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2DA to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2DB to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2EB to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2EC to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2ED to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2EE to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2EF to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2F0 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2F1 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2FA to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2FB to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2FC to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA2FD to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA3A1 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA3A2 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA3A3 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA3A4 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA3A5 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA3A6 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA3A7 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA3A8 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA3A9 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA3AA to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA3AB to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA3AC to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA3AD to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA3AE to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA3AF to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA3BA to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA3BB to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA3BC to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA3BD to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA3BE to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA3BF to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA3C0 to 'utf8'
+Warning	1977	Cannot convert 'eucjpms' character 0xA3DB to 'utf8'
 DROP TABLE t1;
 #
 # WL#3090 Japanese Character Set adjustments
--- a/mysql-test/r/ctype_euckr.result
+++ b/mysql-test/r/ctype_euckr.result
@ -24737,70 +24737,70 @@ HEX(LOWER(CAST(a AS CHAR CHARACTER SET utf8))) ORDER BY code;
 code	a
 A1CA	Å
 Warnings:
-Warning	1976	Cannot convert 'euckr' character 0xA2E8 to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2E8 to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2E9 to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2E9 to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2EA to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2EA to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2EB to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2EB to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2EC to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2EC to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2ED to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2ED to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2EE to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2EE to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2EF to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2EF to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2F0 to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2F0 to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2F1 to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2F1 to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2F2 to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2F2 to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2F3 to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2F3 to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2F4 to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2F4 to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2F5 to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2F5 to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2F6 to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2F6 to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2F7 to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2F7 to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2F8 to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2F8 to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2F9 to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2F9 to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2FA to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2FA to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2FB to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2FB to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2FC to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2FC to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2FD to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2FD to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2FE to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2FE to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA5AB to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA5AB to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA5AC to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA5AC to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA5AD to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA5AD to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA5AE to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA5AE to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA5AF to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA5AF to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA5BA to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA5BA to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA5BB to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA5BB to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA5BC to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA5BC to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA5BD to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA5BD to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2E8 to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2E8 to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2E9 to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2E9 to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2EA to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2EA to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2EB to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2EB to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2EC to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2EC to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2ED to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2ED to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2EE to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2EE to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2EF to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2EF to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2F0 to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2F0 to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2F1 to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2F1 to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2F2 to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2F2 to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2F3 to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2F3 to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2F4 to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2F4 to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2F5 to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2F5 to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2F6 to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2F6 to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2F7 to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2F7 to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2F8 to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2F8 to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2F9 to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2F9 to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2FA to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2FA to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2FB to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2FB to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2FC to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2FC to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2FD to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2FD to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2FE to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2FE to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA5AB to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA5AB to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA5AC to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA5AC to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA5AD to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA5AD to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA5AE to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA5AE to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA5AF to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA5AF to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA5BA to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA5BA to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA5BB to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA5BB to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA5BC to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA5BC to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA5BD to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA5BD to 'utf8'
 SELECT * FROM t1
 WHERE HEX(CAST(UPPER(a) AS CHAR CHARACTER SET utf8)) <>
 HEX(UPPER(CAST(a AS CHAR CHARACTER SET utf8))) ORDER BY code;
@ -24833,70 +24833,70 @@ A8E5	ⓨ
 A8E6	ⓩ
 A9A2	đ
 Warnings:
-Warning	1976	Cannot convert 'euckr' character 0xA2E8 to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2E8 to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2E9 to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2E9 to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2EA to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2EA to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2EB to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2EB to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2EC to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2EC to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2ED to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2ED to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2EE to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2EE to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2EF to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2EF to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2F0 to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2F0 to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2F1 to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2F1 to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2F2 to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2F2 to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2F3 to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2F3 to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2F4 to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2F4 to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2F5 to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2F5 to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2F6 to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2F6 to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2F7 to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2F7 to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2F8 to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2F8 to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2F9 to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2F9 to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2FA to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2FA to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2FB to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2FB to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2FC to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2FC to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2FD to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2FD to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2FE to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA2FE to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA5AB to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA5AB to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA5AC to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA5AC to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA5AD to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA5AD to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA5AE to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA5AE to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA5AF to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA5AF to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA5BA to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA5BA to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA5BB to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA5BB to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA5BC to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA5BC to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA5BD to 'utf8'
-Warning	1976	Cannot convert 'euckr' character 0xA5BD to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2E8 to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2E8 to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2E9 to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2E9 to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2EA to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2EA to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2EB to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2EB to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2EC to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2EC to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2ED to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2ED to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2EE to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2EE to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2EF to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2EF to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2F0 to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2F0 to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2F1 to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2F1 to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2F2 to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2F2 to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2F3 to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2F3 to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2F4 to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2F4 to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2F5 to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2F5 to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2F6 to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2F6 to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2F7 to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2F7 to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2F8 to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2F8 to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2F9 to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2F9 to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2FA to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2FA to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2FB to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2FB to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2FC to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2FC to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2FD to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2FD to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2FE to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA2FE to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA5AB to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA5AB to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA5AC to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA5AC to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA5AD to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA5AD to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA5AE to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA5AE to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA5AF to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA5AF to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA5BA to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA5BA to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA5BB to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA5BB to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA5BC to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA5BC to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA5BD to 'utf8'
+Warning	1977	Cannot convert 'euckr' character 0xA5BD to 'utf8'
 DROP TABLE t1;
 #
 # End of 5.5 tests
--- a/mysql-test/r/ctype_gb2312.result
+++ b/mysql-test/r/ctype_gb2312.result
@ -765,70 +765,70 @@ A2FA	Ⅹ
 A2FB	Ⅺ
 A2FC	Ⅻ
 Warnings:
-Warning	1976	Cannot convert 'gb2312' character 0xA2A1 to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA2A1 to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA2A2 to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA2A2 to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA2A3 to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA2A3 to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA2A4 to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA2A4 to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA2A5 to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA2A5 to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA2A6 to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA2A6 to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA2A7 to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA2A7 to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA2A8 to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA2A8 to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA2A9 to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA2A9 to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA2AA to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA2AA to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA2AB to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA2AB to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA2AC to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA2AC to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA2AD to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA2AD to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA2AE to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA2AE to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA2AF to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA2AF to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA2B0 to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA2B0 to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA2E3 to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA2E3 to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA2E4 to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA2E4 to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA2EF to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA2EF to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA2F0 to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA2F0 to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA2FD to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA2FD to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA2FE to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA2FE to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA4F4 to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA4F4 to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA4F5 to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA4F5 to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA4F6 to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA4F6 to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA4F7 to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA4F7 to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA4F8 to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA4F8 to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA4F9 to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA4F9 to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA4FA to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA4FA to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA4FB to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA4FB to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA4FC to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA4FC to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA4FD to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA4FD to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2A1 to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2A1 to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2A2 to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2A2 to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2A3 to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2A3 to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2A4 to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2A4 to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2A5 to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2A5 to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2A6 to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2A6 to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2A7 to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2A7 to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2A8 to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2A8 to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2A9 to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2A9 to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2AA to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2AA to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2AB to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2AB to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2AC to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2AC to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2AD to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2AD to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2AE to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2AE to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2AF to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2AF to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2B0 to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2B0 to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2E3 to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2E3 to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2E4 to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2E4 to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2EF to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2EF to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2F0 to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2F0 to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2FD to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2FD to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2FE to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2FE to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA4F4 to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA4F4 to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA4F5 to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA4F5 to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA4F6 to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA4F6 to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA4F7 to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA4F7 to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA4F8 to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA4F8 to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA4F9 to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA4F9 to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA4FA to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA4FA to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA4FB to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA4FB to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA4FC to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA4FC to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA4FD to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA4FD to 'utf8'
 SELECT * FROM t1
 WHERE HEX(CAST(UPPER(a) AS CHAR CHARACTER SET utf8)) <>
 HEX(UPPER(CAST(a AS CHAR CHARACTER SET utf8))) ORDER BY code;
@ -860,70 +860,70 @@ A8B8	ǜ
 A8B9	ü
 A8BA	ê
 Warnings:
-Warning	1976	Cannot convert 'gb2312' character 0xA2A1 to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA2A1 to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA2A2 to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA2A2 to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA2A3 to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA2A3 to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA2A4 to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA2A4 to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA2A5 to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA2A5 to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA2A6 to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA2A6 to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA2A7 to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA2A7 to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA2A8 to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA2A8 to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA2A9 to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA2A9 to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA2AA to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA2AA to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA2AB to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA2AB to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA2AC to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA2AC to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA2AD to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA2AD to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA2AE to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA2AE to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA2AF to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA2AF to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA2B0 to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA2B0 to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA2E3 to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA2E3 to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA2E4 to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA2E4 to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA2EF to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA2EF to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA2F0 to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA2F0 to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA2FD to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA2FD to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA2FE to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA2FE to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA4F4 to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA4F4 to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA4F5 to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA4F5 to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA4F6 to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA4F6 to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA4F7 to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA4F7 to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA4F8 to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA4F8 to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA4F9 to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA4F9 to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA4FA to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA4FA to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA4FB to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA4FB to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA4FC to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA4FC to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA4FD to 'utf8'
-Warning	1976	Cannot convert 'gb2312' character 0xA4FD to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2A1 to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2A1 to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2A2 to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2A2 to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2A3 to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2A3 to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2A4 to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2A4 to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2A5 to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2A5 to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2A6 to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2A6 to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2A7 to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2A7 to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2A8 to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2A8 to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2A9 to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2A9 to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2AA to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2AA to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2AB to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2AB to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2AC to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2AC to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2AD to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2AD to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2AE to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2AE to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2AF to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2AF to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2B0 to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2B0 to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2E3 to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2E3 to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2E4 to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2E4 to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2EF to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2EF to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2F0 to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2F0 to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2FD to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2FD to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2FE to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA2FE to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA4F4 to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA4F4 to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA4F5 to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA4F5 to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA4F6 to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA4F6 to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA4F7 to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA4F7 to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA4F8 to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA4F8 to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA4F9 to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA4F9 to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA4FA to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA4FA to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA4FB to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA4FB to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA4FC to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA4FC to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA4FD to 'utf8'
+Warning	1977	Cannot convert 'gb2312' character 0xA4FD to 'utf8'
 DROP TABLE t1;
 #
 # End of 5.5 tests
--- a/mysql-test/r/ctype_gbk.result
+++ b/mysql-test/r/ctype_gbk.result
@ -489,7 +489,7 @@ select hex(convert(_gbk 0xA14041 using ucs2));
 hex(convert(_gbk 0xA14041 using ucs2))
 003F0041
 Warnings:
-Warning	1976	Cannot convert 'gbk' character 0xA140 to 'ucs2'
+Warning	1977	Cannot convert 'gbk' character 0xA140 to 'ucs2'
 create table t1 (c1 text not null, c2 text not null) character set gbk;
 alter table t1 change c1 c1 mediumtext  character set gbk not null;
 show create table t1;
@ -797,70 +797,70 @@ code	a
 A2FB	Ⅺ
 A2FC	Ⅻ
 Warnings:
-Warning	1976	Cannot convert 'gbk' character 0xA140 to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA140 to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA141 to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA141 to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA142 to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA142 to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA143 to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA143 to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA144 to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA144 to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA145 to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA145 to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA146 to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA146 to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA147 to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA147 to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA148 to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA148 to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA149 to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA149 to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA14A to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA14A to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA14B to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA14B to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA14C to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA14C to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA14D to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA14D to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA14E to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA14E to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA14F to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA14F to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA150 to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA150 to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA151 to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA151 to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA152 to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA152 to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA153 to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA153 to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA154 to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA154 to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA155 to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA155 to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA156 to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA156 to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA157 to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA157 to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA158 to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA158 to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA159 to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA159 to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA15A to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA15A to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA15B to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA15B to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA15C to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA15C to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA15D to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA15D to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA15E to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA15E to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA15F to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA15F to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA140 to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA140 to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA141 to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA141 to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA142 to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA142 to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA143 to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA143 to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA144 to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA144 to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA145 to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA145 to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA146 to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA146 to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA147 to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA147 to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA148 to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA148 to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA149 to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA149 to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA14A to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA14A to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA14B to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA14B to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA14C to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA14C to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA14D to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA14D to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA14E to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA14E to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA14F to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA14F to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA150 to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA150 to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA151 to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA151 to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA152 to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA152 to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA153 to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA153 to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA154 to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA154 to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA155 to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA155 to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA156 to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA156 to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA157 to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA157 to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA158 to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA158 to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA159 to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA159 to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA15A to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA15A to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA15B to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA15B to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA15C to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA15C to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA15D to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA15D to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA15E to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA15E to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA15F to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA15F to 'utf8'
 SELECT * FROM t1
 WHERE HEX(CAST(UPPER(a) AS CHAR CHARACTER SET utf8)) <>
 HEX(UPPER(CAST(a AS CHAR CHARACTER SET utf8))) ORDER BY code;
@ -894,70 +894,70 @@ A8BA	ê
 A8BD	ń
 A8BE	ň
 Warnings:
-Warning	1976	Cannot convert 'gbk' character 0xA140 to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA140 to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA141 to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA141 to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA142 to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA142 to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA143 to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA143 to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA144 to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA144 to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA145 to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA145 to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA146 to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA146 to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA147 to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA147 to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA148 to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA148 to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA149 to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA149 to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA14A to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA14A to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA14B to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA14B to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA14C to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA14C to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA14D to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA14D to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA14E to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA14E to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA14F to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA14F to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA150 to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA150 to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA151 to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA151 to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA152 to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA152 to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA153 to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA153 to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA154 to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA154 to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA155 to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA155 to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA156 to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA156 to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA157 to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA157 to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA158 to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA158 to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA159 to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA159 to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA15A to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA15A to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA15B to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA15B to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA15C to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA15C to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA15D to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA15D to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA15E to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA15E to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA15F to 'utf8'
-Warning	1976	Cannot convert 'gbk' character 0xA15F to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA140 to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA140 to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA141 to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA141 to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA142 to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA142 to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA143 to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA143 to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA144 to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA144 to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA145 to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA145 to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA146 to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA146 to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA147 to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA147 to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA148 to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA148 to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA149 to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA149 to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA14A to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA14A to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA14B to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA14B to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA14C to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA14C to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA14D to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA14D to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA14E to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA14E to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA14F to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA14F to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA150 to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA150 to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA151 to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA151 to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA152 to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA152 to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA153 to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA153 to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA154 to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA154 to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA155 to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA155 to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA156 to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA156 to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA157 to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA157 to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA158 to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA158 to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA159 to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA159 to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA15A to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA15A to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA15B to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA15B to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA15C to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA15C to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA15D to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA15D to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA15E to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA15E to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA15F to 'utf8'
+Warning	1977	Cannot convert 'gbk' character 0xA15F to 'utf8'
 DROP TABLE t1;
 #
 # End of 5.5 tests
--- a/mysql-test/r/ctype_latin2_ch.result
+++ b/mysql-test/r/ctype_latin2_ch.result
@ -333,6 +333,7 @@ Y
 z
 Z
 DROP TABLE t1;
+set sql_mode="";
 CREATE TABLE t1 ENGINE=INNODB AS SELECT repeat('a', 5) AS s1 LIMIT 0;
 INSERT INTO t1 VALUES ('x'),('y'),('z'),('X'),('Y'),('Z');
 SELECT * FROM t1 GROUP BY s1;
--- a/mysql-test/r/ctype_sjis.result
+++ b/mysql-test/r/ctype_sjis.result
@ -686,139 +686,139 @@ HEX(LOWER(CAST(a AS CHAR CHARACTER SET utf8))) ORDER BY code;
 code	a
 81F0	Å
 Warnings:
-Warning	1976	Cannot convert 'sjis' character 0x81AD to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81AD to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81AE to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81AE to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81AF to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81AF to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81B0 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81B0 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81B1 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81B1 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81B2 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81B2 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81B3 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81B3 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81B4 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81B4 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81B5 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81B5 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81B6 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81B6 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81B7 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81B7 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81C0 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81C0 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81C1 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81C1 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81C2 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81C2 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81C3 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81C3 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81C4 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81C4 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81C5 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81C5 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81C6 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81C6 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81C7 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81C7 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81CF to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81CF to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81D0 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81D0 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81D1 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81D1 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81D2 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81D2 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81D3 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81D3 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81D4 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81D4 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81D5 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81D5 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81D6 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81D6 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81D7 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81D7 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81D8 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81D8 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81D9 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81D9 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81E9 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81E9 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81EA to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81EA to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81AD to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81AD to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81AE to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81AE to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81AF to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81AF to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81B0 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81B0 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81B1 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81B1 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81B2 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81B2 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81B3 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81B3 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81B4 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81B4 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81B5 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81B5 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81B6 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81B6 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81B7 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81B7 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81C0 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81C0 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81C1 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81C1 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81C2 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81C2 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81C3 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81C3 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81C4 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81C4 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81C5 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81C5 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81C6 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81C6 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81C7 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81C7 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81CF to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81CF to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81D0 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81D0 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81D1 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81D1 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81D2 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81D2 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81D3 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81D3 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81D4 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81D4 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81D5 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81D5 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81D6 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81D6 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81D7 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81D7 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81D8 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81D8 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81D9 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81D9 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81E9 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81E9 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81EA to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81EA to 'utf8'
 SELECT * FROM t1
 WHERE HEX(CAST(UPPER(a) AS CHAR CHARACTER SET utf8)) <>
 HEX(UPPER(CAST(a AS CHAR CHARACTER SET utf8))) ORDER BY code;
 code	a
 Warnings:
-Warning	1976	Cannot convert 'sjis' character 0x81AD to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81AD to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81AE to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81AE to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81AF to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81AF to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81B0 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81B0 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81B1 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81B1 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81B2 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81B2 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81B3 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81B3 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81B4 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81B4 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81B5 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81B5 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81B6 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81B6 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81B7 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81B7 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81C0 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81C0 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81C1 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81C1 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81C2 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81C2 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81C3 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81C3 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81C4 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81C4 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81C5 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81C5 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81C6 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81C6 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81C7 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81C7 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81CF to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81CF to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81D0 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81D0 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81D1 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81D1 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81D2 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81D2 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81D3 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81D3 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81D4 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81D4 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81D5 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81D5 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81D6 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81D6 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81D7 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81D7 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81D8 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81D8 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81D9 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81D9 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81E9 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81E9 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81EA to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81EA to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81AD to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81AD to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81AE to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81AE to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81AF to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81AF to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81B0 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81B0 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81B1 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81B1 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81B2 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81B2 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81B3 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81B3 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81B4 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81B4 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81B5 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81B5 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81B6 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81B6 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81B7 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81B7 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81C0 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81C0 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81C1 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81C1 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81C2 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81C2 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81C3 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81C3 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81C4 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81C4 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81C5 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81C5 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81C6 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81C6 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81C7 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81C7 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81CF to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81CF to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81D0 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81D0 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81D1 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81D1 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81D2 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81D2 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81D3 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81D3 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81D4 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81D4 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81D5 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81D5 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81D6 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81D6 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81D7 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81D7 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81D8 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81D8 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81D9 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81D9 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81E9 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81E9 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81EA to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81EA to 'utf8'
 #
 # WL#3090 Japanese Character Set adjustments
 # Test sjis->Unicode conversion
@ -7769,70 +7769,70 @@ EAA2	E791A4
 EAA3	E5879C
 EAA4	E78699
 Warnings:
-Warning	1976	Cannot convert 'sjis' character 0x81AD to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81AE to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81AF to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81B0 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81B1 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81B2 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81B3 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81B4 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81B5 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81B6 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81B7 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81C0 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81C1 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81C2 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81C3 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81C4 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81C5 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81C6 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81C7 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81CF to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81D0 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81D1 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81D2 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81D3 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81D4 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81D5 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81D6 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81D7 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81D8 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81D9 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81E9 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81EA to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81EB to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81EC to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81ED to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81EE to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81EF to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81F8 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81F9 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81FA to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x81FB to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x8240 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x8241 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x8242 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x8243 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x8244 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x8245 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x8246 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x8247 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x8248 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x8249 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x824A to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x824B to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x824C to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x824D to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x824E to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x8259 to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x825A to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x825B to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x825C to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x825D to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x825E to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x825F to 'utf8'
-Warning	1976	Cannot convert 'sjis' character 0x827A to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81AD to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81AE to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81AF to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81B0 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81B1 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81B2 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81B3 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81B4 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81B5 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81B6 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81B7 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81C0 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81C1 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81C2 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81C3 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81C4 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81C5 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81C6 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81C7 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81CF to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81D0 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81D1 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81D2 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81D3 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81D4 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81D5 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81D6 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81D7 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81D8 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81D9 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81E9 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81EA to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81EB to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81EC to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81ED to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81EE to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81EF to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81F8 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81F9 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81FA to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x81FB to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x8240 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x8241 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x8242 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x8243 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x8244 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x8245 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x8246 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x8247 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x8248 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x8249 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x824A to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x824B to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x824C to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x824D to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x824E to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x8259 to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x825A to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x825B to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x825C to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x825D to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x825E to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x825F to 'utf8'
+Warning	1977	Cannot convert 'sjis' character 0x827A to 'utf8'
 DROP TABLE t1;
 #
 # WL#3090 Japanese Character Set adjustments
--- a/mysql-test/r/ctype_ucs.result
+++ b/mysql-test/r/ctype_ucs.result
@ -1184,7 +1184,9 @@ hex(a)
 005B
 803D
 drop table t1;
+set sql_mode="";
 create table t1(f1 varchar(5) CHARACTER SET ucs2 COLLATE ucs2_bin NOT NULL) engine=InnoDB;
+set sql_mode=default;
 insert into t1 values('a');
 create index t1f1 on t1(f1);
 select f1 from t1 where f1 like 'a%';
--- a/mysql-test/r/ctype_ujis.result
+++ b/mysql-test/r/ctype_ujis.result
@ -126,6 +126,7 @@ Field	Type	Null	Key	Default	Extra
 a	char(1)	NO			
 b	enum('<27><>','<27><>')	YES		NULL	
 DROP TABLE t1;
+set sql_mode="";
 CREATE TABLE t1
 (
 a INTEGER NOT NULL,
@ -133,6 +134,7 @@ b VARCHAR(50) NOT NULL DEFAULT '',
 PRIMARY KEY  (a),
 KEY b (b(10))
 ) ENGINE=InnoDB CHARACTER SET 'ujis' COLLATE 'ujis_japanese_ci';
+set sql_mode=default;
 INSERT INTO t1 (a, b) VALUES (0, 'aaabbbcccddd');
 INSERT INTO t1 (a, b) VALUES (1, 'eeefffggghhh');
 INSERT INTO t1 (a, b) VALUES (2, 'iiijjjkkkl');
@ -2505,12 +2507,12 @@ select hex(convert(_ujis 0xA5FE41 using ucs2));
 hex(convert(_ujis 0xA5FE41 using ucs2))
 003F0041
 Warnings:
-Warning	1976	Cannot convert 'ujis' character 0xA5FE to 'ucs2'
+Warning	1977	Cannot convert 'ujis' character 0xA5FE to 'ucs2'
 select hex(convert(_ujis 0x8FABF841 using ucs2));
 hex(convert(_ujis 0x8FABF841 using ucs2))
 003F0041
 Warnings:
-Warning	1976	Cannot convert 'ujis' character 0x8FABF8 to 'ucs2'
+Warning	1977	Cannot convert 'ujis' character 0x8FABF8 to 'ucs2'
 DROP TABLE IF EXISTS t1, t2;
 DROP PROCEDURE IF EXISTS sp1;
 set names ujis;
@ -3081,70 +3083,70 @@ HEX(LOWER(CAST(a AS CHAR CHARACTER SET utf8))) ORDER BY code;
 code	a
 8FAABC	Ģ
 Warnings:
-Warning	1976	Cannot convert 'ujis' character 0xA2AF to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2AF to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2B0 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2B0 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2B1 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2B1 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2B2 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2B2 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2B3 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2B3 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2B4 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2B4 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2B5 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2B5 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2B6 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2B6 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2B7 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2B7 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2B8 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2B8 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2B9 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2B9 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2C2 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2C2 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2C3 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2C3 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2C4 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2C4 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2C5 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2C5 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2C6 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2C6 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2C7 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2C7 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2C8 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2C8 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2C9 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2C9 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2D1 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2D1 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2D2 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2D2 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2D3 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2D3 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2D4 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2D4 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2D5 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2D5 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2D6 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2D6 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2D7 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2D7 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2D8 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2D8 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2D9 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2D9 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2DA to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2DA to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2DB to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2DB to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2EB to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2EB to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2EC to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2EC to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2AF to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2AF to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2B0 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2B0 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2B1 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2B1 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2B2 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2B2 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2B3 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2B3 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2B4 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2B4 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2B5 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2B5 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2B6 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2B6 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2B7 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2B7 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2B8 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2B8 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2B9 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2B9 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2C2 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2C2 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2C3 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2C3 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2C4 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2C4 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2C5 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2C5 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2C6 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2C6 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2C7 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2C7 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2C8 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2C8 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2C9 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2C9 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2D1 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2D1 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2D2 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2D2 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2D3 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2D3 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2D4 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2D4 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2D5 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2D5 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2D6 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2D6 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2D7 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2D7 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2D8 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2D8 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2D9 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2D9 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2DA to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2DA to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2DB to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2DB to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2EB to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2EB to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2EC to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2EC to 'utf8'
 SELECT * FROM t1
 WHERE HEX(CAST(UPPER(a) AS CHAR CHARACTER SET utf8)) <>
 HEX(UPPER(CAST(a AS CHAR CHARACTER SET utf8))) ORDER BY code;
@ -3152,70 +3154,70 @@ code	a
 8FA9C3	ð
 8FABB9	ǵ
 Warnings:
-Warning	1976	Cannot convert 'ujis' character 0xA2AF to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2AF to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2B0 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2B0 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2B1 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2B1 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2B2 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2B2 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2B3 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2B3 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2B4 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2B4 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2B5 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2B5 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2B6 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2B6 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2B7 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2B7 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2B8 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2B8 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2B9 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2B9 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2C2 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2C2 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2C3 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2C3 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2C4 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2C4 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2C5 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2C5 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2C6 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2C6 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2C7 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2C7 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2C8 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2C8 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2C9 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2C9 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2D1 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2D1 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2D2 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2D2 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2D3 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2D3 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2D4 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2D4 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2D5 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2D5 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2D6 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2D6 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2D7 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2D7 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2D8 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2D8 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2D9 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2D9 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2DA to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2DA to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2DB to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2DB to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2EB to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2EB to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2EC to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2EC to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2AF to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2AF to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2B0 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2B0 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2B1 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2B1 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2B2 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2B2 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2B3 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2B3 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2B4 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2B4 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2B5 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2B5 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2B6 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2B6 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2B7 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2B7 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2B8 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2B8 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2B9 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2B9 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2C2 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2C2 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2C3 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2C3 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2C4 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2C4 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2C5 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2C5 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2C6 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2C6 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2C7 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2C7 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2C8 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2C8 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2C9 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2C9 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2D1 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2D1 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2D2 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2D2 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2D3 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2D3 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2D4 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2D4 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2D5 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2D5 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2D6 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2D6 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2D7 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2D7 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2D8 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2D8 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2D9 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2D9 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2DA to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2DA to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2DB to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2DB to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2EB to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2EB to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2EC to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2EC to 'utf8'
 #
 # WL#3090 Japanese Character Set adjustments
 # Test sjis->Unicode conversion
@ -18113,70 +18115,70 @@ FEFC	EE8EA9
 FEFD	EE8EAA
 FEFE	EE8EAB
 Warnings:
-Warning	1976	Cannot convert 'ujis' character 0xA2AF to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2B0 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2B1 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2B2 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2B3 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2B4 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2B5 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2B6 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2B7 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2B8 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2B9 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2C2 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2C3 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2C4 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2C5 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2C6 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2C7 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2C8 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2C9 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2D1 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2D2 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2D3 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2D4 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2D5 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2D6 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2D7 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2D8 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2D9 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2DA to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2DB to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2EB to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2EC to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2ED to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2EE to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2EF to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2F0 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2F1 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2FA to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2FB to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2FC to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA2FD to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA3A1 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA3A2 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA3A3 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA3A4 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA3A5 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA3A6 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA3A7 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA3A8 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA3A9 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA3AA to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA3AB to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA3AC to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA3AD to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA3AE to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA3AF to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA3BA to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA3BB to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA3BC to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA3BD to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA3BE to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA3BF to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA3C0 to 'utf8'
-Warning	1976	Cannot convert 'ujis' character 0xA3DB to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2AF to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2B0 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2B1 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2B2 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2B3 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2B4 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2B5 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2B6 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2B7 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2B8 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2B9 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2C2 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2C3 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2C4 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2C5 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2C6 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2C7 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2C8 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2C9 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2D1 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2D2 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2D3 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2D4 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2D5 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2D6 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2D7 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2D8 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2D9 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2DA to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2DB to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2EB to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2EC to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2ED to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2EE to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2EF to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2F0 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2F1 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2FA to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2FB to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2FC to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA2FD to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA3A1 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA3A2 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA3A3 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA3A4 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA3A5 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA3A6 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA3A7 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA3A8 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA3A9 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA3AA to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA3AB to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA3AC to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA3AD to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA3AE to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA3AF to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA3BA to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA3BB to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA3BC to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA3BD to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA3BE to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA3BF to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA3C0 to 'utf8'
+Warning	1977	Cannot convert 'ujis' character 0xA3DB to 'utf8'
 DROP TABLE t1;
 #
 # WL#3090 Japanese Character Set adjustments
--- a/mysql-test/r/ctype_utf16.result
+++ b/mysql-test/r/ctype_utf16.result
@ -1549,7 +1549,7 @@ SELECT space(date_add(101, INTERVAL CHAR('1' USING utf16) hour_second));
 space(date_add(101, INTERVAL CHAR('1' USING utf16) hour_second))
 NULL
 Warnings:
-Warning	1301	Result of space() was larger than max_allowed_packet (1048576) - truncated
+Warning	1301	Result of space() was larger than max_allowed_packet (4194304) - truncated
 #
 # Bug#11750518 41090: ORDER BY TRUNCATES GROUP_CONCAT RESULT
 #
--- a/mysql-test/r/ddl_i18n_koi8r.result
+++ b/mysql-test/r/ddl_i18n_koi8r.result
@ -1,3 +1,4 @@
+set sql_mode="";
 set names koi8r;

 -------------------------------------------------------------------
--- a/mysql-test/r/ddl_i18n_utf8.result
+++ b/mysql-test/r/ddl_i18n_utf8.result
@ -1,3 +1,4 @@
+set sql_mode="";
 set names utf8;

 -------------------------------------------------------------------
--- a/mysql-test/r/default.result
+++ b/mysql-test/r/default.result
@ -1,5 +1,6 @@
 drop table if exists t1,t2,t3,t4,t5,t6;
 drop database if exists mysqltest;
+set sql_mode="";
 CREATE TABLE t1 (a varchar(30) binary NOT NULL DEFAULT ' ',
 b varchar(1) binary NOT NULL DEFAULT ' ',
 c varchar(4) binary NOT NULL DEFAULT '0000',
@ -29,6 +30,7 @@ z varchar(20) binary NOT NULL DEFAULT ' ',
 a1 varchar(30) binary NOT NULL DEFAULT ' ',
 b1 tinyblob NULL)
 ENGINE=InnoDB DEFAULT CHARACTER SET = latin1 COLLATE latin1_bin;
+set sql_mode=default;
 INSERT into t1 (b) values ('1');
 SHOW WARNINGS;
 Level	Code	Message
--- a/mysql-test/r/delete_returning_grant.result
+++ b/mysql-test/r/delete_returning_grant.result
@ -1,3 +1,5 @@
+set GLOBAL sql_mode="";
+set LOCAL sql_mode="";
 CREATE TABLE t1 (a int(11), b varchar(32));
 INSERT INTO t1 VALUES (7,'ggggggg'),(1,'a'),(3,'ccc'),(4,'dddd'),(1,'A'),
 (2,'BB'),(4,'DDDD'),(5,'EEEEE'),(7,'GGGGGGG'),(2,'bb');
@ -67,3 +69,4 @@ DROP DATABASE mysqltest;
 DROP USER mysqltest_1@localhost;
 DROP VIEW v1;
 DROP TABLE t1;
+set GLOBAL sql_mode=default;
--- a/mysql-test/r/derived.result
+++ b/mysql-test/r/derived.result
@ -566,7 +566,31 @@ insert into t1 (accountId,balance) values
 update t1 set balance=(select sum(balance) from (SELECT balance FROM t1 where accountId like 'dealer%') AS copied) where accountId = 'OPERATOR';
 set optimizer_switch=@save_derived_optimizer_switch_bug;
 drop table t1;
-set optimizer_switch=@save_derived_optimizer_switch;
+#
+# MDEV-6219:Server crashes in Bitmap<64u>::merge
+# (this=0x180, map2=...) on 2nd execution of PS with INSERT .. SELECT,
+# derived_merge
+#
+CREATE TABLE t1 (a VARCHAR(8)) ENGINE=MyISAM;
+INSERT INTO t1 VALUES ('foo'),('bar');
+create procedure p1()
+INSERT INTO t1 SELECT * FROM ( 
+SELECT * FROM t1
+) AS sq
+WHERE sq.a IN ( SELECT 'baz' FROM DUAL );
+call p1();
+call p1();
+drop procedure p1;
+PREPARE stmt FROM "
+  INSERT INTO t1 SELECT * FROM ( 
+    SELECT * FROM t1
+  ) AS sq
+  WHERE sq.a IN ( SELECT 'baz' FROM DUAL ) 
+";
+EXECUTE stmt;
+EXECUTE stmt;
+deallocate prepare stmt;
+drop table t1;
 #
 # MDEV-6892: WHERE does not apply
 #
@ -579,3 +603,4 @@ select x.id, message from (select id from t1) x left join
 where coalesce(message,0) <> 0;
 id	message
 drop table t1,t2;
+set optimizer_switch=@save_derived_optimizer_switch;
--- a/mysql-test/r/derived_view.result
+++ b/mysql-test/r/derived_view.result
@ -2262,10 +2262,7 @@ CREATE TABLE IF NOT EXISTS `galleries` (
 `year` int(11) DEFAULT NULL, 
 PRIMARY KEY (`id`), 
 UNIQUE KEY `name` (`name`) 
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-Warnings:
-Warning	1286	Unknown storage engine 'InnoDB'
-Warning	1266	Using storage engine MyISAM for table 'galleries'
+) DEFAULT CHARSET=utf8;
 CREATE TABLE IF NOT EXISTS `pictures` ( 
 `id` int(11) NOT NULL AUTO_INCREMENT, 
 `name` varchar(100) NOT NULL, 
@ -2278,10 +2275,7 @@ CREATE TABLE IF NOT EXISTS `pictures` (
 `type` int(11) NOT NULL, 
 PRIMARY KEY (`id`), 
 KEY `gallery_id` (`gallery_id`) 
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 ;
-Warnings:
-Warning	1286	Unknown storage engine 'InnoDB'
-Warning	1266	Using storage engine MyISAM for table 'pictures'
+) DEFAULT CHARSET=utf8 ;
 ALTER TABLE `pictures` 
 ADD CONSTRAINT `pictures_ibfk_1` FOREIGN KEY (`gallery_id`) REFERENCES `galleries` (`id`);
 INSERT INTO `galleries` (`id`, `name`, `year`) VALUES 
--- a/mysql-test/r/empty_server_name-8224.result
+++ b/mysql-test/r/empty_server_name-8224.result
@ -1 +1,2 @@
 create server '' foreign data wrapper w2 options (host '127.0.0.1');
+drop server '';
--- a/mysql-test/r/enforce_storage_engine.result
+++ b/mysql-test/r/enforce_storage_engine.result
@ -1,3 +1,5 @@
+set local sql_mode="";
+set global sql_mode="";
 drop table if exists t1;
 SET SESSION enforce_storage_engine=MyISAM;
 select @@session.enforce_storage_engine;
@ -117,5 +119,6 @@ t1	CREATE TABLE `t1` (
  PRIMARY KEY (`c1`)
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1
 DROP TABLE t1;
+set global sql_mode=default;
 SET SESSION enforce_storage_engine=NULL;
 SET GLOBAL enforce_storage_engine=NULL;
--- a/mysql-test/r/enforce_storage_engine_opt.result
+++ b/mysql-test/r/enforce_storage_engine_opt.result
@ -1,3 +1,4 @@
+SET SQL_MODE="";
 create table t1 (c1 int primary key auto_increment, c2 varchar(10)) engine=memory;
 Warnings:
 Note	1266	Using storage engine MyISAM for table 't1'
--- a/mysql-test/r/events_1.result
+++ b/mysql-test/r/events_1.result
@ -1,3 +1,4 @@
+set sql_mode="";
 call mtr.add_suppression("Column count of mysql.event is wrong. Expected .*, found .*\. The table is probably corrupted");
 drop database if exists events_test;
 drop database if exists db_x;
--- a/mysql-test/r/events_2.result
+++ b/mysql-test/r/events_2.result
@ -1,3 +1,4 @@
+set sql_mode="";
 drop database if exists events_test;
 create database events_test;
 use events_test;
--- a/mysql-test/r/events_bugs.result
+++ b/mysql-test/r/events_bugs.result
@ -1,3 +1,4 @@
+SET SQL_MODE="";
 drop database if exists events_test;
 drop database if exists mysqltest_db1;
 drop database if exists mysqltest_db2;
--- a/mysql-test/r/events_trans.result
+++ b/mysql-test/r/events_trans.result
@ -1,3 +1,4 @@
+set sql_mode="";
 drop database if exists events_test;
 drop database if exists mysqltest_no_such_database;
 create database events_test;
--- a/mysql-test/r/events_trans_notembedded.result
+++ b/mysql-test/r/events_trans_notembedded.result
@ -2,6 +2,7 @@ drop database if exists events_test;
 drop database if exists mysqltest_db2;
 create database events_test;
 use events_test;
+create user mysqltest_user1@localhost;
 grant create, insert, select, delete on mysqltest_db2.*
 to mysqltest_user1@localhost;
 create database mysqltest_db2;
--- a/mysql-test/r/explain_json.result
+++ b/mysql-test/r/explain_json.result
@ -371,7 +371,7 @@ EXPLAIN
        "attached_condition": "(tbl2.b < 5)"
      },
      "buffer_type": "flat",
-      "buffer_size": "128Kb",
+      "buffer_size": "256Kb",
      "join_type": "BNL",
      "attached_condition": "(tbl2.a = tbl1.a)"
    }
@ -638,7 +638,7 @@ EXPLAIN
        "filtered": 100
      },
      "buffer_type": "flat",
-      "buffer_size": "128Kb",
+      "buffer_size": "256Kb",
      "join_type": "BNL"
    }
  }
@ -672,7 +672,7 @@ EXPLAIN
        "first_match": "t2"
      },
      "buffer_type": "flat",
-      "buffer_size": "128Kb",
+      "buffer_size": "256Kb",
      "join_type": "BNL",
      "attached_condition": "((t1.b = t2.b) and (t1.a = t2.a))"
    }
@ -709,7 +709,7 @@ EXPLAIN
          "filtered": 100
        },
        "buffer_type": "flat",
-        "buffer_size": "128Kb",
+        "buffer_size": "256Kb",
        "join_type": "BNL",
        "attached_condition": "((t1.b = t2.b) and (t1.a = t2.a))"
      }
@ -822,7 +822,7 @@ EXPLAIN
              "filtered": 100
            },
            "buffer_type": "flat",
-            "buffer_size": "128Kb",
+            "buffer_size": "256Kb",
            "join_type": "BNL",
            "attached_condition": "((t2.b <> outer_t1.a) and trigcond(((<cache>(outer_t1.a) = t1.a) or isnull(t1.a))))"
          }
@ -873,7 +873,7 @@ EXPLAIN
              "filtered": 100
            },
            "buffer_type": "flat",
-            "buffer_size": "128Kb",
+            "buffer_size": "256Kb",
            "join_type": "BNL",
            "attached_condition": "(tbl2.b = tbl1.b)"
          }
--- a/mysql-test/r/features.result
+++ b/mysql-test/r/features.result
@ -1,4 +1,5 @@
 drop table if exists t1;
+set sql_mode="";
 flush status;
 show status like "feature%";
 Variable_name	Value
--- a/mysql-test/r/fix_priv_tables.result
+++ b/mysql-test/r/fix_priv_tables.result
@ -1,4 +1,5 @@
 drop table if exists t1,t1aa,t2aa;
+set sql_mode="";
 DROP DATABASE IF EXISTS testdb;
 CREATE DATABASE testdb;
 CREATE TABLE testdb.t1 (
--- a/mysql-test/r/flush-innodb-notembedded.result
+++ b/mysql-test/r/flush-innodb-notembedded.result
@ -1,3 +1,4 @@
+set sql_mode="";
 # Test 7: Check privileges required.
 #
 CREATE DATABASE db1;
--- a/mysql-test/r/flush_read_lock.result
+++ b/mysql-test/r/flush_read_lock.result
@ -1,3 +1,5 @@
+set global sql_mode="";
+set local sql_mode="";
 # FTWRL takes two global metadata locks -- a global shared
 # metadata lock and the commit blocker lock.
 # The first lock prevents DDL from taking place.
@ -1667,3 +1669,4 @@ drop database `#mysql50#mysqltest-2`;
 drop database mysqltest1;
 drop temporary tables t1_temp, t2_temp;
 drop tables t1_base, t2_base, t3_trans;
+set global sql_mode=default;
--- a/mysql-test/r/func_compress.result
+++ b/mysql-test/r/func_compress.result
@ -1,3 +1,4 @@
+set global max_allowed_packet=1048576;
 select @test_compress_string:='string for test compress function aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa ';
@test_compress_string:='string for test compress function aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa '
 string for test compress function aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 
@ -152,6 +153,7 @@ UNCOMPRESS(CAST(0 AS BINARY(5)))
 NULL
 Warnings:
 Warning	1259	ZLIB: Input data corrupted
+set global max_allowed_packet=default;
 #
 # End of 5.5 tests
 #
--- a/mysql-test/r/func_gconcat.result
+++ b/mysql-test/r/func_gconcat.result
@ -1103,3 +1103,19 @@ ORDER BY field;
 field
 c,c
 drop table t3, t2, t1;
+#
+# MDEV-7821 - Server crashes in Item_func_group_concat::fix_fields on 2nd
+#             execution of PS
+#
+CREATE TABLE t1(a INT);
+INSERT INTO t1 VALUES(1),(2);
+PREPARE stmt FROM "SELECT GROUP_CONCAT(t1a.a ORDER BY 1, t1a.a=0) FROM t1 AS t1a, t1 AS t1b GROUP BY t1a.a";
+EXECUTE stmt;
+GROUP_CONCAT(t1a.a ORDER BY 1, t1a.a=0)
+1,1
+2,2
+EXECUTE stmt;
+GROUP_CONCAT(t1a.a ORDER BY 1, t1a.a=0)
+1,1
+2,2
+DROP TABLE t1;
--- a/mysql-test/r/func_math.result
+++ b/mysql-test/r/func_math.result
@ -214,7 +214,9 @@ CAST(RAND(2) * 1000 AS UNSIGNED)	CAST(RAND(?) * 1000 AS UNSIGNED)
 122	122
 645	645
 DROP TABLE t1;
+set sql_mode="";
 create table t1 (a varchar(90), ts datetime not null, index (a)) engine=innodb default charset=utf8;
+set sql_mode=default;
 insert into t1 values ('http://www.foo.com/', now());
 select a from t1 where a='http://www.foo.com/' order by abs(timediff(ts, 0));
 a
--- a/mysql-test/r/func_misc.result
+++ b/mysql-test/r/func_misc.result
@ -334,10 +334,7 @@ CREATE TABLE t1 (a char(2) not null );
 INSERT INTO t1 VALUES (4),(7),(1);
 set @optimizer_switch_save= @@optimizer_switch;
 set optimizer_switch='materialization=off';
-CREATE TABLE tv (e char(2) not null ) engine=mysql;
-Warnings:
-Warning	1286	Unknown storage engine 'mysql'
-Warning	1266	Using storage engine MyISAM for table 'tv'
+CREATE TABLE tv (e char(2) not null );
 INSERT INTO tv VALUES (1);
 CREATE ALGORITHM=MERGE VIEW v_merge AS SELECT * FROM tv;
 CREATE ALGORITHM=MERGE VIEW vm AS SELECT * FROM tv;
@ -361,6 +358,19 @@ set optimizer_switch=@optimizer_switch_save;
 drop view  v_merge, vm;
 drop table t1,tv;
 #
+# MDEV-4017 - GET_LOCK() with negative timeouts has strange behavior
+#
+SELECT GET_LOCK('ul1', NULL);
+GET_LOCK('ul1', NULL)
+NULL
+Warnings:
+Warning	1411	Incorrect timeout value: 'NULL' for function get_lock
+SELECT GET_LOCK('ul1', -1);
+GET_LOCK('ul1', -1)
+NULL
+Warnings:
+Warning	1411	Incorrect timeout value: '-1' for function get_lock
+#
 # GET_LOCK, RELEASE_LOCK, IS_USED_LOCK functions test
 #
 # IS_USED_LOCK, IS_FREE_LOCK: the  lock is not acquired
--- a/mysql-test/r/func_str.result
+++ b/mysql-test/r/func_str.result
@ -1,4 +1,5 @@
 drop table if exists t1,t2;
+set global max_allowed_packet=1048576;
 set names latin1;
 select 'hello',"'hello'",'""hello""','''h''e''l''l''o''',"hel""lo",'hel\'lo';
 hello	'hello'	""hello""	'h'e'l'l'o'	hel"lo	hel'lo
@ -4530,6 +4531,7 @@ SET NAMES latin2;
 EXECUTE stmt;
 COLLATION(space(2))
 latin2_general_ci
+set global max_allowed_packet=default;
 #
 # End of 5.6 tests
 #
--- a/mysql-test/r/func_weight_string.result
+++ b/mysql-test/r/func_weight_string.result
@ -1,4 +1,5 @@
 drop table if exists t1;
+set global max_allowed_packet=1048576;
 set names latin1;
 select hex(weight_string(0x010203));
 hex(weight_string(0x010203))
@ -90,3 +91,4 @@ NULL
 Warnings:
 Warning	1301	Result of cast_as_binary() was larger than max_allowed_packet (1048576) - truncated
 Warning	1301	Result of weight_string() was larger than max_allowed_packet (1048576) - truncated
+set global max_allowed_packet=default;
--- a/mysql-test/r/gis.result
+++ b/mysql-test/r/gis.result
@ -809,7 +809,7 @@ drop procedure if exists fn3;
 create function fn3 () returns point deterministic return GeomFromText("point(1 1)");
 show create function fn3;
 Function	sql_mode	Create Function	character_set_client	collation_connection	Database Collation
-fn3		CREATE DEFINER=`root`@`localhost` FUNCTION `fn3`() RETURNS point
+fn3	NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` FUNCTION `fn3`() RETURNS point
    DETERMINISTIC
 return GeomFromText("point(1 1)")	latin1	latin1_swedish_ci	latin1_swedish_ci
 select astext(fn3());
--- a/mysql-test/r/grant.result
+++ b/mysql-test/r/grant.result
@ -1,3 +1,5 @@
+set GLOBAL sql_mode="";
+set LOCAL sql_mode="";
 SET @old_log_bin_trust_function_creators= @@global.log_bin_trust_function_creators;
 SET GLOBAL log_bin_trust_function_creators = 1;
 drop table if exists t1;
@ -1695,6 +1697,7 @@ Assigning privileges without procs_priv table.
 CREATE DATABASE mysqltest1;
 CREATE PROCEDURE mysqltest1.test() SQL SECURITY DEFINER
 SELECT 1;
+CREATE FUNCTION mysqltest1.test() RETURNS INT RETURN 1;
 GRANT EXECUTE ON FUNCTION mysqltest1.test TO mysqltest_1@localhost;
 ERROR 42S02: Table 'mysql.procs_priv' doesn't exist
 GRANT ALL PRIVILEGES ON test.* TO mysqltest_1@localhost;
@ -2557,3 +2560,26 @@ ERROR 42000: Access denied for user 'untrusted'@'localhost' to database 'secret'
 # Connection default
 DROP USER untrusted@localhost;
 DROP DATABASE secret;
+#
+# BUG#11759114 - '51401: GRANT TREATS NONEXISTENT FUNCTIONS/PRIVILEGES
+#                 DIFFERENTLY'.
+#
+drop database if exists mysqltest_db1;
+create database mysqltest_db1;
+create user mysqltest_u1;
+# Both GRANT statements below should fail with the same error.
+grant execute on function mysqltest_db1.f1 to mysqltest_u1;
+ERROR 42000: FUNCTION or PROCEDURE f1 does not exist
+grant execute on procedure mysqltest_db1.p1 to mysqltest_u1;
+ERROR 42000: FUNCTION or PROCEDURE p1 does not exist
+# Let us show that GRANT behaviour for routines is consistent
+# with GRANT behaviour for tables. Attempt to grant privilege
+# on non-existent table also results in an error.
+grant select on mysqltest_db1.t1 to mysqltest_u1;
+ERROR 42S02: Table 'mysqltest_db1.t1' doesn't exist
+show grants for mysqltest_u1;
+Grants for mysqltest_u1@%
+GRANT USAGE ON *.* TO 'mysqltest_u1'@'%'
+drop database mysqltest_db1;
+drop user mysqltest_u1;
+set GLOBAL sql_mode=default;
--- a/mysql-test/r/grant2.result
+++ b/mysql-test/r/grant2.result
@ -1,3 +1,5 @@
+set GLOBAL sql_mode="";
+set LOCAL sql_mode="";
 SET NAMES binary;
 drop database if exists mysqltest;
 drop database if exists mysqltest_1;
@ -845,3 +847,4 @@ DROP USER mysqltest_u2@localhost;
 DROP USER mysqltest_u3@localhost;
 DROP USER mysqltest_u4@localhost;
 DROP USER mysqltest_u5@localhost;
+set GLOBAL sql_mode=default;
--- a/mysql-test/r/grant3.result
+++ b/mysql-test/r/grant3.result
@ -1,3 +1,5 @@
+set global sql_mode="";
+set local sql_mode="";
 SET NAMES binary;
 drop table if exists t1;
 delete from mysql.user where user like 'mysqltest\_%';
@ -177,4 +179,5 @@ SELECT b FROM temp.t1;
 ERROR 42000: SELECT command denied to user 'user2'@'localhost' for column 'b' in table 't1'
 DROP USER 'user2'@'%';
 DROP DATABASE temp;
+set global sql_mode=default;
 End of 5.0 tests
--- a/Show More
+++ b/Show More