Merge rails_port as of r4613 & fix tests.

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

diff --git a/db/migrate/006_remove_segments.rb b/db/migrate/007_remove_segments.rb
similarity index 96%
rename from db/migrate/006_remove_segments.rb
rename to db/migrate/007_remove_segments.rb
index de9557cc93a511797929be91b1020da8b510d300..492beda63d70048575b9740c503512bb40f02488 100644 (file)
--- a/db/migrate/006_remove_segments.rb
+++ b/db/migrate/007_remove_segments.rb
@@ -5,9 +5,9 @@ class RemoveSegments < ActiveRecord::Migration
     have_segs = select_value("SELECT count(*) FROM current_segments").to_i != 0
 
     if have_segs
     have_segs = select_value("SELECT count(*) FROM current_segments").to_i != 0
 
     if have_segs

-      prefix = File.join Dir.tmpdir, "006_remove_segments.#{$$}."
+      prefix = File.join Dir.tmpdir, "007_remove_segments.#{$$}."

 
 

-      cmd = "db/migrate/006_remove_segments_helper"
+      cmd = "db/migrate/007_remove_segments_helper"

       src = "#{cmd}.cc"
       if not File.exists? cmd or File.mtime(cmd) < File.mtime(src) then 
        system 'c++ -O3 -Wall `mysql_config --cflags --libs` ' +
       src = "#{cmd}.cc"
       if not File.exists? cmd or File.mtime(cmd) < File.mtime(src) then 
        system 'c++ -O3 -Wall `mysql_config --cflags --libs` ' +