aboutsummaryrefslogtreecommitdiffstats
path: root/guides/source
diff options
context:
space:
mode:
authorKasper Timm Hansen <kaspth@gmail.com>2016-04-24 14:41:53 +0200
committerKasper Timm Hansen <kaspth@gmail.com>2016-04-24 14:41:53 +0200
commit8f22006c6923ef4083936af95be1f412edeee0ee (patch)
tree436af21130aae59e81fcb7c25307b4dfba5599e8 /guides/source
parente9331c646fa3eaf59ba934b3dd4727e5bb1eb1aa (diff)
parent9a94f022dd5d2cd30fdb04811dfcc2e4f73bb31b (diff)
downloadrails-8f22006c6923ef4083936af95be1f412edeee0ee.tar.gz
rails-8f22006c6923ef4083936af95be1f412edeee0ee.tar.bz2
rails-8f22006c6923ef4083936af95be1f412edeee0ee.zip
Merge pull request #24712 from vipulnsward/23461-release-notes
Add #23461 to release notes
Diffstat (limited to 'guides/source')
-rw-r--r--guides/source/5_0_release_notes.md11
1 files changed, 8 insertions, 3 deletions
diff --git a/guides/source/5_0_release_notes.md b/guides/source/5_0_release_notes.md
index 5f14a5a3f9..9c07a2f686 100644
--- a/guides/source/5_0_release_notes.md
+++ b/guides/source/5_0_release_notes.md
@@ -588,9 +588,14 @@ Please refer to the [Changelog][active-record] for detailed changes.
* Added ActiveRecord `#second_to_last` and `#third_to_last` methods.
([Pull Request](https://github.com/rails/rails/pull/23583))
-* Added ability to annotate database objects (tables, columns, indexes)
- with comments stored in database metadata for PostgreSQL & MySQL.
- ([Pull Request](https://github.com/rails/rails/pull/22911))
+* Added ability to annotate database objects (tables, columns, indexes)
+ with comments stored in database metadata for PostgreSQL & MySQL.
+ ([Pull Request](https://github.com/rails/rails/pull/22911))
+
+* Added prepared statements support to `mysql2` adapter, for mysql2 0.4.4+,
+ Previously this was only supported on the deprecated `mysql` legacy adapter.
+ To enable, set `prepared_statements: true` in config/database.yml.
+ ([Pull Request](https://github.com/rails/rails/pull/23461))
Active Model
------------