summaryrefslogtreecommitdiff
path: root/mysql-test/main/plugin.result
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2021-10-27 10:06:02 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2021-10-27 10:06:02 +0300
commitd4a89b92629328f7e18b7e0595f88f24c811c096 (patch)
tree73a50fe352614639795cb006e162f257f6a6563b /mysql-test/main/plugin.result
parent58fe6b47d4e8580e370a094d8f5768d053aa52c1 (diff)
parent44f9736e0b5608920199e3f51cfa72b597a88e4f (diff)
downloadmariadb-git-d4a89b92629328f7e18b7e0595f88f24c811c096.tar.gz
Merge 10.5 into 10.6
Diffstat (limited to 'mysql-test/main/plugin.result')
-rw-r--r--mysql-test/main/plugin.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/main/plugin.result b/mysql-test/main/plugin.result
index f7571740f31..2f848309c48 100644
--- a/mysql-test/main/plugin.result
+++ b/mysql-test/main/plugin.result
@@ -320,7 +320,7 @@ select plugin_name from information_schema.plugins where plugin_library like 'ha
plugin_name
set names utf8;
select convert('admin𝌆' using utf8);
-convert('admin𝌆' using utf8)
+convert('admin\xF0\x9D\x8C\x86' using utf8)
admin????
Warnings:
Warning 1300 Invalid utf8mb3 character string: '\xF0\x9D\x8C\x86'