diff options
| author | brian@piggy.tangent.org <> | 2007-08-09 13:01:29 -0700 |
|---|---|---|
| committer | brian@piggy.tangent.org <> | 2007-08-09 13:01:29 -0700 |
| commit | ae2b243a2efcb7f225e740788c5e999d94e99dce (patch) | |
| tree | ef47b62477f647a1716779b07a12abe922ddf12c /client | |
| parent | 5a7f36fb0e88807563d6016d48e933cb00ef1f5b (diff) | |
| download | mariadb-git-ae2b243a2efcb7f225e740788c5e999d94e99dce.tar.gz | |
Two bugs in one! The count call was duplicating internally the counts for loaded tests (not autosql tests, just loaded). This could manifest itself by executing by file, or by executing a pre statement.
BUG#29803
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqlslap.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/client/mysqlslap.c b/client/mysqlslap.c index aa15141bfdc..43d8b1b1560 100644 --- a/client/mysqlslap.c +++ b/client/mysqlslap.c @@ -1407,15 +1407,15 @@ get_options(int *argc,char ***argv) tmp_string[sbuf.st_size]= '\0'; my_close(data_file,MYF(0)); if (user_supplied_pre_statements) - actual_queries= parse_delimiter(tmp_string, &pre_statements, - delimiter[0]); + (void)parse_delimiter(tmp_string, &pre_statements, + delimiter[0]); my_free(tmp_string, MYF(0)); } else if (user_supplied_pre_statements) { - actual_queries= parse_delimiter(user_supplied_pre_statements, - &pre_statements, - delimiter[0]); + (void)parse_delimiter(user_supplied_pre_statements, + &pre_statements, + delimiter[0]); } if (user_supplied_post_statements && my_stat(user_supplied_post_statements, &sbuf, MYF(0))) @@ -1438,14 +1438,14 @@ get_options(int *argc,char ***argv) tmp_string[sbuf.st_size]= '\0'; my_close(data_file,MYF(0)); if (user_supplied_post_statements) - parse_delimiter(tmp_string, &post_statements, - delimiter[0]); + (void)parse_delimiter(tmp_string, &post_statements, + delimiter[0]); my_free(tmp_string, MYF(0)); } else if (user_supplied_post_statements) { - parse_delimiter(user_supplied_post_statements, &post_statements, - delimiter[0]); + (void)parse_delimiter(user_supplied_post_statements, &post_statements, + delimiter[0]); } if (verbose >= 2) @@ -1993,7 +1993,6 @@ parse_delimiter(const char *script, statement **stmt, char delm) ptr+= retstr - ptr + 1; if (isspace(*ptr)) ptr++; - count++; } if (ptr != script+length) |