aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorPrathamesh Sonpatki <csonpatki@gmail.com>2017-08-28 11:40:29 +0530
committerPrathamesh Sonpatki <csonpatki@gmail.com>2017-08-28 11:40:29 +0530
commit9fb18fc4d6d57b2fe8c3858b4a4ef63e05784735 (patch)
treee722114ff6dc5841230fab18bbefc39c3bcb33a3 /activerecord
parent6f1c18308ebffc97d51440cdeed7be71de58f26a (diff)
downloadrails-9fb18fc4d6d57b2fe8c3858b4a4ef63e05784735.tar.gz
rails-9fb18fc4d6d57b2fe8c3858b4a4ef63e05784735.tar.bz2
rails-9fb18fc4d6d57b2fe8c3858b4a4ef63e05784735.zip
Added CHANGELOG for #30360 [ci skip]
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/CHANGELOG.md5
1 files changed, 5 insertions, 0 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 1a1a3a8092..b421fedc96 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,3 +1,8 @@
+* Add new error class `TransactionTimeout` for MySQL adapter which will be raised
+ when lock wait time expires.
+
+ *Gabriel Courtemanche*
+
* Remove deprecated `#migration_keys`.
*Ryuta Kamizono*