MDEV-8765: mysqldump -use utf8mb4 by default

Bump mysqldump to a version greater than that on the 10.3 branch.

MDEV-8765: mysqldump -use utf8mb4 by default
Bump mysqldump to a version greater than that on the 10.3 branch.
ce643dda · Daniel Black · Alexander Barkov · 7e869a27 · ce643dda · ce643dda
Commit ce643dda authored Jan 14, 2018 by Daniel Black Committed by Alexander Barkov Oct 12, 2018
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

client/mysqldump.c client/mysqldump.c +1 -1

include/my_global.h include/my_global.h +3 -1

No files found.
--- 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>

--- 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