diff options
| author | unknown <baker@bk-internal.mysql.com> | 2007-08-09 22:12:13 +0200 |
|---|---|---|
| committer | unknown <baker@bk-internal.mysql.com> | 2007-08-09 22:12:13 +0200 |
| commit | 4a15ac2a1c251120bbcf69bc2f0fafa5242826a8 (patch) | |
| tree | 3a47626c9f2b3b7dea39ab93c7b0f6af6c8c375c /client/mysqlslap.c | |
| parent | 6930ac54068b88ce5ca2476f70d74ddb42f5d9fc (diff) | |
| parent | 8d025792a5cbb8a1ed5361116d5d4f5d1db10a56 (diff) | |
| download | mariadb-git-4a15ac2a1c251120bbcf69bc2f0fafa5242826a8.tar.gz | |
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
client/mysqlslap.c:
Auto merged
storage/example/ha_example.cc:
Auto merged
Diffstat (limited to 'client/mysqlslap.c')
| -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 a550dcae260..4578e0e4e0c 100644 --- a/client/mysqlslap.c +++ b/client/mysqlslap.c @@ -1416,15 +1416,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))) @@ -1447,14 +1447,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) @@ -2002,7 +2002,6 @@ parse_delimiter(const char *script, statement **stmt, char delm) ptr+= retstr - ptr + 1; if (isspace(*ptr)) ptr++; - count++; } if (ptr != script+length) |