From 4f05308b37e11b8b4c04a7e08384148783527777 Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Fri, 24 Aug 2018 10:21:34 -0400 Subject: [PATCH] 2018-06-24 Fred Gleason * Changed the default value of the 'Charset=' parameter in the [mySQL] section of rd.conf(5) from 'latin1' to 'utf8'. * Changed the default value of the 'Collation=' parameter in the [mySQL] section of rd.conf(5) from 'latin1_swedish_ci' to 'utf8_general_ci'. --- ChangeLog | 6 ++++++ conf/rd.conf-sample | 8 +++++--- lib/rd.h | 4 ++-- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6e166e93..eed2be38 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17515,3 +17515,9 @@ 2018-06-23 Fred Gleason * Fixed a regression that broke processing of the 'Serial Out' ['SO'] and 'UDP Out' ['UO'] RMLs. +2018-06-24 Fred Gleason + * Changed the default value of the 'Charset=' parameter in the + [mySQL] section of rd.conf(5) from 'latin1' to 'utf8'. + * Changed the default value of the 'Collation=' parameter in the + [mySQL] section of rd.conf(5) from 'latin1_swedish_ci' to + 'utf8_general_ci'. diff --git a/conf/rd.conf-sample b/conf/rd.conf-sample index 8111e23e..a40e859b 100644 --- a/conf/rd.conf-sample +++ b/conf/rd.conf-sample @@ -31,9 +31,11 @@ HeartbeatInterval=360 ; The following three settings control the attributes of new DB tables ; created by Rivendell. -Engine=MyISAM -Charset=utf8 -Collation=utf8_general_ci +;Engine=MyISAM +; 'Charset' and 'Collation' should *not* changed except for development +; purposes. +;Charset=utf8 +;Collation=utf8_general_ci [AudioStore] MountSource= diff --git a/lib/rd.h b/lib/rd.h index 16ad9109..527f2c16 100644 --- a/lib/rd.h +++ b/lib/rd.h @@ -62,8 +62,8 @@ #define DEFAULT_MYSQL_DRIVER "QMYSQL3" #define DEFAULT_MYSQL_HEARTBEAT_INTERVAL 360 #define DEFAULT_MYSQL_ENGINE "MyISAM" -#define DEFAULT_MYSQL_CHARSET "latin1" -#define DEFAULT_MYSQL_COLLATION "latin1_swedish_ci" +#define DEFAULT_MYSQL_CHARSET "utf8" +#define DEFAULT_MYSQL_COLLATION "utf8_general_ci" #define MYSQL_BUILTIN_DATABASE "mysql" #define POSTGRESQL_BUILTIN_DATABASE "template1"