diff options
| author | Michael Widenius <monty@askmonty.org> | 2009-12-03 13:34:11 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2009-12-03 13:34:11 +0200 |
| commit | 65ca2521f18b0b3400d8b45edae30baf2dbd6401 (patch) | |
| tree | 4f3b853e4d394c875e2383aa0e46bb4858fe3c73 /client/mysqlslap.c | |
| parent | 27f4f67bd2f35bf710f1a4e4ddde0e42738a195d (diff) | |
| parent | 82e910d146fa3803200176875cc6cb5ddf6d1483 (diff) | |
| download | mariadb-git-65ca2521f18b0b3400d8b45edae30baf2dbd6401.tar.gz | |
Merge
Diffstat (limited to 'client/mysqlslap.c')
| -rw-r--r-- | client/mysqlslap.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/client/mysqlslap.c b/client/mysqlslap.c index f0f377971ac..43d963cc22f 100644 --- a/client/mysqlslap.c +++ b/client/mysqlslap.c @@ -472,11 +472,10 @@ void concurrency_loop(MYSQL *mysql, uint current, option_string *eptr) if (commit_rate) run_query(mysql, "SET AUTOCOMMIT=0", strlen("SET AUTOCOMMIT=0")); - if (pre_system) - if ((sysret= system(pre_system)) != 0) - fprintf(stderr, - "Warning: Execution of pre_system option returned %d.\n", - sysret); + if (pre_system && (sysret= system(pre_system)) != 0) + fprintf(stderr, + "Warning: Execution of pre_system option returned %d.\n", + sysret); /* Pre statements are always run after all other logic so they can @@ -490,11 +489,10 @@ void concurrency_loop(MYSQL *mysql, uint current, option_string *eptr) if (post_statements) run_statements(mysql, post_statements); - if (post_system) - if ((sysret= system(post_system)) != 0) - fprintf(stderr, - "Warning: Execution of post_system option returned %d.\n", - sysret); + if (post_system && (sysret= system(post_system)) != 0) + fprintf(stderr, + "Warning: Execution of post_system option returned %d.\n", + sysret); /* We are finished with this run */ if (auto_generate_sql_autoincrement || auto_generate_sql_guid_primary) drop_primary_key_list(); |