mysql_isolated_server 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67d72229d0517a98714dfc5deed145686d15615b
-  data.tar.gz: cdbcf4df767a442c2966f3bbca80c744d9faa8d2
+  metadata.gz: f9acbc0a32698fe44576124a013b2b4ec48f2e51
+  data.tar.gz: 912fbacd2e4889ca24a4d741cbece22eb9c26d33
 SHA512:
-  metadata.gz: 5b93073f78435f66251c6798c7ff04ad48c9ff88eed4b68e72d615499470793dfc29b111cf800cd69203b44b5ae1f2888d5b321b3b68496437d5bd351f3536cc
-  data.tar.gz: 68d52352a2b3dc84306eece440380dc71ea8f4e616dd3b25bd50a27abe1c26a047f4bde3ed1aa1322e3614f981313ac7e6b73b2c92f3117ffc271bc41ef049cd
+  metadata.gz: d62d19dee9fdb8e18542e451fcbd3bfea8681c1cdf2b42092494392ccdfc3003bf66ccdfd3b36d1ef7652d217d9cb4676a1279da19982c4f414820c0c638d74f
+  data.tar.gz: a27123fa090336202e5949f08151ba72c96cf2a1a3ecd471aa91bfb7d923758e3e9c0755943925824e6edcc0c6e52e01051254f8d5fb97f52bdf0ad321d39f67

data/lib/mysql_isolated_server.rb

@@ -9,7 +9,7 @@ end
 
 class MysqlIsolatedServer
   include DBConnection
-  attr_reader :pid, :base, :port
+  attr_reader :pid, :base, :port, :initial_binlog_file, :initial_binlog_pos
   attr_accessor :params
   MYSQL_BASE_DIR="/usr"
 
@@ -56,13 +56,15 @@ class MysqlIsolatedServer
   end
 
   def make_slave_of(master)
-    master_binlog_info = master.connection.query("show master status").first
+    binlog_file = master.initial_binlog_file || (@log_bin.split('/').last + ".000001")
+    binlog_pos = master.initial_binlog_pos || 106
+
     connection.query(<<-EOL
       change master to master_host='127.0.0.1',
                        master_port=#{master.port},
                        master_user='root', master_password='',
-                       master_log_file='#{master_binlog_info['File']}',
-                       master_log_pos=#{master_binlog_info['Position']}
+                       master_log_file='#{binlog_file}',
+                       master_log_pos=#{binlog_pos}
       EOL
     )
     connection.query("SLAVE START")
@@ -133,6 +135,9 @@ class MysqlIsolatedServer
 
     up!
 
+    master_binlog_info = connection.query("show master status").first
+    @initial_binlog_file, @initial_binlog_pos = master_binlog_info.values_at('File', 'Position')
+
     tzinfo_to_sql = locate_executable("mysql_tzinfo_to_sql5", "mysql_tzinfo_to_sql")
     raise "could not find mysql_tzinfo_to_sql" unless tzinfo_to_sql
     system("#{tzinfo_to_sql} /usr/share/zoneinfo 2>/dev/null| mysql -h127.0.0.1 --database=mysql --port=#{@port} -u root mysql ")

data/lib/mysql_isolated_server/version.rb

@@ -1,3 +1,3 @@
 class MysqlIsolatedServer
-  VERSION = "0.4.1"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mysql_isolated_server
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Ben Osheroff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-11 00:00:00.000000000 Z
+date: 2014-08-06 00:00:00.000000000 Z
 dependencies: []
 description: A small library that allows you to easily spin up new local mysql servers
   for testing purposes.