Fixes to mysql 2.0 conversion doc issue2551115 Werner Hunger

Change default chartype from utf-8 to utf8mb4 to allow emojis etc
to be represented.

Author: rouilj

doc/upgrading.txt

@@ -77,10 +77,10 @@ are more changes required for running roundup 2.0 if you choose to use
 python3. See `Python 3 support`_.
 
 In an upgraded ``config.ini`` (see next section) the ``[rdbms]``
-section has a key ``mysql_charset`` set by default to ``utf-8``.
+section has a key ``mysql_charset`` set by default to ``utf8mb4``.
 
-It should be possible to change utf-8 to any mysql charset. So if you
-know what charset is enabled (e.g. via a setting in ~roundup/.my.cnf,
+It should be possible to change ``utf8mb4`` to any mysql charset. So
+if you know what charset is enabled (e.g. via a setting in ~roundup/.my.cnf,
 or the default charset for the database) you can set it in
 ``config.ini`` and not need to covert the database. However the
 underlying issues with misconverted data and bad searches will still

roundup/configuration.py

@@ -1048,7 +1048,7 @@ def str2value(self, value):
         (NullableOption, 'read_default_group', 'roundup',
             "Name of the group to use in the MySQL defaults file (.my.cnf).\n"
             "Only used in MySQL connections."),
-        (Option, 'mysql_charset', 'utf8',
+        (Option, 'mysql_charset', 'utf8mb4',
             "Charset to use for mysql connection,\n"
             "use 'default' for the mysql default, no charset option\n"
             "is used when creating the connection in that case.\n"