diff options
Diffstat (limited to 'plugin')
8 files changed, 14 insertions, 14 deletions
diff --git a/plugin/disks/mysql-test/disks/disks.result b/plugin/disks/mysql-test/disks/disks.result index 0b4ee6249aa..9beab2f30d1 100644 --- a/plugin/disks/mysql-test/disks/disks.result +++ b/plugin/disks/mysql-test/disks/disks.result @@ -6,7 +6,7 @@ DISKS CREATE TEMPORARY TABLE `DISKS` ( `Total` bigint(32) NOT NULL DEFAULT 0, `Used` bigint(32) NOT NULL DEFAULT 0, `Available` bigint(32) NOT NULL DEFAULT 0 -) ENGINE=MEMORY DEFAULT CHARSET=utf8 +) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 select sum(Total) > sum(Available), sum(Total)>sum(Used) from information_schema.disks; sum(Total) > sum(Available) sum(Total)>sum(Used) 1 1 diff --git a/plugin/handler_socket/client/hslongrun.cpp b/plugin/handler_socket/client/hslongrun.cpp index b7c02951340..7f88d48fff2 100644 --- a/plugin/handler_socket/client/hslongrun.cpp +++ b/plugin/handler_socket/client/hslongrun.cpp @@ -897,7 +897,7 @@ hs_longrun_init_table(const config& conf, int num_prepare, "v1 varchar(32) not null," "v2 varchar(32) not null," "v3 varchar(32) not null" - ") character set utf8 collate utf8_bin engine = innodb"); + ") character set utf8mb3 collate utf8_bin engine = innodb"); for (int i = 0; i < num_prepare; ++i) { const std::string i_str = to_stdstring(i); const std::string v1 = "pv1_" + i_str; diff --git a/plugin/handler_socket/client/hstest.pl b/plugin/handler_socket/client/hstest.pl index 1363e153c44..5924d8a0ce5 100755 --- a/plugin/handler_socket/client/hstest.pl +++ b/plugin/handler_socket/client/hstest.pl @@ -52,7 +52,7 @@ for my $action (@actions) { "k $keytype primary key" . ",v varchar(32) not null" . $moreflds . - ") character set utf8 collate utf8_bin " . + ") character set utf8mb3 collate utf8_bin " . "engine = $engine"); } elsif ($action eq "insert") { print("INSERT $db.$table tablesize=$tablesize\n"); diff --git a/plugin/query_response_time/mysql-test/query_response_time/basic.result b/plugin/query_response_time/mysql-test/query_response_time/basic.result index d2de1b23e5f..5bf357375b9 100644 --- a/plugin/query_response_time/mysql-test/query_response_time/basic.result +++ b/plugin/query_response_time/mysql-test/query_response_time/basic.result @@ -9,7 +9,7 @@ QUERY_RESPONSE_TIME CREATE TEMPORARY TABLE `QUERY_RESPONSE_TIME` ( `TIME` varchar(14) NOT NULL DEFAULT '', `COUNT` int(11) unsigned NOT NULL DEFAULT 0, `TOTAL` varchar(14) NOT NULL DEFAULT '' -) ENGINE=MEMORY DEFAULT CHARSET=utf8 +) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 SELECT PLUGIN_NAME, PLUGIN_VERSION, PLUGIN_TYPE, PLUGIN_AUTHOR, PLUGIN_DESCRIPTION, PLUGIN_LICENSE, PLUGIN_MATURITY FROM INFORMATION_SCHEMA.PLUGINS WHERE PLUGIN_NAME LIKE 'query_response_time%';; PLUGIN_NAME QUERY_RESPONSE_TIME PLUGIN_VERSION 1.0 diff --git a/plugin/type_inet/mysql-test/type_inet/binlog_table_map_optional_metadata_type_inet6.result b/plugin/type_inet/mysql-test/type_inet/binlog_table_map_optional_metadata_type_inet6.result index 7911407b8f7..79356bee6e2 100644 --- a/plugin/type_inet/mysql-test/type_inet/binlog_table_map_optional_metadata_type_inet6.result +++ b/plugin/type_inet/mysql-test/type_inet/binlog_table_map_optional_metadata_type_inet6.result @@ -42,7 +42,7 @@ CREATE TABLE t1 (a INET6, b CHAR(16) CHARACTER SET latin1, c CHAR(16) CHARACTER INSERT INTO t1 VALUES('::','',''); # Columns(BINARY(16), # CHAR(16) CHARSET latin1 COLLATE latin1_swedish_ci, -# CHAR(16) CHARSET utf8 COLLATE utf8_general_ci) +# CHAR(16) CHARSET utf8mb3 COLLATE utf8mb3_general_ci) DROP TABLE t1; RESET MASTER; RESET MASTER; @@ -51,7 +51,7 @@ CREATE TABLE t1 (a INET6, b CHAR(16) CHARACTER SET latin1, c CHAR(16) CHARACTER INSERT INTO t1 VALUES('::','',''); # Columns(`a` BINARY(16), # `b` CHAR(16) CHARSET latin1 COLLATE latin1_swedish_ci, -# `c` CHAR(16) CHARSET utf8 COLLATE utf8_general_ci) +# `c` CHAR(16) CHARSET utf8mb3 COLLATE utf8mb3_general_ci) DROP TABLE t1; RESET MASTER; SET GLOBAL binlog_row_metadata = DEFAULT; diff --git a/plugin/type_inet/mysql-test/type_inet/type_inet6.result b/plugin/type_inet/mysql-test/type_inet/type_inet6.result index da949481337..55ad671f90b 100644 --- a/plugin/type_inet/mysql-test/type_inet/type_inet6.result +++ b/plugin/type_inet/mysql-test/type_inet/type_inet6.result @@ -996,9 +996,9 @@ FROM t1; SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( - `c1` varchar(40) CHARACTER SET utf8 DEFAULT NULL, - `c2` varchar(40) CHARACTER SET utf8 DEFAULT NULL, - `c3` varchar(40) CHARACTER SET utf8 DEFAULT NULL + `c1` varchar(40) CHARACTER SET utf8mb3 DEFAULT NULL, + `c2` varchar(40) CHARACTER SET utf8mb3 DEFAULT NULL, + `c3` varchar(40) CHARACTER SET utf8mb3 DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 DROP TABLE t2; CREATE TABLE t2 AS SELECT diff --git a/plugin/user_variables/mysql-test/user_variables/basic.result b/plugin/user_variables/mysql-test/user_variables/basic.result index a4d01957830..6d59233c993 100644 --- a/plugin/user_variables/mysql-test/user_variables/basic.result +++ b/plugin/user_variables/mysql-test/user_variables/basic.result @@ -15,7 +15,7 @@ user_variables CREATE TEMPORARY TABLE `user_variables` ( `VARIABLE_VALUE` varchar(2048) DEFAULT NULL, `VARIABLE_TYPE` varchar(64) NOT NULL DEFAULT '', `CHARACTER_SET_NAME` varchar(32) DEFAULT NULL -) ENGINE=MEMORY DEFAULT CHARSET=utf8 +) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 FLUSH USER_VARIABLES; SELECT COUNT(*) FROM INFORMATION_SCHEMA.USER_VARIABLES; COUNT(*) @@ -44,7 +44,7 @@ null_var NULL VARCHAR binary str_var Value of string variable VARCHAR latin1 time_var 2016-02-25 VARCHAR latin1 uint_var 2 INT UNSIGNED latin1 -utf8str_var UTF8 string value VARCHAR utf8 +utf8str_var UTF8 string value VARCHAR utf8mb3 SHOW USER_VARIABLES; Variable_name Value Value of variable with empty name diff --git a/plugin/win_auth_client/common.cc b/plugin/win_auth_client/common.cc index 8b7319252ac..ddd34aec7da 100644 --- a/plugin/win_auth_client/common.cc +++ b/plugin/win_auth_client/common.cc @@ -384,7 +384,7 @@ char* wchar_to_utf8(const wchar_t *string, size_t *len) buf= (char*)malloc(buf_len + 1); if (!buf) { - DBUG_PRINT("error",("Out of memory when converting string '%S' to utf8", + DBUG_PRINT("error",("Out of memory when converting string '%S' to utf8mb3", string)); return NULL; } @@ -408,7 +408,7 @@ char* wchar_to_utf8(const wchar_t *string, size_t *len) #ifndef DBUG_OFF Error_message_buf error_buf; - DBUG_PRINT("error", ("Could not convert string '%S' to utf8" + DBUG_PRINT("error", ("Could not convert string '%S' to utf8mb3" ", WideCharToMultiByte() failed with error %X (%s)", string, GetLastError(), get_last_error_message(error_buf))); @@ -451,7 +451,7 @@ wchar_t* utf8_to_wchar(const char *string, size_t *len) if (!buf) { - DBUG_PRINT("error",("Out of memory when converting utf8 string '%s'" + DBUG_PRINT("error",("Out of memory when converting utf8mb3 string '%s'" " to wide-char representation", string)); return NULL; } |