Merge 10.4 into 10.5

The functional changes of commit 5836191c8f0658d5d75484766fdcc3d838b0a5c1
(MDEV-21168) are omitted due to MDEV-742 having addressed the issue.

4 files changed, 11 insertions, 11 deletions

diff --git a/plugin/server_audit/server_audit.c b/plugin/server_audit/server_audit.c
index 251078b1492..9add1aab298 100644
--- a/plugin/server_audit/server_audit.c
+++ b/plugin/server_audit/server_audit.c
@@ -1,5 +1,5 @@
 /* Copyright (C) 2013, 2015, Alexey Botchkov and SkySQL Ab
-   Copyright (c) 2019, MariaDB Corporation.
+   Copyright (c) 2019, 2020, MariaDB Corporation.
 
    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
@@ -764,7 +764,7 @@ static int user_coll_fill(struct user_coll *c, char *users,
       if (cmp_user && take_over_cmp)
       {
         ADD_ATOMIC(internal_stop_logging, 1);
-        CLIENT_ERROR(1, "User '%.*s' was removed from the"
+        CLIENT_ERROR(1, "User '%.*b' was removed from the"
             " server_audit_excl_users.",
             MYF(ME_WARNING), (int) cmp_length, users);
         ADD_ATOMIC(internal_stop_logging, -1);
@@ -774,7 +774,7 @@ static int user_coll_fill(struct user_coll *c, char *users,
       else if (cmp_user)
       {
         ADD_ATOMIC(internal_stop_logging, 1);
-        CLIENT_ERROR(1, "User '%.*s' is in the server_audit_incl_users, "
+        CLIENT_ERROR(1, "User '%.*b' is in the server_audit_incl_users, "
             "so wasn't added.", MYF(ME_WARNING), (int) cmp_length, users);
         ADD_ATOMIC(internal_stop_logging, -1);
         remove_user(users);
diff --git a/plugin/type_inet/mysql-test/type_inet/type_inet6-debug.result b/plugin/type_inet/mysql-test/type_inet/type_inet6-debug.result
index 0e879aad58f..e21fb47fea8 100644
--- a/plugin/type_inet/mysql-test/type_inet/type_inet6-debug.result
+++ b/plugin/type_inet/mysql-test/type_inet/type_inet6-debug.result
@@ -6,8 +6,8 @@ SET debug_dbug="+d,frm_data_type_info";
 CREATE TABLE t1 (c01 INET6, c02 INET6);
 Warnings:
 Note	1105	build_frm_image: Field data type info length: 14
-Note	1105	DBUG: [0] name='c01' type_info='inet6'
-Note	1105	DBUG: [1] name='c02' type_info='inet6'
+Note	1105	DBUG: [0] name='c01' type_info='in...'
+Note	1105	DBUG: [1] name='c02' type_info='in...'
 SET debug_dbug=@old_debug_dbug;
 SHOW CREATE TABLE t1;
 Table	Create Table
diff --git a/plugin/type_test/mysql-test/type_test/type_test_double-debug.result b/plugin/type_test/mysql-test/type_test/type_test_double-debug.result
index 975decca11e..ba4c8ea7b6a 100644
--- a/plugin/type_test/mysql-test/type_test/type_test_double-debug.result
+++ b/plugin/type_test/mysql-test/type_test/type_test_double-debug.result
@@ -8,14 +8,14 @@ SET @@debug_dbug="+d,frm_data_type_info";
 CREATE TABLE t1 (a TEST_DOUBLE);
 Warnings:
 Note	1105	build_frm_image: Field data type info length: 13
-Note	1105	DBUG: [0] name='a' type_info='test_double'
+Note	1105	DBUG: [0] name='a' type_info='test_dou...'
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` test_double DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 Warnings:
-Note	1105	DBUG: [0] name='a' type_info='test_double'
+Note	1105	DBUG: [0] name='a' type_info='test_dou...'
 DROP TABLE t1;
 SET @@debug_dbug=@old_debug_dbug;
 # Testing what happens on failure to resolve a type handler by name
@@ -24,7 +24,7 @@ SET @@debug_dbug="+d,frm_data_type_info";
 CREATE TABLE t1 (a TEST_DOUBLE);
 Warnings:
 Note	1105	build_frm_image: Field data type info length: 13
-Note	1105	DBUG: [0] name='a' type_info='test_double'
+Note	1105	DBUG: [0] name='a' type_info='test_dou...'
 FLUSH TABLES;
 SET @@debug_dbug="+d,emulate_handler_by_name_or_error_failure";
 SHOW CREATE TABLE t1;
diff --git a/plugin/type_test/mysql-test/type_test/type_test_int8-debug.result b/plugin/type_test/mysql-test/type_test/type_test_int8-debug.result
index 952a63c8476..e348b5b5f18 100644
--- a/plugin/type_test/mysql-test/type_test/type_test_int8-debug.result
+++ b/plugin/type_test/mysql-test/type_test/type_test_int8-debug.result
@@ -8,14 +8,14 @@ SET @@debug_dbug="+d,frm_data_type_info";
 CREATE TABLE t1 (a TEST_INT8);
 Warnings:
 Note	1105	build_frm_image: Field data type info length: 11
-Note	1105	DBUG: [0] name='a' type_info='test_int8'
+Note	1105	DBUG: [0] name='a' type_info='test_i...'
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` test_int8(20) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 Warnings:
-Note	1105	DBUG: [0] name='a' type_info='test_int8'
+Note	1105	DBUG: [0] name='a' type_info='test_i...'
 DROP TABLE t1;
 SET @@debug_dbug=@old_debug_dbug;
 # Testing what happens on failure to resolve a type handler by name
@@ -24,7 +24,7 @@ SET @@debug_dbug="+d,frm_data_type_info";
 CREATE TABLE t1 (a TEST_INT8);
 Warnings:
 Note	1105	build_frm_image: Field data type info length: 11
-Note	1105	DBUG: [0] name='a' type_info='test_int8'
+Note	1105	DBUG: [0] name='a' type_info='test_i...'
 FLUSH TABLES;
 SET @@debug_dbug="+d,emulate_handler_by_name_or_error_failure";
 SHOW CREATE TABLE t1;