diff options
| author | Sean Griffin <sean@seantheprogrammer.com> | 2015-03-19 09:16:44 -0600 |
|---|---|---|
| committer | Sean Griffin <sean@seantheprogrammer.com> | 2015-03-19 09:16:44 -0600 |
| commit | 67dfe3f3a9dac893fad72651dfc2d7b2b091feb7 (patch) | |
| tree | 80c8cf207ced82711fd28aa1cd2c1512a043a2e8 /activerecord/lib | |
| parent | 505ad9af3e6daf7de1ed870ad0d0c7aea8aff058 (diff) | |
| parent | 7f90d975216f50ea284e84a67457bcbe5076765d (diff) | |
| download | rails-67dfe3f3a9dac893fad72651dfc2d7b2b091feb7.tar.gz rails-67dfe3f3a9dac893fad72651dfc2d7b2b091feb7.tar.bz2 rails-67dfe3f3a9dac893fad72651dfc2d7b2b091feb7.zip | |
Merge pull request #19412 from amitsuroliya/mysql_adapter_doc
Updated MySQL documentation link to latest version MySQL 5.6 [ci skip]
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/mysql_adapter.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb index 09579884df..45b935f1d6 100644 --- a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb @@ -56,9 +56,9 @@ module ActiveRecord # * <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>:reconnect</tt> - Defaults to false (See MySQL documentation: http://dev.mysql.com/doc/refman/5.0/en/auto-reconnect.html). + # * <tt>:reconnect</tt> - Defaults to false (See MySQL documentation: http://dev.mysql.com/doc/refman/5.6/en/auto-reconnect.html). # * <tt>:strict</tt> - Defaults to true. Enable STRICT_ALL_TABLES. (See MySQL documentation: http://dev.mysql.com/doc/refman/5.6/en/sql-mode.html) - # * <tt>:variables</tt> - (Optional) A hash session variables to send as <tt>SET @@SESSION.key = value</tt> on each database connection. Use the value +:default+ to set a variable to its DEFAULT value. (See MySQL documentation: http://dev.mysql.com/doc/refman/5.0/en/set-statement.html). + # * <tt>:variables</tt> - (Optional) A hash session variables to send as <tt>SET @@SESSION.key = value</tt> on each database connection. Use the value +:default+ to set a variable to its DEFAULT value. (See MySQL documentation: http://dev.mysql.com/doc/refman/5.6/en/set-statement.html). # * <tt>:sslca</tt> - Necessary to use MySQL with an SSL connection. # * <tt>:sslkey</tt> - Necessary to use MySQL with an SSL connection. # * <tt>:sslcert</tt> - Necessary to use MySQL with an SSL connection. |