From ce643ddac78ce66cdef9e4c0164ce7f8fbcf2da0 Mon Sep 17 00:00:00 2001
From: Daniel Black <grooverdan@users.sourceforge.net>
Date: Sun, 14 Jan 2018 15:00:36 +1100
Subject: MDEV-8765: mysqldump -use utf8mb4 by default

Bump mysqldump to a version greater than that on the 10.3 branch.
---
 client/mysqldump.c  | 2 +-
 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
-- 
cgit v1.2.1