Ticket #9223: support_read_timeout_in_mysql.patch

activerecord/lib/active_record/connection_adapters/mysql_adapter.rb

@@ -127 +127 @@
-    # * <tt>:sslcert</tt> -- Necessary to use MySQL with an SSL connection
-    # * <tt>:sslcapath</tt> -- Necessary to use MySQL with an SSL connection
-    # * <tt>:sslcipher</tt> -- Necessary to use MySQL with an SSL connection
+    # * <tt>:read_timeout</tt> -- Socket Read Timeout in seconds. Defaults to no timeout.
-    #
-    # By default, the MysqlAdapter will consider all columns of type tinyint(1)
-    # as boolean. If you wish to disable this emulation (which was the default
@@ -385 +386 @@
-          if encoding
-            @connection.options(Mysql::SET_CHARSET_NAME, encoding) rescue nil
-          end
+          @connection.options(Mysql::OPT_READ_TIMEOUT, @config[:read_timeout]) if @config[:read_timeout]
-          @connection.ssl_set(@config[:sslkey], @config[:sslcert], @config[:sslca], @config[:sslcapath], @config[:sslcipher]) if @config[:sslkey]
-          @connection.real_connect(*@connection_options)
-          execute("SET NAMES '#{encoding}'") if encoding