diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-10-14 12:25:39 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-10-14 12:25:39 +0400 |
| commit | ca08f10ccd20213ad2ac1fa19f19cd7dfbcc5d7d (patch) | |
| tree | 1b3260f72106f50b182546dff41127a389144fa1 /client/mysqlslap.c | |
| parent | 946dc457facc58517e9c47f1c5ad0029e529da79 (diff) | |
| parent | 32e51de7f58d6f3e82c97fe9ab37d8d8246b762b (diff) | |
| download | mariadb-git-ca08f10ccd20213ad2ac1fa19f19cd7dfbcc5d7d.tar.gz | |
Manual merge from mysql-trunk-merge.
Diffstat (limited to 'client/mysqlslap.c')
| -rw-r--r-- | client/mysqlslap.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/client/mysqlslap.c b/client/mysqlslap.c index 0bbc15eb24e..f13b5099766 100644 --- a/client/mysqlslap.c +++ b/client/mysqlslap.c @@ -423,6 +423,7 @@ void concurrency_loop(MYSQL *mysql, uint current, option_string *eptr) stats *sptr; conclusions conclusion; unsigned long long client_limit; + int sysret; head_sptr= (stats *)my_malloc(sizeof(stats) * iterations, MYF(MY_ZEROFILL|MY_FAE|MY_WME)); @@ -463,7 +464,9 @@ 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 ((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 @@ -478,7 +481,9 @@ void concurrency_loop(MYSQL *mysql, uint current, option_string *eptr) run_statements(mysql, post_statements); if (post_system) - system(post_system); + if ((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) |