MDEV-8334: Rename utf8 to utf8mb3

This patch changes the main name of 3 byte character set from utf8 to
utf8mb3. New old_mode UTF8_IS_UTF8MB3 is added and set TRUE by default,
so that utf8 would mean utf8mb3. If not set, utf8 would mean utf8mb4.

1 files changed, 17 insertions, 17 deletions

diff --git a/mysql-test/main/sp-row.result b/mysql-test/main/sp-row.result
index 7c257297934..3751b70b260 100644
--- a/mysql-test/main/sp-row.result
+++ b/mysql-test/main/sp-row.result
@@ -743,9 +743,9 @@ CALL p1();
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `rec1.a` varchar(10) CHARACTER SET utf8 DEFAULT NULL,
-  `rec2.a` varchar(10) CHARACTER SET utf8 DEFAULT NULL,
-  `rec3.a` varchar(10) CHARACTER SET utf8 DEFAULT NULL
+  `rec1.a` varchar(10) CHARACTER SET utf8mb3 DEFAULT NULL,
+  `rec2.a` varchar(10) CHARACTER SET utf8mb3 DEFAULT NULL,
+  `rec3.a` varchar(10) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t1;
 DROP PROCEDURE p1;
@@ -1835,8 +1835,8 @@ CALL p1();
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `var` char(10) CHARACTER SET utf8 DEFAULT NULL,
-  `rec.var` char(10) CHARACTER SET utf8 DEFAULT NULL
+  `var` char(10) CHARACTER SET utf8mb3 DEFAULT NULL,
+  `rec.var` char(10) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t1;
 DROP PROCEDURE p1;
@@ -1875,8 +1875,8 @@ CALL p1();
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `var` varchar(10) CHARACTER SET utf8 DEFAULT NULL,
-  `rec.var` varchar(10) CHARACTER SET utf8 DEFAULT NULL
+  `var` varchar(10) CHARACTER SET utf8mb3 DEFAULT NULL,
+  `rec.var` varchar(10) CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t1;
 DROP PROCEDURE p1;
@@ -1885,8 +1885,8 @@ CALL p1();
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `var` varchar(10) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
-  `rec.var` varchar(10) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL
+  `var` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin DEFAULT NULL,
+  `rec.var` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t1;
 DROP PROCEDURE p1;
@@ -2084,8 +2084,8 @@ CALL p1();
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `var` text CHARACTER SET utf8 DEFAULT NULL,
-  `rec.var` text CHARACTER SET utf8 DEFAULT NULL
+  `var` text CHARACTER SET utf8mb3 DEFAULT NULL,
+  `rec.var` text CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t1;
 DROP PROCEDURE p1;
@@ -2094,8 +2094,8 @@ CALL p1();
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `var` tinytext CHARACTER SET utf8 DEFAULT NULL,
-  `rec.var` tinytext CHARACTER SET utf8 DEFAULT NULL
+  `var` tinytext CHARACTER SET utf8mb3 DEFAULT NULL,
+  `rec.var` tinytext CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t1;
 DROP PROCEDURE p1;
@@ -2104,8 +2104,8 @@ CALL p1();
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `var` mediumtext CHARACTER SET utf8 DEFAULT NULL,
-  `rec.var` mediumtext CHARACTER SET utf8 DEFAULT NULL
+  `var` mediumtext CHARACTER SET utf8mb3 DEFAULT NULL,
+  `rec.var` mediumtext CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t1;
 DROP PROCEDURE p1;
@@ -2114,8 +2114,8 @@ CALL p1();
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `var` longtext CHARACTER SET utf8 DEFAULT NULL,
-  `rec.var` longtext CHARACTER SET utf8 DEFAULT NULL
+  `var` longtext CHARACTER SET utf8mb3 DEFAULT NULL,
+  `rec.var` longtext CHARACTER SET utf8mb3 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t1;
 DROP PROCEDURE p1;