Ticket #3739: md.diff

activerecord/lib/active_record/connection_adapters/mysql_adapter.rb

@@ -33 +33 @@
-      end
-
-      mysql = Mysql.init
+      mysql.reconnect = 1
-      mysql.ssl_set(config[:sslkey], config[:sslcert], config[:sslca], config[:sslcapath], config[:sslcipher]) if config[:sslkey]
-      ConnectionAdapters::MysqlAdapter.new(mysql, logger, [host, username, password, database, port, socket], config)
-    end
@@ -177 +178 @@
-      end
-
-      def execute(sql, name = nil, retries = 2) #:nodoc:
+        repeat = 1
-        log(sql, name) { @connection.query(sql) }
-      rescue ActiveRecord::StatementInvalid => exception
-
+
+
+
+
+
-          raise ActiveRecord::StatementInvalid, "'Packets out of order' error was received from the database. Please update your mysql bindings (gem install mysql) and read http://dev.mysql.com/doc/mysql/en/password-hashing.html for more information.  If you're on Windows, use the Instant Rails installer to get the updated mysql bindings."
-        else
-          raise