Merge rails_port as of r4613 & fix tests.

[rails.git] / db / migrate / 007_remove_segments_helper.cc

diff --git a/db/migrate/006_remove_segments_helper.cc b/db/migrate/007_remove_segments_helper.cc
similarity index 97%
rename from db/migrate/006_remove_segments_helper.cc
rename to db/migrate/007_remove_segments_helper.cc
index dd2176a04acf1d392c9272a462bce93fd7081e6d..2234a3bb59f92bc61f5a9b9de7b2dd16ce720ecd 100644 (file)
--- a/db/migrate/006_remove_segments_helper.cc
+++ b/db/migrate/007_remove_segments_helper.cc
@@ -32,9 +32,9 @@ static T parse(const char *str) {
 static void exit_mysql_err(MYSQL *mysql) {
   const char *err = mysql_error(mysql);
   if (err) {
 static void exit_mysql_err(MYSQL *mysql) {
   const char *err = mysql_error(mysql);
   if (err) {

-    fprintf(stderr, "005_remove_segments_helper: MySQL error: %s\n", err);
+    fprintf(stderr, "007_remove_segments_helper: MySQL error: %s\n", err);

   } else {
   } else {

-    fprintf(stderr, "005_remove_segments_helper: MySQL error\n");
+    fprintf(stderr, "007_remove_segments_helper: MySQL error\n");

   }
   abort();
   exit(EXIT_FAILURE);
   }
   abort();
   exit(EXIT_FAILURE);


@@ -43,9 +43,9 @@ static void exit_mysql_err(MYSQL *mysql) {
 static void exit_stmt_err(MYSQL_STMT *stmt) {
   const char *err = mysql_stmt_error(stmt);
   if (err) {
 static void exit_stmt_err(MYSQL_STMT *stmt) {
   const char *err = mysql_stmt_error(stmt);
   if (err) {

-    fprintf(stderr, "005_remove_segments_helper: MySQL stmt error: %s\n", err);
+    fprintf(stderr, "007_remove_segments_helper: MySQL stmt error: %s\n", err);

   } else {
   } else {

-    fprintf(stderr, "005_remove_segments_helper: MySQL stmt error\n");
+    fprintf(stderr, "007_remove_segments_helper: MySQL stmt error\n");

   }
   abort();
   exit(EXIT_FAILURE);
   }
   abort();
   exit(EXIT_FAILURE);


@@ -536,7 +536,7 @@ int main(int argc, char **argv) {
   char *tempfn;
 
   if (argc != 8) {
   char *tempfn;
 
   if (argc != 8) {

-    printf("Usage: 006_remove_segments_helper host user passwd database port socket prefix\n");
+    printf("Usage: 007_remove_segments_helper host user passwd database port socket prefix\n");

     exit(EXIT_FAILURE);
   }
 
     exit(EXIT_FAILURE);
   }