diff options
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/mysql_adapter.rb')
| -rwxr-xr-x | activerecord/lib/active_record/connection_adapters/mysql_adapter.rb | 1 |
1 files changed, 1 insertions, 0 deletions
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 |