diff options
| author | Yves Senn <yves.senn@gmail.com> | 2015-03-19 16:00:41 +0100 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2015-03-19 16:00:41 +0100 |
| commit | ac291b76ea770b5795c767f2f74a8d0b33744809 (patch) | |
| tree | 4822acf53b2f4c2456a15186bdeb17b84b1d13f1 /activerecord | |
| parent | 7bdc7635b885e473f6a577264fd8efad1c02174f (diff) | |
| parent | b4e550ce46e26514f8370998da1ddcab7e79d797 (diff) | |
| download | rails-ac291b76ea770b5795c767f2f74a8d0b33744809.tar.gz rails-ac291b76ea770b5795c767f2f74a8d0b33744809.tar.bz2 rails-ac291b76ea770b5795c767f2f74a8d0b33744809.zip | |
Merge pull request #19407 from amitsuroliya/mysql_adapter_doc
Updated MySQL documentation link for STRICT_ALL_TABLES [ci skip]
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/mysql_adapter.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb index 64985ee933..09579884df 100644 --- a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb @@ -57,7 +57,7 @@ module ActiveRecord # * <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>:strict</tt> - Defaults to true. Enable STRICT_ALL_TABLES. (See MySQL documentation: http://dev.mysql.com/doc/refman/5.0/en/server-sql-mode.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>:sslca</tt> - Necessary to use MySQL with an SSL connection. # * <tt>:sslkey</tt> - Necessary to use MySQL with an SSL connection. |