diff options
| author | Sean Griffin <sean@seantheprogrammer.com> | 2017-01-03 11:19:47 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-03 11:19:47 -0500 |
| commit | 0d8069d36543947dc948cbbd02c8214c352b7aad (patch) | |
| tree | a92328f57c38d3c7053374239498dc0e8e7eae56 | |
| parent | 948cebd017b6fd02b6be0d9d469adc8a297fb249 (diff) | |
| parent | ecca3d6052d0dc104274a3d6f7da5fd7b216061b (diff) | |
| download | rails-0d8069d36543947dc948cbbd02c8214c352b7aad.tar.gz rails-0d8069d36543947dc948cbbd02c8214c352b7aad.tar.bz2 rails-0d8069d36543947dc948cbbd02c8214c352b7aad.zip | |
Merge pull request #27435 from kamipo/follow_up_25307
Active Record supports MySQL >= 5.1.10
3 files changed, 4 insertions, 4 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb index 1c3d10c15d..01cd1e5446 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb @@ -67,8 +67,8 @@ module ActiveRecord @statements = StatementPool.new(self.class.type_cast_config_to_integer(config[:statement_limit])) - if version < "5.0.0" - raise "Your version of MySQL (#{full_version.match(/^\d+\.\d+\.\d+/)[0]}) is too old. Active Record supports MySQL >= 5.0." + if version < "5.1.10" + raise "Your version of MySQL (#{full_version.match(/^\d+\.\d+\.\d+/)[0]}) is too old. Active Record supports MySQL >= 5.1.10." end end diff --git a/railties/lib/rails/generators/rails/app/templates/config/databases/jdbcmysql.yml b/railties/lib/rails/generators/rails/app/templates/config/databases/jdbcmysql.yml index a2b2a64ba6..8bc8735a8e 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/databases/jdbcmysql.yml +++ b/railties/lib/rails/generators/rails/app/templates/config/databases/jdbcmysql.yml @@ -1,4 +1,4 @@ -# MySQL. Versions 5.0 and up are supported. +# MySQL. Versions 5.1.10 and up are supported. # # Install the MySQL driver: # gem install activerecord-jdbcmysql-adapter diff --git a/railties/lib/rails/generators/rails/app/templates/config/databases/mysql.yml b/railties/lib/rails/generators/rails/app/templates/config/databases/mysql.yml index d987cf303b..269af1470d 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/databases/mysql.yml +++ b/railties/lib/rails/generators/rails/app/templates/config/databases/mysql.yml @@ -1,4 +1,4 @@ -# MySQL. Versions 5.0 and up are supported. +# MySQL. Versions 5.1.10 and up are supported. # # Install the MySQL driver # gem install mysql2 |