Merge remote-tracking branch 'upstream/master'

1 files changed, 23 insertions, 0 deletions

diff --git a/activerecord/test/cases/adapters/mysql/statement_pool_test.rb b/activerecord/test/cases/adapters/mysql/statement_pool_test.rb
new file mode 100644
index 0000000000..83de90f179
--- /dev/null
+++ b/activerecord/test/cases/adapters/mysql/statement_pool_test.rb
@@ -0,0 +1,23 @@
+require 'cases/helper'
+
+module ActiveRecord::ConnectionAdapters
+  class MysqlAdapter
+    class StatementPoolTest < ActiveRecord::TestCase
+      def test_cache_is_per_pid
+        return skip('must support fork') unless Process.respond_to?(:fork)
+
+        cache = StatementPool.new nil, 10
+        cache['foo'] = 'bar'
+        assert_equal 'bar', cache['foo']
+
+        pid = fork {
+          lookup = cache['foo'];
+          exit!(!lookup)
+        }
+
+        Process.waitpid pid
+        assert $?.success?, 'process should exit successfully'
+      end
+    end
+  end
+end