aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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*