isolated_server 0.4.7 → 0.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4201bf2a50f5fcd3dd55b772c314c67cee2db1a1
-  data.tar.gz: c4ca1255326f085574182e26acef03d4d5226dda
+  metadata.gz: 2ed4c9ab5cbbc56426ca0f3b158e927984eec66d
+  data.tar.gz: cfab84c562700ed8ecfd73d6e97c4d78cef06044
 SHA512:
-  metadata.gz: 74b2f5b9fd5f0a290c39a03637370684f2ba603515606c37c5b6cacc8bddab73c744204bd17ae38eff63f8c37f361f556069897758cdbf5de6d8c0dd907b0351
-  data.tar.gz: 5823d0ef10fae0e5afaff0cf1a8d89203ebdf0cc3c1be8165294f2bc122d0594367fe75d0a819cdcf4c585eb84ceeb59b943ecac39f1bf5ed866dbedb8a3807e
+  metadata.gz: 8c1a31d350d0917968b48588fc307a9f8df97495d5556021f5dd7bced52c6fd5a1bc644373619df89c5b50587154ba5c69f80d56723c1add0af996239388ae82
+  data.tar.gz: c6a86e32c3605f60c4148e06a7acc2f975fc4cae3501e6cb54cf40f0ffd45cf9141f2aff5d8ed535a0b2780ebd1230f1d627ed61e14ed372a26e874135f7b164

data/lib/isolated_server/mysql.rb

@@ -110,7 +110,7 @@ module IsolatedServer
                          MASTER_LOG_POS=#{binlog_pos}
         EOL
       )
-      connection.query("START SLAVE")
+      connection.query("SLAVE START")
       connection.query("SET GLOBAL READ_ONLY=1")
     end
 
@@ -128,11 +128,15 @@ module IsolatedServer
         system("cp -a #{@load_data_path.shellescape}/* #{@mysql_data_dir.shellescape}")
         system("rm -f #{@mysql_data_dir.shellescape}/relay-log.info")
       else
+        mysqld = locate_executable("mysqld")
+        `#{mysqld} --version` =~ /^mysqld\s+Ver (5\.\d)\.\d+/
+        major_version = $1
+
         mysql_install_db = locate_executable("mysql_install_db")
 
         idb_path = File.dirname(mysql_install_db)
         system("(cd #{idb_path.shellescape}/..; mysql_install_db --datadir=#{@mysql_data_dir.shellescape} --user=`whoami`) >/dev/null 2>&1")
-        system("cp #{File.expand_path(File.dirname(__FILE__)).shellescape}/mysql/tables/user.* #{@mysql_data_dir.shellescape}/mysql")
+        system("cp #{File.expand_path(File.dirname(__FILE__)).shellescape}/mysql/tables/#{major_version}/user.* #{@mysql_data_dir.shellescape}/mysql")
       end
     end
 

data/lib/isolated_server/version.rb

@@ -1,3 +1,3 @@
 module IsolatedServer
-  VERSION = "0.4.7"
+  VERSION = "0.4.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: isolated_server
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.4.8
 platform: ruby
 authors:
 - Ben Osheroff
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-10 00:00:00.000000000 Z
+date: 2015-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -109,9 +109,12 @@ files:
 - lib/isolated_server/mysql.rb
 - lib/isolated_server/mysql/jdbc_connection.rb
 - lib/isolated_server/mysql/mysql2_connection.rb
-- lib/isolated_server/mysql/tables/user.MYD
-- lib/isolated_server/mysql/tables/user.MYI
-- lib/isolated_server/mysql/tables/user.frm
+- lib/isolated_server/mysql/tables/5.5/user.MYD
+- lib/isolated_server/mysql/tables/5.5/user.MYI
+- lib/isolated_server/mysql/tables/5.5/user.frm
+- lib/isolated_server/mysql/tables/5.6/user.MYD
+- lib/isolated_server/mysql/tables/5.6/user.MYI
+- lib/isolated_server/mysql/tables/5.6/user.frm
 - lib/isolated_server/version.rb
 - spec/lib/isolated_server/mongodb_spec.rb
 - spec/lib/isolated_server/mysql_spec.rb