From 6bdcc0cfaf9e3988a27bafdaa871c930bd4a31cf Mon Sep 17 00:00:00 2001
From: Marcel Molina <marcel@vernix.org>
Date: Sun, 6 May 2007 04:41:45 +0000
Subject: Add documentation for :encoding option to mysql adapter. Closes #8219
 [marclove]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6678 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
---
 activerecord/lib/active_record/connection_adapters/mysql_adapter.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'activerecord/lib/active_record/connection_adapters/mysql_adapter.rb')

diff --git a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
index c0a09d7a54..8617191ac5 100755
--- a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
@@ -129,6 +129,7 @@ module ActiveRecord
     # * <tt>:username</tt> -- Defaults to root
     # * <tt>:password</tt> -- Defaults to nothing
     # * <tt>:database</tt> -- The name of the database. No default, must be provided.
+    # * <tt>:encoding</tt> -- (Optional) Sets the client encoding by executing "SET NAMES <encoding>" after connection
     # * <tt>:sslkey</tt> -- Necessary to use MySQL with an SSL connection
     # * <tt>:sslcert</tt> -- Necessary to use MySQL with an SSL connection
     # * <tt>:sslcapath</tt> -- Necessary to use MySQL with an SSL connection
-- 
cgit v1.2.3