summaryrefslogtreecommitdiff
path: root/configs
diff options
context:
space:
mode:
authorErin Spiceland <erin@thespicelands.com>2010-10-08 16:27:31 +0000
committerErin Spiceland <erin@thespicelands.com>2010-10-08 16:27:31 +0000
commit89c3bd4d1301d42241438e9d4705156005b79ec4 (patch)
tree7e2be6d96f7661f8a3212c3ff8e92c13387ab524 /configs
parent3d801ab964486f69216d0ed42e9c159a543e57e0 (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: https://origsvn.digium.com/svn/asterisk/trunk@290939 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'configs')
-rw-r--r--configs/res_config_mysql.conf.sample5
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