Commit db175d6c authored by Leif Walsh's avatar Leif Walsh Committed by Yoni Fogel

merge from 6.5.0: refs #5464 remove newlines in partitioned counter status...

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
parent 66bc05e5
No related merge requests found
...@@ -1363,30 +1363,30 @@ static bool tokudb_show_engine_status(THD * thd, stat_print_fn * stat_print) { ...@@ -1363,30 +1363,30 @@ static bool tokudb_show_engine_status(THD * thd, stat_print_fn * stat_print) {
{ {
time_t t = mystat[row].value.num; time_t t = mystat[row].value.num;
char tbuf[26]; char tbuf[26];
snprintf(buf, bufsiz, "%.24s\n", ctime_r(&t, tbuf)); snprintf(buf, bufsiz, "%.24s", ctime_r(&t, tbuf));
} }
break; break;
case TOKUTIME: case TOKUTIME:
{ {
double t = tokutime_to_seconds(mystat[row].value.num); double t = tokutime_to_seconds(mystat[row].value.num);
snprintf(buf, bufsiz, "%.6f\n", t); snprintf(buf, bufsiz, "%.6f", t);
} }
break; break;
case PARCOUNT: case PARCOUNT:
{ {
uint64_t v = read_partitioned_counter(mystat[row].value.parcount); uint64_t v = read_partitioned_counter(mystat[row].value.parcount);
snprintf(buf, bufsiz, "%" PRIu64 "\n", v); snprintf(buf, bufsiz, "%" PRIu64, v);
} }
break; break;
#if 0 #if 0
case MAXCOUNT: case MAXCOUNT:
{ {
uint64_t v = read_max_partitioned_counter(mystat[row].value.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 #endif
default: default:
snprintf(buf, bufsiz, "UNKNOWN STATUS TYPE: %d\n", mystat[row].type); snprintf(buf, bufsiz, "UNKNOWN STATUS TYPE: %d", mystat[row].type);
break; break;
} }
STATPRINT(mystat[row].legend, buf); STATPRINT(mystat[row].legend, buf);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment