`bytes_margin` is only needed when `previous_packet` exists

1 files changed, 2 insertions, 5 deletions

diff --git a/activerecord/lib/active_record/connection_adapters/mysql/database_statements.rb b/activerecord/lib/active_record/connection_adapters/mysql/database_statements.rb
index 1199c0ad1b..a14394fe04 100644
--- a/activerecord/lib/active_record/connection_adapters/mysql/database_statements.rb
+++ b/activerecord/lib/active_record/connection_adapters/mysql/database_statements.rb
@@ -145,15 +145,12 @@ module ActiveRecord
             elsif previous_packet.nil?
               true
             else
-              (current_packet.bytesize + previous_packet.bytesize) > max_allowed_packet
+              (current_packet.bytesize + previous_packet.bytesize + 2) > max_allowed_packet
             end
           end
 
           def max_allowed_packet
-            @max_allowed_packet ||= begin
-              bytes_margin = 2
-              show_variable("max_allowed_packet") - bytes_margin
-            end
+            @max_allowed_packet ||= show_variable("max_allowed_packet")
           end
 
           def exec_stmt_and_free(sql, name, binds, cache_stmt: false)