diff options
author | Michael Widenius <monty@askmonty.org> | 2009-10-28 16:56:07 +0200 |
---|---|---|
committer | Michael Widenius <monty@askmonty.org> | 2009-10-28 16:56:07 +0200 |
commit | 056cebe61a43e55fb7d5906dbcb9108993ae4ce5 (patch) | |
tree | 2d08cc0ff4d23012d05ddab364d43cd9f54a9d17 /client/mysqlslap.c | |
parent | d27150204803b44b324833a1625301abc53cb9b8 (diff) | |
parent | f3e3fe866bfaa14986db5bb6a10e5c130af69137 (diff) | |
download | mariadb-git-056cebe61a43e55fb7d5906dbcb9108993ae4ce5.tar.gz |
Automatic merge with 5.1
Diffstat (limited to 'client/mysqlslap.c')
-rw-r--r-- | client/mysqlslap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/client/mysqlslap.c b/client/mysqlslap.c index a154b680324..2dba157dd78 100644 --- a/client/mysqlslap.c +++ b/client/mysqlslap.c @@ -472,7 +472,7 @@ void concurrency_loop(MYSQL *mysql, uint current, option_string *eptr) run_query(mysql, "SET AUTOCOMMIT=0", strlen("SET AUTOCOMMIT=0")); if (pre_system) - system(pre_system); + if (system(pre_system)) { /* Ignore for now */ } /* Pre statements are always run after all other logic so they can @@ -487,7 +487,7 @@ void concurrency_loop(MYSQL *mysql, uint current, option_string *eptr) run_statements(mysql, post_statements); if (post_system) - system(post_system); + if (system(post_system)) { /* Ignore for now */ } /* We are finished with this run */ if (auto_generate_sql_autoincrement || auto_generate_sql_guid_primary) |