Compare commits

..

No commits in common. "db69101a1d000d857a552e16e45f601adbb4dbc6" and "0e2c05af90ee51f87564e37abdd1df1a8f554064" have entirely different histories.

2 changed files with 2 additions and 2 deletions

View File

@ -1131,7 +1131,7 @@ if not get_option('readline').disabled()
if not at_least_one_header_found if not at_least_one_header_found
error('''readline header not found error('''readline header not found
If you have @0@ already installed, see meson-logs/meson-log.txt for details on the If you have @0@ already installed, see meson-log/meson-log.txt for details on the
failure. It is possible the compiler isn't looking in the proper directory. failure. It is possible the compiler isn't looking in the proper directory.
Use -Dreadline=disabled to disable readline support.'''.format(readline_dep)) Use -Dreadline=disabled to disable readline support.'''.format(readline_dep))
endif endif

View File

@ -3632,7 +3632,7 @@ show_buffer_usage(ExplainState *es, const BufferUsage *usage, bool planning)
if (has_timing) if (has_timing)
{ {
appendStringInfoString(es->str, " shared"); appendStringInfoString(es->str, " shared/local");
if (!INSTR_TIME_IS_ZERO(usage->blk_read_time)) if (!INSTR_TIME_IS_ZERO(usage->blk_read_time))
appendStringInfo(es->str, " read=%0.3f", appendStringInfo(es->str, " read=%0.3f",
INSTR_TIME_GET_MILLISEC(usage->blk_read_time)); INSTR_TIME_GET_MILLISEC(usage->blk_read_time));