Skip to content

Commit 2fa78c1

Browse files
author
Tor Didriksen
committed
Bug #34323188 Remove 'utf8' from man pages, use utf8mb4 or utf8mb3 instead
Change-Id: I86ecc82f8ef320ffc7248fffdb1ed76b9173ae97
1 parent 4774934 commit 2fa78c1

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

man/mysql.1

+6-6
Original file line numberDiff line numberDiff line change
@@ -4196,7 +4196,7 @@ ignores Unicode byte order mark (BOM) characters at the beginning of input files
41964196
to change its default character set\&. To do that, invoke
41974197
\fBmysql\fR
41984198
with an option such as
4199-
\fB\-\-default\-character\-set=utf8\fR\&.
4199+
\fB\-\-default\-character\-set=utf8mb4\fR\&.
42004200
.PP
42014201
For more information about batch mode, see
42024202
Section\ \&3.5, \(lqUsing mysql in Batch Mode\(rq\&.
@@ -4443,9 +4443,9 @@ Go to the console window properties, select the font tab, and choose Lucida Cons
44434443
Execute
44444444
\fBmysql\&.exe\fR
44454445
with the
4446-
\fB\-\-default\-character\-set=utf8\fR
4446+
\fB\-\-default\-character\-set=utf8mb4\fR
44474447
(or
4448-
utf8mb4) option\&. This option is necessary because
4448+
utf8mb3) option\&. This option is necessary because
44494449
utf16le
44504450
is one of the character sets that cannot be used as the client character set\&. See
44514451
the section called \(lqImpermissible Client Character Sets\(rq\&.
@@ -4458,9 +4458,9 @@ uses the Windows APIs to communicate with the console using UTF\-16LE, and commu
44584458
To avoid those steps each time you run
44594459
\fBmysql\fR, you can create a shortcut that invokes
44604460
\fBmysql\&.exe\fR\&. The shortcut should set the console font to Lucida Console or some other compatible Unicode font, and pass the
4461-
\fB\-\-default\-character\-set=utf8\fR
4461+
\fB\-\-default\-character\-set=utf8mb4\fR
44624462
(or
4463-
utf8mb4) option to
4463+
utf8mb3) option to
44644464
\fBmysql\&.exe\fR\&.
44654465
.PP
44664466
Alternatively, create a shortcut that only sets the console font, and set the character set in the
@@ -4474,7 +4474,7 @@ file:
44744474
.\}
44754475
.nf
44764476
[mysql]
4477-
default\-character\-set=utf8
4477+
default\-character\-set=utf8mb4
44784478
.fi
44794479
.if n \{\
44804480
.RE

man/mysqldump.1

+1-1
Original file line numberDiff line numberDiff line change
@@ -1471,7 +1471,7 @@ as the default character set\&. See
14711471
Section\ \&10.15, \(lqCharacter Set Configuration\(rq\&. If no character set is specified,
14721472
\fBmysqldump\fR
14731473
uses
1474-
utf8\&.
1474+
utf8mb4\&.
14751475
.RE
14761476
.sp
14771477
.RS 4

man/mysqlpump.1

+1-1
Original file line numberDiff line numberDiff line change
@@ -829,7 +829,7 @@ as the default character set\&. See
829829
Section\ \&10.15, \(lqCharacter Set Configuration\(rq\&. If no character set is specified,
830830
\fBmysqlpump\fR
831831
uses
832-
utf8\&.
832+
utf8mb4\&.
833833
.RE
834834
.sp
835835
.RS 4

0 commit comments

Comments
 (0)