Merge branch '0.4' into 0.5

This commit is contained in:
Alexey Kopytov
2015-03-09 21:58:22 +03:00
3 changed files with 5 additions and 2 deletions

3
.gitignore vendored Normal file
View File

@ -0,0 +1,3 @@
/sysbench/GPATH
/sysbench/GRTAGS
/sysbench/GTAGS

View File

@ -955,7 +955,7 @@ static int init(void)
long res;
sb_globals.num_threads = sb_get_value_int("num-threads");
if (sb_globals.num_threads <= 0)
if (sb_globals.num_threads == 0)
{
log_text(LOG_FATAL, "Invalid value for --num-threads: %d.\n", sb_globals.num_threads);
return 1;

View File

@ -1746,7 +1746,7 @@ int parse_arguments(void)
num_files = sb_get_value_int("file-num");
if (num_files <= 0)
if (num_files == 0)
{
log_text(LOG_FATAL, "Invalid value for file-num: %d", num_files);
return 1;