diff options
| -rw-r--r-- | client/mysqldump.c | 2 | ||||
| -rw-r--r-- | include/my_global.h | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/client/mysqldump.c b/client/mysqldump.c index a346c295d29..a2ed3c0504c 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -39,7 +39,7 @@ ** 10 Jun 2003: SET NAMES and --no-set-names by Alexander Barkov */ -#define DUMP_VERSION "10.16" +#define DUMP_VERSION "10.17" #include <my_global.h> #include <my_sys.h> diff --git a/include/my_global.h b/include/my_global.h index 10704a89842..7904eed3dfc 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -1054,7 +1054,9 @@ typedef ulong myf; /* Type of MyFlags in my_funcs */ #include <my_byteorder.h> -#ifdef HAVE_CHARSET_utf8 +#ifdef HAVE_CHARSET_utf8mb4 +#define MYSQL_UNIVERSAL_CLIENT_CHARSET "utf8mb4" +#elif defined(HAVE_CHARSET_utf8) #define MYSQL_UNIVERSAL_CLIENT_CHARSET "utf8" #else #define MYSQL_UNIVERSAL_CLIENT_CHARSET MYSQL_DEFAULT_CHARSET_NAME |