diff options
author | espiceland <espiceland@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-10-08 15:34:34 +0000 |
---|---|---|
committer | espiceland <espiceland@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-10-08 15:34:34 +0000 |
commit | 2d95d531d08c5807ca41d955567c433330697a1a (patch) | |
tree | b7496c3a7d52f3ea66d586b01882ddd2879dd6a5 /configs | |
parent | b4f6c37e03ec0299854b19552981633291f022ec (diff) |
Add option to res_config_mysql and app_mysql to specify a character set that MySQL should use.
(closes issue 17948)
Reported by qmax.
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.8@290937 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'configs')
-rw-r--r-- | configs/res_config_mysql.conf.sample | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/configs/res_config_mysql.conf.sample b/configs/res_config_mysql.conf.sample index dfbbf49a8..79eaf97d2 100644 --- a/configs/res_config_mysql.conf.sample +++ b/configs/res_config_mysql.conf.sample @@ -4,7 +4,9 @@ ; The value of dbhost may be either a hostname or an IP address. ; If dbhost is commented out or the string "localhost", a connection ; to the local host is assumed and dbsock is used instead of TCP/IP -; to connect to the server. +; to connect to the server. If no dbcharset is specified, the connection +; is made with no extra charset configurations sent to MySQL, leaving all +; configured MySQL charset options and defaults untouched. ; ; Multiple database contexts may be configured, with the caveat that ; all context names should be unique and must not contain the slash ('/') @@ -37,4 +39,5 @@ ;dbpass = mypass ;dbport = 3306 ;dbsock = /tmp/mysql.sock +;dbcharset = latin1 ;requirements=warn ; or createclose or createchar |