isolated_server 0.4.7 → 0.4.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 4201bf2a50f5fcd3dd55b772c314c67cee2db1a1
4
- data.tar.gz: c4ca1255326f085574182e26acef03d4d5226dda
3
+ metadata.gz: 2ed4c9ab5cbbc56426ca0f3b158e927984eec66d
4
+ data.tar.gz: cfab84c562700ed8ecfd73d6e97c4d78cef06044
5
5
  SHA512:
6
- metadata.gz: 74b2f5b9fd5f0a290c39a03637370684f2ba603515606c37c5b6cacc8bddab73c744204bd17ae38eff63f8c37f361f556069897758cdbf5de6d8c0dd907b0351
7
- data.tar.gz: 5823d0ef10fae0e5afaff0cf1a8d89203ebdf0cc3c1be8165294f2bc122d0594367fe75d0a819cdcf4c585eb84ceeb59b943ecac39f1bf5ed866dbedb8a3807e
6
+ metadata.gz: 8c1a31d350d0917968b48588fc307a9f8df97495d5556021f5dd7bced52c6fd5a1bc644373619df89c5b50587154ba5c69f80d56723c1add0af996239388ae82
7
+ data.tar.gz: c6a86e32c3605f60c4148e06a7acc2f975fc4cae3501e6cb54cf40f0ffd45cf9141f2aff5d8ed535a0b2780ebd1230f1d627ed61e14ed372a26e874135f7b164
@@ -110,7 +110,7 @@ module IsolatedServer
110
110
  MASTER_LOG_POS=#{binlog_pos}
111
111
  EOL
112
112
  )
113
- connection.query("START SLAVE")
113
+ connection.query("SLAVE START")
114
114
  connection.query("SET GLOBAL READ_ONLY=1")
115
115
  end
116
116
 
@@ -128,11 +128,15 @@ module IsolatedServer
128
128
  system("cp -a #{@load_data_path.shellescape}/* #{@mysql_data_dir.shellescape}")
129
129
  system("rm -f #{@mysql_data_dir.shellescape}/relay-log.info")
130
130
  else
131
+ mysqld = locate_executable("mysqld")
132
+ `#{mysqld} --version` =~ /^mysqld\s+Ver (5\.\d)\.\d+/
133
+ major_version = $1
134
+
131
135
  mysql_install_db = locate_executable("mysql_install_db")
132
136
 
133
137
  idb_path = File.dirname(mysql_install_db)
134
138
  system("(cd #{idb_path.shellescape}/..; mysql_install_db --datadir=#{@mysql_data_dir.shellescape} --user=`whoami`) >/dev/null 2>&1")
135
- system("cp #{File.expand_path(File.dirname(__FILE__)).shellescape}/mysql/tables/user.* #{@mysql_data_dir.shellescape}/mysql")
139
+ system("cp #{File.expand_path(File.dirname(__FILE__)).shellescape}/mysql/tables/#{major_version}/user.* #{@mysql_data_dir.shellescape}/mysql")
136
140
  end
137
141
  end
138
142
 
@@ -1,3 +1,3 @@
1
1
  module IsolatedServer
2
- VERSION = "0.4.7"
2
+ VERSION = "0.4.8"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: isolated_server
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.4.7
4
+ version: 0.4.8
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ben Osheroff
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2015-11-10 00:00:00.000000000 Z
12
+ date: 2015-12-09 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: bundler
@@ -109,9 +109,12 @@ files:
109
109
  - lib/isolated_server/mysql.rb
110
110
  - lib/isolated_server/mysql/jdbc_connection.rb
111
111
  - lib/isolated_server/mysql/mysql2_connection.rb
112
- - lib/isolated_server/mysql/tables/user.MYD
113
- - lib/isolated_server/mysql/tables/user.MYI
114
- - lib/isolated_server/mysql/tables/user.frm
112
+ - lib/isolated_server/mysql/tables/5.5/user.MYD
113
+ - lib/isolated_server/mysql/tables/5.5/user.MYI
114
+ - lib/isolated_server/mysql/tables/5.5/user.frm
115
+ - lib/isolated_server/mysql/tables/5.6/user.MYD
116
+ - lib/isolated_server/mysql/tables/5.6/user.MYI
117
+ - lib/isolated_server/mysql/tables/5.6/user.frm
115
118
  - lib/isolated_server/version.rb
116
119
  - spec/lib/isolated_server/mongodb_spec.rb
117
120
  - spec/lib/isolated_server/mysql_spec.rb