Skip to content

M
MariaDB
Commit 87b6df31 authored by Marko Mäkelä's avatar Marko Mäkelä
Browse files
Options

MDEV-12488 Remove type mismatch in InnoDB printf-like calls 

This is a reduced version of an originally much larger patch.
We will keep the definition of the ulint, lint data types unchanged,
and we will not be replacing fprintf() calls with ib_logf().

On Windows, use the standard format strings instead of nonstandard
extensions.

This patch fixes some errors in format strings.
Most notably, an IMPORT TABLESPACE error message in InnoDB was
displaying the number of columns instead of the mismatching flags.
parent d34a67b0
Hide whitespace changes
Inline Side-by-side
Showing with 238 additions and 298 deletions
extra/innochecksum.cc
View file @ 87b6df31
......@@ -360,12 +360,13 @@ int main(int argc, char **argv)
{
if (verbose)
printf("Number of pages: ");
printf("%lu\n", pages);
printf(ULINTPF "\n", pages);
goto ok;
}
else if (verbose)
{
printf("file %s = %llu bytes (%lu pages)...\n", filename, size, (ulong)pages);
printf("file %s = %llu bytes (" ULINTPF " pages)...\n",
filename, size, pages);
if (do_one_page)
printf("InnoChecksum; checking page %lu\n", do_page);
else
......@@ -421,7 +422,8 @@ int main(int argc, char **argv)
if (compressed) {
/* compressed pages */
if (!page_zip_verify_checksum(buf, physical_page_size)) {
fprintf(stderr, "Fail; page %lu invalid (fails compressed page checksum).\n", ct);
fprintf(stderr, "Fail; page " ULINTPF
" invalid (fails compressed page checksum).\n", ct);
if (!skip_corrupt)
goto error;
}
......@@ -431,10 +433,14 @@ int main(int argc, char **argv)
logseq= mach_read_from_4(buf + FIL_PAGE_LSN + 4);
logseqfield= mach_read_from_4(buf + logical_page_size - FIL_PAGE_END_LSN_OLD_CHKSUM + 4);
if (debug)
printf("page %lu: log sequence number: first = %lu; second = %lu\n", ct, logseq, logseqfield);
printf("page " ULINTPF
": log sequence number: first = " ULINTPF
"; second = " ULINTPF "\n",
ct, logseq, logseqfield);
if (logseq != logseqfield)
{
fprintf(stderr, "Fail; page %lu invalid (fails log sequence number check)\n", ct);
fprintf(stderr, "Fail; page " ULINTPF
" invalid (fails log sequence number check)\n", ct);
if (!skip_corrupt)
goto error;
}
......@@ -443,10 +449,14 @@ int main(int argc, char **argv)
oldcsum= buf_calc_page_old_checksum(buf);
oldcsumfield= mach_read_from_4(buf + logical_page_size - FIL_PAGE_END_LSN_OLD_CHKSUM);
if (debug)
printf("page %lu: old style: calculated = %lu; recorded = %lu\n", ct, oldcsum, oldcsumfield);
printf("page " ULINTPF
": old style: calculated = " ULINTPF
"; recorded = " ULINTPF "\n",
ct, oldcsum, oldcsumfield);
if (oldcsumfield != mach_read_from_4(buf + FIL_PAGE_LSN) && oldcsumfield != oldcsum)
{
fprintf(stderr, "Fail; page %lu invalid (fails old style checksum)\n", ct);
fprintf(stderr, "Fail; page " ULINTPF
" invalid (fails old style checksum)\n", ct);
if (!skip_corrupt)
goto error;
}
......@@ -456,11 +466,14 @@ int main(int argc, char **argv)
crc32= buf_calc_page_crc32(buf);
csumfield= mach_read_from_4(buf + FIL_PAGE_SPACE_OR_CHKSUM);
if (debug)
printf("page %lu: new style: calculated = %lu; crc32 = %lu; recorded = %lu\n",
printf("page " ULINTPF
": new style: calculated = " ULINTPF
"; crc32 = " ULINTPF "; recorded = " ULINTPF "\n",
ct, csum, crc32, csumfield);
if (csumfield != 0 && crc32 != csumfield && csum != csumfield)
{
fprintf(stderr, "Fail; page %lu invalid (fails innodb and crc32 checksum)\n", ct);
fprintf(stderr, "Fail; page " ULINTPF
" invalid (fails innodb and crc32 checksum)\n", ct);
if (!skip_corrupt)
goto error;
}
......@@ -479,7 +492,8 @@ int main(int argc, char **argv)
if (!lastt) lastt= now;
if (now - lastt >= 1)
{
printf("page %lu okay: %.3f%% done\n", (ct - 1), (float) ct / pages * 100);
printf("page " ULINTPF " okay: %.3f%% done\n",
(ct - 1), (float) ct / pages * 100);
lastt= now;
}
}
......
mysql-test/suite/innodb/r/innodb-wl5522,xtradb.rdiff deleted 100644 → 0
View file @ d34a67b0
--- suite/innodb/r/innodb-wl5522.result
+++ suite/innodb/r/innodb-wl5522.reject
@@ -580,7 +580,7 @@
ERROR HY000: Tablespace has been discarded for table 't1'
restore: t1 .ibd and .cfg files
ALTER TABLE t1 IMPORT TABLESPACE;
-ERROR HY000: Schema mismatch (Table flags don't match, server table has 0x5 and the meta-data file has 0x0)
+ERROR HY000: Schema mismatch (Table flags don't match, server table has 0x1 and the meta-data file has 0x0)
unlink: t1.ibd
unlink: t1.cfg
DROP TABLE t1;
@@ -592,7 +592,7 @@
ERROR HY000: Tablespace has been discarded for table 't1'
restore: t1 .ibd and .cfg files
ALTER TABLE t1 IMPORT TABLESPACE;
-ERROR HY000: Schema mismatch (Table flags don't match, server table has 0x5 and the meta-data file has 0x0)
+ERROR HY000: Schema mismatch (Table flags don't match, server table has 0x21 and the meta-data file has 0x0)
unlink: t1.ibd
unlink: t1.cfg
DROP TABLE t1;
@@ -766,7 +766,7 @@
ERROR HY000: Tablespace has been discarded for table 't1'
restore: t1 .ibd and .cfg files
ALTER TABLE t1 IMPORT TABLESPACE;
-ERROR HY000: Schema mismatch (Table flags don't match, server table has 0x5 and the meta-data file has 0x1)
+ERROR HY000: Schema mismatch (Table flags don't match, server table has 0x0 and the meta-data file has 0x1)
unlink: t1.ibd
unlink: t1.cfg
DROP TABLE t1;
@@ -778,7 +778,7 @@
ERROR HY000: Tablespace has been discarded for table 't1'
restore: t1 .ibd and .cfg files
ALTER TABLE t1 IMPORT TABLESPACE;
-ERROR HY000: Schema mismatch (Table flags don't match, server table has 0x5 and the meta-data file has 0x1)
+ERROR HY000: Schema mismatch (Table flags don't match, server table has 0x21 and the meta-data file has 0x1)
unlink: t1.ibd
unlink: t1.cfg
DROP TABLE t1;
@@ -955,7 +955,7 @@
ERROR HY000: Tablespace has been discarded for table 't1'
restore: t1 .ibd and .cfg files
ALTER TABLE t1 IMPORT TABLESPACE;
-ERROR HY000: Schema mismatch (Table flags don't match, server table has 0x5 and the meta-data file has 0x21)
+ERROR HY000: Schema mismatch (Table flags don't match, server table has 0x1 and the meta-data file has 0x21)
unlink: t1.ibd
unlink: t1.cfg
DROP TABLE t1;
@@ -967,7 +967,7 @@
ERROR HY000: Tablespace has been discarded for table 't1'
restore: t1 .ibd and .cfg files
ALTER TABLE t1 IMPORT TABLESPACE;
-ERROR HY000: Schema mismatch (Table flags don't match, server table has 0x5 and the meta-data file has 0x21)
+ERROR HY000: Schema mismatch (Table flags don't match, server table has 0x0 and the meta-data file has 0x21)
unlink: t1.ibd
unlink: t1.cfg
DROP TABLE t1;
mysql-test/suite/innodb/r/innodb-wl5522.result
View file @ 87b6df31
......@@ -580,7 +580,7 @@ SELECT * FROM t1;
ERROR HY000: Tablespace has been discarded for table 't1'
restore: t1 .ibd and .cfg files
ALTER TABLE t1 IMPORT TABLESPACE;
ERROR HY000: Schema mismatch (Table flags don't match, server table has 0x5 and the meta-data file has 0x0)
ERROR HY000: Schema mismatch (Table flags don't match, server table has 0x1 and the meta-data file has 0x0)
unlink: t1.ibd
unlink: t1.cfg
DROP TABLE t1;
......@@ -592,7 +592,7 @@ SELECT * FROM t1;
ERROR HY000: Tablespace has been discarded for table 't1'
restore: t1 .ibd and .cfg files
ALTER TABLE t1 IMPORT TABLESPACE;
ERROR HY000: Schema mismatch (Table flags don't match, server table has 0x5 and the meta-data file has 0x0)
ERROR HY000: Schema mismatch (Table flags don't match, server table has 0x21 and the meta-data file has 0x0)
unlink: t1.ibd
unlink: t1.cfg
DROP TABLE t1;
......@@ -766,7 +766,7 @@ SELECT * FROM t1;
ERROR HY000: Tablespace has been discarded for table 't1'
restore: t1 .ibd and .cfg files
ALTER TABLE t1 IMPORT TABLESPACE;
ERROR HY000: Schema mismatch (Table flags don't match, server table has 0x5 and the meta-data file has 0x1)
ERROR HY000: Schema mismatch (Table flags don't match, server table has 0x0 and the meta-data file has 0x1)
unlink: t1.ibd
unlink: t1.cfg
DROP TABLE t1;
......@@ -778,7 +778,7 @@ SELECT * FROM t1;
ERROR HY000: Tablespace has been discarded for table 't1'
restore: t1 .ibd and .cfg files
ALTER TABLE t1 IMPORT TABLESPACE;
ERROR HY000: Schema mismatch (Table flags don't match, server table has 0x5 and the meta-data file has 0x1)
ERROR HY000: Schema mismatch (Table flags don't match, server table has 0x21 and the meta-data file has 0x1)
unlink: t1.ibd
unlink: t1.cfg
DROP TABLE t1;
......@@ -955,7 +955,7 @@ SELECT * FROM t1;
ERROR HY000: Tablespace has been discarded for table 't1'
restore: t1 .ibd and .cfg files
ALTER TABLE t1 IMPORT TABLESPACE;
ERROR HY000: Schema mismatch (Table flags don't match, server table has 0x5 and the meta-data file has 0x21)
ERROR HY000: Schema mismatch (Table flags don't match, server table has 0x1 and the meta-data file has 0x21)
unlink: t1.ibd
unlink: t1.cfg
DROP TABLE t1;
......@@ -967,7 +967,7 @@ SELECT * FROM t1;
ERROR HY000: Tablespace has been discarded for table 't1'
restore: t1 .ibd and .cfg files
ALTER TABLE t1 IMPORT TABLESPACE;
ERROR HY000: Schema mismatch (Table flags don't match, server table has 0x5 and the meta-data file has 0x21)
ERROR HY000: Schema mismatch (Table flags don't match, server table has 0x0 and the meta-data file has 0x21)
unlink: t1.ibd
unlink: t1.cfg
DROP TABLE t1;
......
storage/innobase/include/univ.i
View file @ 87b6df31
......@@ -419,13 +419,12 @@ the word size of the machine, that is on a 32-bit platform 32 bits, and on a
macro ULINTPF. */
#ifdef __WIN__
#ifdef _WIN32
/* Use the integer types and formatting strings defined in Visual Studio. */
# define UINT32PF "%I32u"
# define INT64PF "%I64d"
# define UINT64PF "%I64u"
# define UINT64PFx "%016I64x"
# define DBUG_LSN_PF "%llu"
# define UINT32PF "%u"
# define INT64PF "%lld"
# define UINT64PF "%llu"
# define UINT64PFx "%016llx"
typedef __int64 ib_int64_t;
typedef unsigned __int64 ib_uint64_t;
typedef unsigned __int32 ib_uint32_t;
......@@ -435,13 +434,12 @@ typedef unsigned __int32 ib_uint32_t;
# define INT64PF "%" PRId64
# define UINT64PF "%" PRIu64
# define UINT64PFx "%016" PRIx64
# define DBUG_LSN_PF UINT64PF
typedef int64_t ib_int64_t;
typedef uint64_t ib_uint64_t;
typedef uint32_t ib_uint32_t;
# endif /* __WIN__ */
#endif
# define IB_ID_FMT UINT64PF
#define IB_ID_FMT UINT64PF
#ifdef _WIN64
typedef unsigned __int64 ulint;
......
storage/innobase/log/log0recv.cc
View file @ 87b6df31
......@@ -1702,7 +1702,7 @@ recv_recover_page_func(
}
DBUG_PRINT("ib_log",
("apply " DBUG_LSN_PF ": %u len %u "
("apply " LSN_PF ": %u len %u "
"page %u:%u", recv->start_lsn,
(unsigned) recv->type,
(unsigned) recv->len,
......@@ -2350,7 +2350,7 @@ recv_parse_log_recs(
recv_sys->recovered_lsn = new_recovered_lsn;
DBUG_PRINT("ib_log",
("scan " DBUG_LSN_PF ": log rec %u len %u "
("scan " LSN_PF ": log rec %u len %u "
"page %u:%u", old_lsn,
(unsigned) type, (unsigned) len,
(unsigned) space, (unsigned) page_no));
......@@ -2441,7 +2441,7 @@ recv_parse_log_recs(
#endif /* UNIV_LOG_DEBUG */
DBUG_PRINT("ib_log",
("scan " DBUG_LSN_PF ": multi-log rec %u "
("scan " LSN_PF ": multi-log rec %u "
"len %u page %u:%u",
recv_sys->recovered_lsn,
(unsigned) type, (unsigned) len,
......
storage/innobase/row/row0import.cc
View file @ 87b6df31
/*****************************************************************************
Copyright (c) 2012, 2016, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 2015, 2017, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software
......@@ -573,8 +574,8 @@ AbstractCallback::init(
} else if (!is_compressed_table() && m_page_size != UNIV_PAGE_SIZE) {
ib_logf(IB_LOG_LEVEL_ERROR,
"Page size %lu of ibd file is not the same "
"as the server page size %lu",
"Page size " ULINTPF " of ibd file is not the same "
"as the server page size " ULINTPF,
m_page_size, UNIV_PAGE_SIZE);
return(DB_CORRUPTION);
......@@ -583,8 +584,8 @@ AbstractCallback::init(
ib_logf(IB_LOG_LEVEL_ERROR,
"File size " UINT64PF " is not a multiple "
"of the page size %lu",
(ib_uint64_t) file_size, (ulong) m_page_size);
"of the page size " ULINTPF,
(ib_uint64_t) file_size, m_page_size);
return(DB_CORRUPTION);
}
......@@ -725,8 +726,8 @@ FetchIndexRootPages::operator() (
if (block->page.offset * m_page_size != offset) {
ib_logf(IB_LOG_LEVEL_ERROR,
"Page offset doesn't match file offset: "
"page offset: %lu, file offset: %lu",
(ulint) block->page.offset,
"page offset: %u, file offset: " ULINTPF,
block->page.offset,
(ulint) (offset / m_page_size));
err = DB_CORRUPTION;
......@@ -1159,10 +1160,9 @@ row_import::match_index_columns(
ib_errf(thd, IB_LOG_LEVEL_ERROR,
ER_TABLE_SCHEMA_MISMATCH,
"Index field count %lu doesn't match"
" tablespace metadata file value %lu",
(ulong) index->n_fields,
(ulong) cfg_index->m_n_fields);
"Index field count %u doesn't match"
" tablespace metadata file value " ULINTPF,
index->n_fields, cfg_index->m_n_fields);
return(DB_ERROR);
}
......@@ -1179,34 +1179,31 @@ row_import::match_index_columns(
ER_TABLE_SCHEMA_MISMATCH,
"Index field name %s doesn't match"
" tablespace metadata field name %s"
" for field position %lu",
field->name, cfg_field->name, (ulong) i);
" for field position " ULINTPF,
field->name, cfg_field->name, i);
err = DB_ERROR;
}
if (cfg_field->prefix_len != field->prefix_len) {
ib_errf(thd, IB_LOG_LEVEL_ERROR,
ER_TABLE_SCHEMA_MISMATCH,
"Index %s field %s prefix len %lu"
" doesn't match metadata file value"
" %lu",
index->name, field->name,
(ulong) field->prefix_len,
(ulong) cfg_field->prefix_len);
ER_TABLE_SCHEMA_MISMATCH,
"Index %s field %s prefix len %u"
" doesn't match metadata file value %u",
index->name, field->name,
field->prefix_len, cfg_field->prefix_len);
err = DB_ERROR;
}
if (cfg_field->fixed_len != field->fixed_len) {
ib_errf(thd, IB_LOG_LEVEL_ERROR,
ER_TABLE_SCHEMA_MISMATCH,
"Index %s field %s fixed len %lu"
" doesn't match metadata file value"
" %lu",
index->name, field->name,
(ulong) field->fixed_len,
(ulong) cfg_field->fixed_len);
ER_TABLE_SCHEMA_MISMATCH,
"Index %s field %s fixed len %u"
" doesn't match metadata file value %u",
index->name, field->name,
field->fixed_len,
cfg_field->fixed_len);
err = DB_ERROR;
}
......@@ -1248,12 +1245,11 @@ row_import::match_table_columns(
} else if (cfg_col_index != col->ind) {
ib_errf(thd, IB_LOG_LEVEL_ERROR,
ER_TABLE_SCHEMA_MISMATCH,
"Column %s ordinal value mismatch, it's at "
"%lu in the table and %lu in the tablespace "
"meta-data file",
col_name,
(ulong) col->ind, (ulong) cfg_col_index);
ER_TABLE_SCHEMA_MISMATCH,
"Column %s ordinal value mismatch, it's at %u"
" in the table and " ULINTPF
" in the tablespace meta-data file",
col_name, col->ind, cfg_col_index);
err = DB_ERROR;
} else {
......@@ -1336,19 +1332,19 @@ row_import::match_schema(
{
/* Do some simple checks. */
if (m_flags != m_table->flags) {
if ((m_table->flags ^ m_flags) & ~DICT_TF_MASK_DATA_DIR) {
ib_errf(thd, IB_LOG_LEVEL_ERROR, ER_TABLE_SCHEMA_MISMATCH,
"Table flags don't match, server table has 0x%lx "
"and the meta-data file has 0x%lx",
(ulong) m_table->n_cols, (ulong) m_flags);
"Table flags don't match, server table has 0x%x"
" and the meta-data file has 0x%lx",
m_table->flags, ulong(m_flags));
return(DB_ERROR);
} else if (m_table->n_cols != m_n_cols) {
ib_errf(thd, IB_LOG_LEVEL_ERROR, ER_TABLE_SCHEMA_MISMATCH,
"Number of columns don't match, table has %lu "
"columns but the tablespace meta-data file has "
"%lu columns",
(ulong) m_table->n_cols, (ulong) m_n_cols);
"Number of columns don't match, table has %u"
" columns but the tablespace meta-data file has "
ULINTPF " columns",
m_table->n_cols, m_n_cols);
return(DB_ERROR);
} else if (UT_LIST_GET_LEN(m_table->indexes) != m_n_indexes) {
......@@ -1358,11 +1354,10 @@ row_import::match_schema(
table matching the IMPORT definition. */
ib_errf(thd, IB_LOG_LEVEL_ERROR, ER_TABLE_SCHEMA_MISMATCH,
"Number of indexes don't match, table has %lu "
"indexes but the tablespace meta-data file has "
"%lu indexes",
(ulong) UT_LIST_GET_LEN(m_table->indexes),
(ulong) m_n_indexes);
"Number of indexes don't match, table has " ULINTPF
" indexes but the tablespace meta-data file has "
ULINTPF " indexes",
UT_LIST_GET_LEN(m_table->indexes), m_n_indexes);
return(DB_ERROR);
}
......@@ -1438,8 +1433,8 @@ row_import::set_root_by_heuristic() UNIV_NOTHROW
table_name, sizeof(table_name), m_table->name, FALSE);
ib_logf(IB_LOG_LEVEL_WARN,
"Table %s should have %lu indexes but the tablespace "
"has %lu indexes",
"Table %s should have " ULINTPF
" indexes but the tablespace has " ULINTPF " indexes",
table_name,
UT_LIST_GET_LEN(m_table->indexes),
m_n_indexes);
......@@ -1677,9 +1672,10 @@ PageConverter::adjust_cluster_index_blob_column(
ib_errf(m_trx->mysql_thd, IB_LOG_LEVEL_ERROR,
ER_INNODB_INDEX_CORRUPT,
"Externally stored column(%lu) has a reference "
"length of %lu in the cluster index %s",
(ulong) i, (ulong) len, index_name);
"Externally stored column(" ULINTPF
") has a reference length of " ULINTPF
" in the cluster index %s",
i, len, index_name);
return(DB_CORRUPTION);
}
......@@ -2040,7 +2036,8 @@ PageConverter::update_page(
return(err);
}
ib_logf(IB_LOG_LEVEL_WARN, "Unknown page type (%lu)", page_type);
ib_logf(IB_LOG_LEVEL_WARN, "Unknown page type (" ULINTPF ")",
page_type);
return(DB_CORRUPTION);
}
......@@ -2074,7 +2071,8 @@ PageConverter::validate(
if (checksum != 0) {
/* Checksum check passed in buf_page_is_corrupted(). */
ib_logf(IB_LOG_LEVEL_WARN,
"%s: Page %lu checksum %lu should be zero.",
"%s: Page %lu checksum " ULINTPF
" should be zero.",
m_filepath, (ulong) (offset / m_page_size),
checksum);
}
......@@ -2388,11 +2386,10 @@ row_import_adjust_root_pages_of_secondary_indexes(
ib_errf(trx->mysql_thd,
IB_LOG_LEVEL_WARN,
ER_INNODB_INDEX_CORRUPT,
"Index '%s' contains %lu entries, "
"should be %lu, you should recreate "
"Index '%s' contains " ULINTPF " entries, "
"should be " ULINTPF ", you should recreate "
"this index.", index_name,
(ulong) purge.get_n_rows(),
(ulong) n_rows_in_table);
purge.get_n_rows(), n_rows_in_table);
index->type |= DICT_CORRUPT;
......@@ -2743,7 +2740,7 @@ row_import_read_index_data(
if (len > OS_FILE_MAX_PATH) {
ib_errf(thd, IB_LOG_LEVEL_ERROR,
ER_INNODB_INDEX_CORRUPT,
"Index name length (%lu) is too long, "
"Index name length (" ULINTPF ") is too long, "
"the meta-data is corrupt", len);
return(DB_CORRUPTION);
......@@ -2824,8 +2821,8 @@ row_import_read_indexes(
} else if (cfg->m_n_indexes > 1024) {
// FIXME: What is the upper limit? */
ib_errf(thd, IB_LOG_LEVEL_ERROR, ER_IO_READ_ERROR,
"Number of indexes in meta-data file is too high: %lu",
(ulong) cfg->m_n_indexes);
"Number of indexes in meta-data file is too high: "
ULINTPF, cfg->m_n_indexes);
cfg->m_n_indexes = 0;
return(DB_CORRUPTION);
......@@ -2923,8 +2920,8 @@ row_import_read_columns(
if (len == 0 || len > 128) {
ib_errf(thd, IB_LOG_LEVEL_ERROR,
ER_IO_READ_ERROR,
"Column name length %lu, is invalid",
(ulong) len);
"Column name length " ULINTPF ", is invalid",
len);
return(DB_CORRUPTION);
}
......@@ -3095,8 +3092,9 @@ row_import_read_v1(
ib_errf(thd, IB_LOG_LEVEL_ERROR, ER_TABLE_SCHEMA_MISMATCH,
"Tablespace to be imported has a different "
"page size than this server. Server page size "
"is %lu, whereas tablespace page size is %lu",
UNIV_PAGE_SIZE, (ulong) cfg->m_page_size);
"is " ULINTPF ", whereas tablespace page size is "
ULINTPF,
UNIV_PAGE_SIZE, cfg->m_page_size);
return(DB_ERROR);
}
......@@ -3161,8 +3159,8 @@ row_import_read_meta_data(
return(row_import_read_v1(file, thd, &cfg));
default:
ib_errf(thd, IB_LOG_LEVEL_ERROR, ER_IO_READ_ERROR,
"Unsupported meta-data version number (%lu), "
"file ignored", (ulong) cfg.m_version);
"Unsupported meta-data version number (" ULINTPF "), "
"file ignored", cfg.m_version);
}
return(DB_ERROR);
......
storage/innobase/row/row0merge.cc
View file @ 87b6df31
/*****************************************************************************
Copyright (c) 2005, 2016, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 2014, 2017, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software
......@@ -95,7 +96,8 @@ row_merge_tuple_print(
}
ut_print_buf(f, dfield_get_data(field), len);
if (len != field_len) {
fprintf(f, " (total %lu bytes)", field_len);
fprintf(f, " (total " ULINTPF " bytes)",
field_len);
}
}
}
......@@ -781,9 +783,9 @@ row_merge_buf_write(
ut_ad(b < &block[srv_sort_buf_size]);
#ifdef UNIV_DEBUG
if (row_merge_print_write) {
fprintf(stderr, "row_merge_buf_write %p,%d,%lu %lu",
(void*) b, of->fd, (ulong) of->offset,
(ulong) i);
fprintf(stderr, "row_merge_buf_write %p,%d,"
ULINTPF " " ULINTPF,
(void*) b, of->fd, of->offset, i);
row_merge_tuple_print(stderr, entry, n_fields);
}
#endif /* UNIV_DEBUG */
......@@ -800,8 +802,8 @@ row_merge_buf_write(
#endif /* UNIV_DEBUG_VALGRIND */
#ifdef UNIV_DEBUG
if (row_merge_print_write) {
fprintf(stderr, "row_merge_buf_write %p,%d,%lu EOF\n",
(void*) b, of->fd, (ulong) of->offset);
fprintf(stderr, "row_merge_buf_write %p,%d," ULINTPF " EOF\n",
(void*) b, of->fd, of->offset);
}
#endif /* UNIV_DEBUG */
}
......@@ -857,15 +859,8 @@ row_merge_read(
#ifdef UNIV_DEBUG
if (row_merge_print_block_read) {
fprintf(stderr, "row_merge_read fd=%d ofs=%lu\n",
fd, (ulong) offset);
}
#endif /* UNIV_DEBUG */
#ifdef UNIV_DEBUG
if (row_merge_print_block_read) {
fprintf(stderr, "row_merge_read fd=%d ofs=%lu\n",
fd, (ulong) offset);
fprintf(stderr, "row_merge_read fd=%d ofs=" ULINTPF "\n",
fd, offset);
}
#endif /* UNIV_DEBUG */
......@@ -908,8 +903,8 @@ row_merge_write(
#ifdef UNIV_DEBUG
if (row_merge_print_block_write) {
fprintf(stderr, "row_merge_write fd=%d ofs=%lu\n",
fd, (ulong) offset);
fprintf(stderr, "row_merge_write fd=%d ofs=" ULINTPF "\n",
fd, offset);
}
#endif /* UNIV_DEBUG */
......@@ -957,9 +952,10 @@ row_merge_read_rec(
*mrec = NULL;
#ifdef UNIV_DEBUG
if (row_merge_print_read) {
fprintf(stderr, "row_merge_read %p,%p,%d,%lu EOF\n",
fprintf(stderr, "row_merge_read %p,%p,%d," ULINTPF
" EOF\n",
(const void*) b, (const void*) block,
fd, (ulong) *foffs);
fd, *foffs);
}
#endif /* UNIV_DEBUG */
return(NULL);
......@@ -1074,9 +1070,9 @@ row_merge_read_rec(
func_exit:
#ifdef UNIV_DEBUG
if (row_merge_print_read) {
fprintf(stderr, "row_merge_read %p,%p,%d,%lu ",
fprintf(stderr, "row_merge_read %p,%p,%d," ULINTPF " ",
(const void*) b, (const void*) block,
fd, (ulong) *foffs);
fd, *foffs);
rec_print_comp(stderr, *mrec, offsets);
putc('\n', stderr);
}
......@@ -1110,8 +1106,8 @@ row_merge_write_rec_low(
ut_ad(e == rec_offs_extra_size(offsets) + 1);
if (row_merge_print_write) {
fprintf(stderr, "row_merge_write %p,%d,%lu ",
(void*) b, fd, (ulong) foffs);
fprintf(stderr, "row_merge_write %p,%d," ULINTPF " ",
(void*) b, fd, foffs);
rec_print_comp(stderr, mrec, offsets);
putc('\n', stderr);
}
......@@ -1213,8 +1209,8 @@ row_merge_write_eof(
ut_ad(foffs);
#ifdef UNIV_DEBUG
if (row_merge_print_write) {
fprintf(stderr, "row_merge_write %p,%p,%d,%lu EOF\n",
(void*) b, (void*) block, fd, (ulong) *foffs);
fprintf(stderr, "row_merge_write %p,%p,%d," ULINTPF " EOF\n",
(void*) b, (void*) block, fd, *foffs);
}
#endif /* UNIV_DEBUG */
......@@ -2053,11 +2049,12 @@ row_merge_blocks(
#ifdef UNIV_DEBUG
if (row_merge_print_block) {
fprintf(stderr,
"row_merge_blocks fd=%d ofs=%lu + fd=%d ofs=%lu"
" = fd=%d ofs=%lu\n",
file->fd, (ulong) *foffs0,
file->fd, (ulong) *foffs1,
of->fd, (ulong) of->offset);
"row_merge_blocks fd=%d ofs=" ULINTPF
" + fd=%d ofs=" ULINTPF
" = fd=%d ofs=" ULINTPF "\n",
file->fd, *foffs0,
file->fd, *foffs1,
of->fd, of->offset);
}
#endif /* UNIV_DEBUG */
......@@ -2156,10 +2153,10 @@ row_merge_blocks_copy(
#ifdef UNIV_DEBUG
if (row_merge_print_block) {
fprintf(stderr,
"row_merge_blocks_copy fd=%d ofs=%lu"
" = fd=%d ofs=%lu\n",
file->fd, (ulong) foffs0,
of->fd, (ulong) of->offset);
"row_merge_blocks_copy fd=%d ofs=" ULINTPF
" = fd=%d ofs=" ULINTPF "\n",
file->fd, *foffs0,
of->fd, of->offset);
}
#endif /* UNIV_DEBUG */
......
storage/xtradb/include/univ.i
View file @ 87b6df31
......@@ -438,13 +438,12 @@ the word size of the machine, that is on a 32-bit platform 32 bits, and on a
macro ULINTPF. */
#ifdef __WIN__
#ifdef _WIN32
/* Use the integer types and formatting strings defined in Visual Studio. */
# define UINT32PF "%I32u"
# define INT64PF "%I64d"
# define UINT64PF "%I64u"
# define UINT64PFx "%016I64x"
# define DBUG_LSN_PF "%llu"
# define UINT32PF "%u"
# define INT64PF "%lld"
# define UINT64PF "%llu"
# define UINT64PFx "%016llx"
typedef __int64 ib_int64_t;
typedef unsigned __int64 ib_uint64_t;
typedef unsigned __int32 ib_uint32_t;
......@@ -454,13 +453,12 @@ typedef unsigned __int32 ib_uint32_t;
# define INT64PF "%" PRId64
# define UINT64PF "%" PRIu64
# define UINT64PFx "%016" PRIx64
# define DBUG_LSN_PF UINT64PF
typedef int64_t ib_int64_t;
typedef uint64_t ib_uint64_t;
typedef uint32_t ib_uint32_t;
# endif /* __WIN__ */
#endif
# define IB_ID_FMT UINT64PF
#define IB_ID_FMT UINT64PF
#ifdef _WIN64
typedef unsigned __int64 ulint;
......
storage/xtradb/log/log0recv.cc
View file @ 87b6df31
......@@ -1792,7 +1792,7 @@ recv_recover_page_func(
}
DBUG_PRINT("ib_log",
("apply " DBUG_LSN_PF ": %u len %u "
("apply " LSN_PF ": %u len %u "
"page %u:%u", recv->start_lsn,
(unsigned) recv->type,
(unsigned) recv->len,
......@@ -2440,7 +2440,7 @@ recv_parse_log_recs(
recv_sys->recovered_lsn = new_recovered_lsn;
DBUG_PRINT("ib_log",
("scan " DBUG_LSN_PF ": log rec %u len %u "
("scan " LSN_PF ": log rec %u len %u "
"page %u:%u", old_lsn,
(unsigned) type, (unsigned) len,
(unsigned) space, (unsigned) page_no));
......@@ -2531,7 +2531,7 @@ recv_parse_log_recs(
#endif /* UNIV_LOG_DEBUG */
DBUG_PRINT("ib_log",
("scan " DBUG_LSN_PF ": multi-log rec %u "
("scan " LSN_PF ": multi-log rec %u "
"len %u page %u:%u",
recv_sys->recovered_lsn,
(unsigned) type, (unsigned) len,
......
storage/xtradb/row/row0import.cc
View file @ 87b6df31
/*****************************************************************************
Copyright (c) 2012, 2016, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 2015, 2017, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software
......@@ -573,8 +574,8 @@ AbstractCallback::init(
} else if (!is_compressed_table() && m_page_size != UNIV_PAGE_SIZE) {
ib_logf(IB_LOG_LEVEL_ERROR,
"Page size %lu of ibd file is not the same "
"as the server page size %lu",
"Page size " ULINTPF " of ibd file is not the same "
"as the server page size " ULINTPF,
m_page_size, UNIV_PAGE_SIZE);
return(DB_CORRUPTION);
......@@ -583,8 +584,8 @@ AbstractCallback::init(
ib_logf(IB_LOG_LEVEL_ERROR,
"File size " UINT64PF " is not a multiple "
"of the page size %lu",
(ib_uint64_t) file_size, (ulong) m_page_size);
"of the page size " ULINTPF,
(ib_uint64_t) file_size, m_page_size);
return(DB_CORRUPTION);
}
......@@ -725,8 +726,8 @@ FetchIndexRootPages::operator() (
if (block->page.offset * m_page_size != offset) {
ib_logf(IB_LOG_LEVEL_ERROR,
"Page offset doesn't match file offset: "
"page offset: %lu, file offset: %lu",
(ulint) block->page.offset,
"page offset: %u, file offset: " ULINTPF,
block->page.offset,
(ulint) (offset / m_page_size));
err = DB_CORRUPTION;
......@@ -1159,10 +1160,9 @@ row_import::match_index_columns(
ib_errf(thd, IB_LOG_LEVEL_ERROR,
ER_TABLE_SCHEMA_MISMATCH,
"Index field count %lu doesn't match"
" tablespace metadata file value %lu",
(ulong) index->n_fields,
(ulong) cfg_index->m_n_fields);
"Index field count %u doesn't match"
" tablespace metadata file value " ULINTPF,
index->n_fields, cfg_index->m_n_fields);
return(DB_ERROR);
}
......@@ -1179,34 +1179,31 @@ row_import::match_index_columns(
ER_TABLE_SCHEMA_MISMATCH,
"Index field name %s doesn't match"
" tablespace metadata field name %s"
" for field position %lu",
field->name, cfg_field->name, (ulong) i);
" for field position " ULINTPF,
field->name, cfg_field->name, i);
err = DB_ERROR;
}
if (cfg_field->prefix_len != field->prefix_len) {
ib_errf(thd, IB_LOG_LEVEL_ERROR,
ER_TABLE_SCHEMA_MISMATCH,
"Index %s field %s prefix len %lu"
" doesn't match metadata file value"
" %lu",
index->name, field->name,
(ulong) field->prefix_len,
(ulong) cfg_field->prefix_len);
ER_TABLE_SCHEMA_MISMATCH,
"Index %s field %s prefix len %u"
" doesn't match metadata file value %u",
index->name, field->name,
field->prefix_len, cfg_field->prefix_len);
err = DB_ERROR;
}
if (cfg_field->fixed_len != field->fixed_len) {
ib_errf(thd, IB_LOG_LEVEL_ERROR,
ER_TABLE_SCHEMA_MISMATCH,
"Index %s field %s fixed len %lu"
" doesn't match metadata file value"
" %lu",
index->name, field->name,
(ulong) field->fixed_len,
(ulong) cfg_field->fixed_len);
ER_TABLE_SCHEMA_MISMATCH,
"Index %s field %s fixed len %u"
" doesn't match metadata file value %u",
index->name, field->name,
field->fixed_len,
cfg_field->fixed_len);
err = DB_ERROR;
}
......@@ -1248,12 +1245,11 @@ row_import::match_table_columns(
} else if (cfg_col_index != col->ind) {
ib_errf(thd, IB_LOG_LEVEL_ERROR,
ER_TABLE_SCHEMA_MISMATCH,
"Column %s ordinal value mismatch, it's at "
"%lu in the table and %lu in the tablespace "
"meta-data file",
col_name,
(ulong) col->ind, (ulong) cfg_col_index);
ER_TABLE_SCHEMA_MISMATCH,
"Column %s ordinal value mismatch, it's at %u"
" in the table and " ULINTPF
" in the tablespace meta-data file",
col_name, col->ind, cfg_col_index);
err = DB_ERROR;
} else {
......@@ -1335,23 +1331,20 @@ row_import::match_schema(
THD* thd) UNIV_NOTHROW
{
/* Do some simple checks. */
const unsigned relevant_flags = m_flags & ~DICT_TF_MASK_DATA_DIR;
const unsigned relevant_table_flags
= m_table->flags & ~DICT_TF_MASK_DATA_DIR;
if (relevant_flags != relevant_table_flags) {
if ((m_table->flags ^ m_flags) & ~DICT_TF_MASK_DATA_DIR) {
ib_errf(thd, IB_LOG_LEVEL_ERROR, ER_TABLE_SCHEMA_MISMATCH,
"Table flags don't match, server table has 0x%x "
"and the meta-data file has 0x%x",
relevant_table_flags, relevant_flags);
"Table flags don't match, server table has 0x%x"
" and the meta-data file has 0x%lx",
m_table->flags, ulong(m_flags));
return(DB_ERROR);
} else if (m_table->n_cols != m_n_cols) {
ib_errf(thd, IB_LOG_LEVEL_ERROR, ER_TABLE_SCHEMA_MISMATCH,
"Number of columns don't match, table has %lu "
"columns but the tablespace meta-data file has "
"%lu columns",
(ulong) m_table->n_cols, (ulong) m_n_cols);
"Number of columns don't match, table has %u "
"columns but the tablespace meta-data file has "
ULINTPF " columns",
m_table->n_cols, m_n_cols);
return(DB_ERROR);
} else if (UT_LIST_GET_LEN(m_table->indexes) != m_n_indexes) {
......@@ -1361,11 +1354,10 @@ row_import::match_schema(
table matching the IMPORT definition. */
ib_errf(thd, IB_LOG_LEVEL_ERROR, ER_TABLE_SCHEMA_MISMATCH,
"Number of indexes don't match, table has %lu "
"indexes but the tablespace meta-data file has "
"%lu indexes",
(ulong) UT_LIST_GET_LEN(m_table->indexes),
(ulong) m_n_indexes);
"Number of indexes don't match, table has " ULINTPF
" indexes but the tablespace meta-data file has "
ULINTPF " indexes",
UT_LIST_GET_LEN(m_table->indexes), m_n_indexes);
return(DB_ERROR);
}
......@@ -1441,8 +1433,8 @@ row_import::set_root_by_heuristic() UNIV_NOTHROW
table_name, sizeof(table_name), m_table->name, FALSE);
ib_logf(IB_LOG_LEVEL_WARN,
"Table %s should have %lu indexes but the tablespace "
"has %lu indexes",
"Table %s should have " ULINTPF
" indexes but the tablespace has " ULINTPF " indexes",
table_name,
UT_LIST_GET_LEN(m_table->indexes),
m_n_indexes);
......@@ -1680,9 +1672,10 @@ PageConverter::adjust_cluster_index_blob_column(
ib_errf(m_trx->mysql_thd, IB_LOG_LEVEL_ERROR,
ER_INNODB_INDEX_CORRUPT,
"Externally stored column(%lu) has a reference "
"length of %lu in the cluster index %s",
(ulong) i, (ulong) len, index_name);
"Externally stored column(" ULINTPF
") has a reference length of " ULINTPF
" in the cluster index %s",
i, len, index_name);
return(DB_CORRUPTION);
}
......@@ -2043,7 +2036,8 @@ PageConverter::update_page(
return(err);
}
ib_logf(IB_LOG_LEVEL_WARN, "Unknown page type (%lu)", page_type);
ib_logf(IB_LOG_LEVEL_WARN, "Unknown page type (" ULINTPF ")",
page_type);
return(DB_CORRUPTION);
}
......@@ -2077,7 +2071,8 @@ PageConverter::validate(
if (checksum != 0) {
/* Checksum check passed in buf_page_is_corrupted(). */
ib_logf(IB_LOG_LEVEL_WARN,
"%s: Page %lu checksum %lu should be zero.",
"%s: Page %lu checksum " ULINTPF
" should be zero.",
m_filepath, (ulong) (offset / m_page_size),
checksum);
}
......@@ -2391,11 +2386,10 @@ row_import_adjust_root_pages_of_secondary_indexes(
ib_errf(trx->mysql_thd,
IB_LOG_LEVEL_WARN,
ER_INNODB_INDEX_CORRUPT,
"Index '%s' contains %lu entries, "
"should be %lu, you should recreate "
"Index '%s' contains " ULINTPF " entries, "
"should be " ULINTPF ", you should recreate "
"this index.", index_name,
(ulong) purge.get_n_rows(),
(ulong) n_rows_in_table);
purge.get_n_rows(), n_rows_in_table);
index->type |= DICT_CORRUPT;
......@@ -2746,7 +2740,7 @@ row_import_read_index_data(
if (len > OS_FILE_MAX_PATH) {
ib_errf(thd, IB_LOG_LEVEL_ERROR,
ER_INNODB_INDEX_CORRUPT,
"Index name length (%lu) is too long, "
"Index name length (" ULINTPF ") is too long, "
"the meta-data is corrupt", len);
return(DB_CORRUPTION);
......@@ -2827,8 +2821,8 @@ row_import_read_indexes(
} else if (cfg->m_n_indexes > 1024) {
// FIXME: What is the upper limit? */
ib_errf(thd, IB_LOG_LEVEL_ERROR, ER_IO_READ_ERROR,
"Number of indexes in meta-data file is too high: %lu",
(ulong) cfg->m_n_indexes);
"Number of indexes in meta-data file is too high: "
ULINTPF, cfg->m_n_indexes);
cfg->m_n_indexes = 0;
return(DB_CORRUPTION);
......@@ -2926,8 +2920,8 @@ row_import_read_columns(
if (len == 0 || len > 128) {
ib_errf(thd, IB_LOG_LEVEL_ERROR,
ER_IO_READ_ERROR,
"Column name length %lu, is invalid",
(ulong) len);
"Column name length " ULINTPF ", is invalid",
len);
return(DB_CORRUPTION);
}
......@@ -3098,8 +3092,9 @@ row_import_read_v1(
ib_errf(thd, IB_LOG_LEVEL_ERROR, ER_TABLE_SCHEMA_MISMATCH,
"Tablespace to be imported has a different "
"page size than this server. Server page size "
"is %lu, whereas tablespace page size is %lu",
UNIV_PAGE_SIZE, (ulong) cfg->m_page_size);
"is " ULINTPF ", whereas tablespace page size is "
ULINTPF,
UNIV_PAGE_SIZE, cfg->m_page_size);
return(DB_ERROR);
}
......@@ -3164,8 +3159,8 @@ row_import_read_meta_data(
return(row_import_read_v1(file, thd, &cfg));
default:
ib_errf(thd, IB_LOG_LEVEL_ERROR, ER_IO_READ_ERROR,
"Unsupported meta-data version number (%lu), "
"file ignored", (ulong) cfg.m_version);
"Unsupported meta-data version number (" ULINTPF "), "
"file ignored", cfg.m_version);
}
return(DB_ERROR);
......
storage/xtradb/row/row0merge.cc
View file @ 87b6df31
/*****************************************************************************
Copyright (c) 2005, 2016, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 2017, MariaDB Corporation.
Copyright (c) 2014, 2017, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software
......@@ -96,7 +96,8 @@ row_merge_tuple_print(
}
ut_print_buf(f, dfield_get_data(field), len);
if (len != field_len) {
fprintf(f, " (total %lu bytes)", field_len);
fprintf(f, " (total " ULINTPF " bytes)",
field_len);
}
}
}
......@@ -789,9 +790,9 @@ row_merge_buf_write(
ut_ad(b < &block[srv_sort_buf_size]);
#ifdef UNIV_DEBUG
if (row_merge_print_write) {
fprintf(stderr, "row_merge_buf_write %p,%d,%lu %lu",
(void*) b, of->fd, (ulong) of->offset,
(ulong) i);
fprintf(stderr, "row_merge_buf_write %p,%d,"
ULINTPF " " ULINTPF,
(void*) b, of->fd, of->offset, i);
row_merge_tuple_print(stderr, entry, n_fields);
}
#endif /* UNIV_DEBUG */
......@@ -808,8 +809,8 @@ row_merge_buf_write(
#endif /* UNIV_DEBUG_VALGRIND */
#ifdef UNIV_DEBUG
if (row_merge_print_write) {
fprintf(stderr, "row_merge_buf_write %p,%d,%lu EOF\n",
(void*) b, of->fd, (ulong) of->offset);
fprintf(stderr, "row_merge_buf_write %p,%d," ULINTPF " EOF\n",
(void*) b, of->fd, of->offset);
}
#endif /* UNIV_DEBUG */
}
......@@ -865,15 +866,8 @@ row_merge_read(
#ifdef UNIV_DEBUG
if (row_merge_print_block_read) {
fprintf(stderr, "row_merge_read fd=%d ofs=%lu\n",
fd, (ulong) offset);
}
#endif /* UNIV_DEBUG */
#ifdef UNIV_DEBUG
if (row_merge_print_block_read) {
fprintf(stderr, "row_merge_read fd=%d ofs=%lu\n",
fd, (ulong) offset);
fprintf(stderr, "row_merge_read fd=%d ofs=" ULINTPF "\n",
fd, offset);
}
#endif /* UNIV_DEBUG */
......@@ -916,8 +910,8 @@ row_merge_write(
#ifdef UNIV_DEBUG
if (row_merge_print_block_write) {
fprintf(stderr, "row_merge_write fd=%d ofs=%lu\n",
fd, (ulong) offset);
fprintf(stderr, "row_merge_write fd=%d ofs=" ULINTPF "\n",
fd, offset);
}
#endif /* UNIV_DEBUG */
......@@ -965,9 +959,10 @@ row_merge_read_rec(
*mrec = NULL;
#ifdef UNIV_DEBUG
if (row_merge_print_read) {
fprintf(stderr, "row_merge_read %p,%p,%d,%lu EOF\n",
fprintf(stderr, "row_merge_read %p,%p,%d," ULINTPF
" EOF\n",
(const void*) b, (const void*) block,
fd, (ulong) *foffs);
fd, *foffs);
}
#endif /* UNIV_DEBUG */
return(NULL);
......@@ -1082,9 +1077,9 @@ row_merge_read_rec(
func_exit:
#ifdef UNIV_DEBUG
if (row_merge_print_read) {
fprintf(stderr, "row_merge_read %p,%p,%d,%lu ",
fprintf(stderr, "row_merge_read %p,%p,%d," ULINTPF " ",
(const void*) b, (const void*) block,
fd, (ulong) *foffs);
fd, *foffs);
rec_print_comp(stderr, *mrec, offsets);
putc('\n', stderr);
}
......@@ -1118,8 +1113,8 @@ row_merge_write_rec_low(
ut_ad(e == rec_offs_extra_size(offsets) + 1);
if (row_merge_print_write) {
fprintf(stderr, "row_merge_write %p,%d,%lu ",
(void*) b, fd, (ulong) foffs);
fprintf(stderr, "row_merge_write %p,%d," ULINTPF " ",
(void*) b, fd, foffs);
rec_print_comp(stderr, mrec, offsets);
putc('\n', stderr);
}
......@@ -1221,8 +1216,8 @@ row_merge_write_eof(
ut_ad(foffs);
#ifdef UNIV_DEBUG
if (row_merge_print_write) {
fprintf(stderr, "row_merge_write %p,%p,%d,%lu EOF\n",
(void*) b, (void*) block, fd, (ulong) *foffs);
fprintf(stderr, "row_merge_write %p,%p,%d," ULINTPF " EOF\n",
(void*) b, (void*) block, fd, *foffs);
}
#endif /* UNIV_DEBUG */
......@@ -2067,11 +2062,12 @@ row_merge_blocks(
#ifdef UNIV_DEBUG
if (row_merge_print_block) {
fprintf(stderr,
"row_merge_blocks fd=%d ofs=%lu + fd=%d ofs=%lu"
" = fd=%d ofs=%lu\n",
file->fd, (ulong) *foffs0,
file->fd, (ulong) *foffs1,
of->fd, (ulong) of->offset);
"row_merge_blocks fd=%d ofs=" ULINTPF
" + fd=%d ofs=" ULINTPF
" = fd=%d ofs=" ULINTPF "\n",
file->fd, *foffs0,
file->fd, *foffs1,
of->fd, of->offset);
}
#endif /* UNIV_DEBUG */
......@@ -2170,10 +2166,10 @@ row_merge_blocks_copy(
#ifdef UNIV_DEBUG
if (row_merge_print_block) {
fprintf(stderr,
"row_merge_blocks_copy fd=%d ofs=%lu"
" = fd=%d ofs=%lu\n",
file->fd, (ulong) foffs0,
of->fd, (ulong) of->offset);
"row_merge_blocks_copy fd=%d ofs=" ULINTPF
" = fd=%d ofs=" ULINTPF "\n",
file->fd, *foffs0,
of->fd, of->offset);
}
#endif /* UNIV_DEBUG */
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7