Commit cd124b75 authored by marko's avatar marko

branches/zip: Always display a newline after ut_print_buf(stderr, ...).

parent 038f4dcf
...@@ -208,6 +208,7 @@ btr_pcur_restore_position( ...@@ -208,6 +208,7 @@ btr_pcur_restore_position(
|| UNIV_UNLIKELY(cursor->pos_state != BTR_PCUR_WAS_POSITIONED || UNIV_UNLIKELY(cursor->pos_state != BTR_PCUR_WAS_POSITIONED
&& cursor->pos_state != BTR_PCUR_IS_POSITIONED)) { && cursor->pos_state != BTR_PCUR_IS_POSITIONED)) {
ut_print_buf(stderr, cursor, sizeof(btr_pcur_t)); ut_print_buf(stderr, cursor, sizeof(btr_pcur_t));
putc('\n', stderr);
if (cursor->trx_if_known) { if (cursor->trx_if_known) {
trx_print(stderr, cursor->trx_if_known, 0); trx_print(stderr, cursor->trx_if_known, 0);
} }
......
...@@ -443,7 +443,7 @@ buf_page_print( ...@@ -443,7 +443,7 @@ buf_page_print(
fprintf(stderr, " InnoDB: Page dump in ascii and hex (%lu bytes):\n", fprintf(stderr, " InnoDB: Page dump in ascii and hex (%lu bytes):\n",
(ulong) size); (ulong) size);
ut_print_buf(stderr, read_buf, size); ut_print_buf(stderr, read_buf, size);
fputs("InnoDB: End of page dump\n", stderr); fputs("\nInnoDB: End of page dump\n", stderr);
if (zip_size) { if (zip_size) {
/* Print compressed page. */ /* Print compressed page. */
......
...@@ -168,6 +168,7 @@ buf_flush_ready_for_replace( ...@@ -168,6 +168,7 @@ buf_flush_ready_for_replace(
" in the LRU list!\n", " in the LRU list!\n",
(ulong) buf_page_get_state(bpage)); (ulong) buf_page_get_state(bpage));
ut_print_buf(stderr, bpage, sizeof(buf_page_t)); ut_print_buf(stderr, bpage, sizeof(buf_page_t));
putc('\n', stderr);
return(FALSE); return(FALSE);
} }
...@@ -638,6 +639,7 @@ buf_flush_init_for_writing( ...@@ -638,6 +639,7 @@ buf_flush_init_for_writing(
fputs(" InnoDB: ERROR: The compressed page to be written" fputs(" InnoDB: ERROR: The compressed page to be written"
" seems corrupt:", stderr); " seems corrupt:", stderr);
ut_print_buf(stderr, page_zip->data, zip_size); ut_print_buf(stderr, page_zip->data, zip_size);
putc('\n', stderr);
ut_error; ut_error;
} }
......
...@@ -1489,6 +1489,7 @@ buf_LRU_block_remove_hashed_page( ...@@ -1489,6 +1489,7 @@ buf_LRU_block_remove_hashed_page(
" to be evicted seems corrupt:", stderr); " to be evicted seems corrupt:", stderr);
ut_print_buf(stderr, bpage->zip.data, ut_print_buf(stderr, bpage->zip.data,
page_zip_get_size(&bpage->zip)); page_zip_get_size(&bpage->zip));
putc('\n', stderr);
ut_error; ut_error;
} }
......
...@@ -1577,6 +1577,7 @@ fsp_alloc_free_page( ...@@ -1577,6 +1577,7 @@ fsp_alloc_free_page(
if (free == ULINT_UNDEFINED) { if (free == ULINT_UNDEFINED) {
ut_print_buf(stderr, ((byte*)descr) - 500, 1000); ut_print_buf(stderr, ((byte*)descr) - 500, 1000);
putc('\n', stderr);
ut_error; ut_error;
} }
...@@ -1760,6 +1761,7 @@ fsp_free_extent( ...@@ -1760,6 +1761,7 @@ fsp_free_extent(
if (xdes_get_state(descr, mtr) == XDES_FREE) { if (xdes_get_state(descr, mtr) == XDES_FREE) {
ut_print_buf(stderr, (byte*)descr - 500, 1000); ut_print_buf(stderr, (byte*)descr - 500, 1000);
putc('\n', stderr);
ut_error; ut_error;
} }
......
...@@ -491,6 +491,7 @@ mem_heap_validate_or_print( ...@@ -491,6 +491,7 @@ mem_heap_validate_or_print(
if (print) { if (print) {
ut_print_buf(stderr, user_field, len); ut_print_buf(stderr, user_field, len);
putc('\n', stderr);
} }
total_len += len; total_len += len;
......
...@@ -726,7 +726,7 @@ os_fast_mutex_free( ...@@ -726,7 +726,7 @@ os_fast_mutex_free(
ret = pthread_mutex_destroy(fast_mutex); ret = pthread_mutex_destroy(fast_mutex);
if (ret != 0) { if (UNIV_UNLIKELY(ret != 0)) {
ut_print_timestamp(stderr); ut_print_timestamp(stderr);
fprintf(stderr, fprintf(stderr,
" InnoDB: error: return value %lu when calling\n" " InnoDB: error: return value %lu when calling\n"
...@@ -735,7 +735,7 @@ os_fast_mutex_free( ...@@ -735,7 +735,7 @@ os_fast_mutex_free(
"InnoDB: Byte contents of the pthread mutex at %p:\n", "InnoDB: Byte contents of the pthread mutex at %p:\n",
(void*) fast_mutex); (void*) fast_mutex);
ut_print_buf(stderr, fast_mutex, sizeof(os_fast_mutex_t)); ut_print_buf(stderr, fast_mutex, sizeof(os_fast_mutex_t));
fprintf(stderr, "\n"); putc('\n', stderr);
} }
#endif #endif
if (UNIV_LIKELY(os_sync_mutex_inited)) { if (UNIV_LIKELY(os_sync_mutex_inited)) {
......
...@@ -848,6 +848,7 @@ page_cur_parse_insert_rec( ...@@ -848,6 +848,7 @@ page_cur_parse_insert_rec(
fputs("Dump of 300 bytes of log:\n", stderr); fputs("Dump of 300 bytes of log:\n", stderr);
ut_print_buf(stderr, ptr2, 300); ut_print_buf(stderr, ptr2, 300);
putc('\n', stderr);
buf_page_print(page, 0); buf_page_print(page, 0);
......
...@@ -2173,17 +2173,16 @@ row_fetch_print( ...@@ -2173,17 +2173,16 @@ row_fetch_print(
fprintf(stderr, " column %lu:\n", (ulong)i); fprintf(stderr, " column %lu:\n", (ulong)i);
dtype_print(type); dtype_print(type);
fprintf(stderr, "\n"); putc('\n', stderr);
if (dfield_get_len(dfield) != UNIV_SQL_NULL) { if (dfield_get_len(dfield) != UNIV_SQL_NULL) {
ut_print_buf(stderr, dfield_get_data(dfield), ut_print_buf(stderr, dfield_get_data(dfield),
dfield_get_len(dfield)); dfield_get_len(dfield));
putc('\n', stderr);
} else { } else {
fprintf(stderr, " <NULL>;"); fputs(" <NULL>;\n", stderr);
} }
fprintf(stderr, "\n");
exp = que_node_get_next(exp); exp = que_node_get_next(exp);
i++; i++;
} }
...@@ -2466,7 +2465,7 @@ row_sel_convert_mysql_key_to_innobase( ...@@ -2466,7 +2465,7 @@ row_sel_convert_mysql_key_to_innobase(
(ulong) (key_ptr - key_end)); (ulong) (key_ptr - key_end));
fflush(stderr); fflush(stderr);
ut_print_buf(stderr, original_key_ptr, key_len); ut_print_buf(stderr, original_key_ptr, key_len);
fprintf(stderr, "\n"); putc('\n', stderr);
if (!is_null) { if (!is_null) {
ulint len = dfield_get_len(dfield); ulint len = dfield_get_len(dfield);
......
...@@ -264,6 +264,7 @@ trx_free( ...@@ -264,6 +264,7 @@ trx_free(
trx_print(stderr, trx, 600); trx_print(stderr, trx, 600);
ut_print_buf(stderr, trx, sizeof(trx_t)); ut_print_buf(stderr, trx, sizeof(trx_t));
putc('\n', stderr);
} }
ut_a(trx->magic_n == TRX_MAGIC_N); ut_a(trx->magic_n == TRX_MAGIC_N);
......
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