Merge remote-tracking branch 'upstream/pull/2207'

[rails.git] / db / migrate / 008_remove_segments.rb

diff --git a/db/migrate/008_remove_segments.rb b/db/migrate/008_remove_segments.rb
index 62f618abf5df5e9fd4b2349037d185c69969011a..985a85820a1202a7a74d14165f2482fe915672af 100644 (file)
--- a/db/migrate/008_remove_segments.rb
+++ b/db/migrate/008_remove_segments.rb
@@ -1,6 +1,6 @@
 require "migrate"
 
 require "migrate"
 

-class RemoveSegments < ActiveRecord::Migration
+class RemoveSegments < ActiveRecord::Migration[4.2]

   def self.up
     have_segs = select_value("SELECT count(*) FROM current_segments").to_i.nonzero?
 
   def self.up
     have_segs = select_value("SELECT count(*) FROM current_segments").to_i.nonzero?
 


@@ -10,7 +10,7 @@ class RemoveSegments < ActiveRecord::Migration
       cmd = "db/migrate/008_remove_segments_helper"
       src = "#{cmd}.cc"
       if !File.exist?(cmd) || File.mtime(cmd) < File.mtime(src)
       cmd = "db/migrate/008_remove_segments_helper"
       src = "#{cmd}.cc"
       if !File.exist?(cmd) || File.mtime(cmd) < File.mtime(src)

-        system("c++ -O3 -Wall `mysql_config --cflags --libs` " +
+        system("c++ -O3 -Wall `mysql_config --cflags --libs` " \

           "#{src} -o #{cmd}") || raise
       end
 
           "#{src} -o #{cmd}") || raise
       end