Browse Source

merge from 6.5.0: refs #5464 remove newlines in partitioned counter status output and in unused types' output

git-svn-id: file:///svn/mysql/tokudb-engine/tokudb-engine@48234 c7de825b-a66e-492c-adef-691d508d4ae1
pull/73/head
Leif Walsh 13 years ago
committed by Yoni Fogel
parent
commit
6dc92d11ff
  1. 10
      storage/tokudb/hatoku_hton.cc

10
storage/tokudb/hatoku_hton.cc

@ -1363,30 +1363,30 @@ static bool tokudb_show_engine_status(THD * thd, stat_print_fn * stat_print) {
{
time_t t = mystat[row].value.num;
char tbuf[26];
snprintf(buf, bufsiz, "%.24s\n", ctime_r(&t, tbuf));
snprintf(buf, bufsiz, "%.24s", ctime_r(&t, tbuf));
}
break;
case TOKUTIME:
{
double t = tokutime_to_seconds(mystat[row].value.num);
snprintf(buf, bufsiz, "%.6f\n", t);
snprintf(buf, bufsiz, "%.6f", t);
}
break;
case PARCOUNT:
{
uint64_t v = read_partitioned_counter(mystat[row].value.parcount);
snprintf(buf, bufsiz, "%" PRIu64 "\n", v);
snprintf(buf, bufsiz, "%" PRIu64, v);
}
break;
#if 0
case MAXCOUNT:
{
uint64_t v = read_max_partitioned_counter(mystat[row].value.maxcount);
n += snprintf(buff + n, bufsiz - n, "%" PRIu64 "\n", v);
snprintf(buf, bufsiz, "%" PRIu64, v);
}
#endif
default:
snprintf(buf, bufsiz, "UNKNOWN STATUS TYPE: %d\n", mystat[row].type);
snprintf(buf, bufsiz, "UNKNOWN STATUS TYPE: %d", mystat[row].type);
break;
}
STATPRINT(mystat[row].legend, buf);

Loading…
Cancel
Save