Pull from master

2018-05-03 09:31:36 +06:30
parent caa0180e8c
commit 45531453c7
47 changed files with 1042 additions and 263 deletions
--- a/config/initializers/mysql2_adapter.rb
+++ b/config/initializers/mysql2_adapter.rb
@@ -24,7 +24,7 @@ module ActiveRecord
      end

      client = Mysql2::Client.new(config.symbolize_keys)
-      options = [config[:host], config[:username], config[:password], config[:database], config[:port], config[:socket], config[:wait_timeout], 0]
+      options = [config[:host], config[:username], config[:password], config[:database], config[:port], config[:socket], config[:pool], config[:wait_timeout], 0]
      ConnectionAdapters::Mysql2Adapter.new(client, logger, options, config)
    end
  end