diff options
| author | Daniel Black <grooverdan@users.sourceforge.net> | 2018-01-14 15:00:36 +1100 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.com> | 2018-10-12 05:16:01 +0400 |
| commit | ce643ddac78ce66cdef9e4c0164ce7f8fbcf2da0 (patch) | |
| tree | d79b7d942e6996b472879863a5d3f502dd852298 | |
| parent | 7e869a2767c849d266ffbf1def9b93ffae7cd428 (diff) | |
| download | mariadb-git-ce643ddac78ce66cdef9e4c0164ce7f8fbcf2da0.tar.gz | |
MDEV-8765: mysqldump -use utf8mb4 by default
Bump mysqldump to a version greater than that on the 10.3 branch.
| -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 |