Having blank lines in -f scripts was causing silent failures.
authorTatsuo Ishii <ishii@postgresql.org>
Wed, 23 Nov 2005 12:19:12 +0000 (12:19 +0000)
committerTatsuo Ishii <ishii@postgresql.org>
Wed, 23 Nov 2005 12:19:12 +0000 (12:19 +0000)
per David Fetter

contrib/pgbench/pgbench.c

index 70081be5858a99b3bec210038f2d6e2e729fcf94..a5060204ce801ea6688305f621d60ae495b15036 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL: pgsql/contrib/pgbench/pgbench.c,v 1.47 2005/11/23 04:23:28 momjian Exp $
+ * $PostgreSQL: pgsql/contrib/pgbench/pgbench.c,v 1.48 2005/11/23 12:19:12 ishii Exp $
  *
  * pgbench: a simple benchmark program for PostgreSQL
  * written by Tatsuo Ishii
@@ -886,11 +886,17 @@ process_file(char *filename)
    {
        Command    *commands;
 
-       commands = process_commands(buf);
-       if (commands == NULL)
-       {
-           fclose(fd);
-           return false;
+
+       if (strncmp(buf, "\n", 1) != 0) {
+           commands = process_commands(buf);
+           if (commands == NULL)
+           {
+               fclose(fd);
+               return false;
+           }
+       } else {
+           lineno++;
+           continue;
        }
 
        my_commands[lineno] = commands;