summaryrefslogtreecommitdiff
path: root/storage/maria/unittest
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@mariadb.com>2017-09-19 17:45:17 +0000
committerVladislav Vaintroub <wlad@mariadb.com>2017-09-28 17:20:46 +0000
commiteba44874ca9fc317696630cb371623142289fa99 (patch)
treef67cd5dbcaf102abef2fb26f76357d14feaded04 /storage/maria/unittest
parentde7c2e5e545df90fc9814c60a8a5a8d20f22b2c3 (diff)
downloadmariadb-git-eba44874ca9fc317696630cb371623142289fa99.tar.gz
MDEV-13844 : Fix Windows warnings. Fix DBUG_PRINT.
- Fix win64 pointer truncation warnings (usually coming from misusing 0x%lx and long cast in DBUG) - Also fix printf-format warnings Make the above mentioned warnings fatal. - fix pthread_join on Windows to set return value.
Diffstat (limited to 'storage/maria/unittest')
-rw-r--r--storage/maria/unittest/ma_test_loghandler-t.c30
-rw-r--r--storage/maria/unittest/ma_test_loghandler_first_lsn-t.c6
-rw-r--r--storage/maria/unittest/ma_test_loghandler_max_lsn-t.c6
-rw-r--r--storage/maria/unittest/ma_test_loghandler_multigroup-t.c24
-rw-r--r--storage/maria/unittest/ma_test_loghandler_multithread-t.c6
-rw-r--r--storage/maria/unittest/ma_test_loghandler_noflush-t.c2
6 files changed, 37 insertions, 37 deletions
diff --git a/storage/maria/unittest/ma_test_loghandler-t.c b/storage/maria/unittest/ma_test_loghandler-t.c
index aa8615e9b77..02922ed9331 100644
--- a/storage/maria/unittest/ma_test_loghandler-t.c
+++ b/storage/maria/unittest/ma_test_loghandler-t.c
@@ -114,7 +114,7 @@ static my_bool check_content(uchar *ptr, ulong length)
void read_ok(TRANSLOG_HEADER_BUFFER *rec)
{
- ok(1, "read record type: %u LSN: (%lu,0x%lx)",
+ ok(1, "read record type: %u LSN: " LSN_FMT,
rec->type, LSN_IN_PARTS(rec->lsn));
}
@@ -399,7 +399,7 @@ int main(int argc __attribute__((unused)), char *argv[])
fprintf(stderr, "Incorrect LOGREC_FIXED_RECORD_0LSN_EXAMPLE "
"data read(0)\n"
"type %u, strid %u, len %u, i: %u, 4: %u 5: %u, "
- "lsn(%lu,0x%lx)\n",
+ "lsn" LSN_FMT "\n",
(uint) rec.type, (uint) rec.short_trid, (uint) rec.record_length,
(uint) uint4korr(rec.header), (uint) rec.header[4],
(uint) rec.header[5],
@@ -444,8 +444,8 @@ int main(int argc __attribute__((unused)), char *argv[])
fprintf(stderr, "Incorrect LOGREC_FIXED_RECORD_1LSN_EXAMPLE "
"data read(%d) "
"type: %u strid: %u len: %u"
- "ref: (%lu,0x%lx) (%lu,0x%lx) "
- "lsn(%lu,0x%lx)\n",
+ "ref: " LSN_FMT " " LSN_FMT " "
+ "lsn" LSN_FMT "\n",
i, (uint) rec.type, (uint) rec.short_trid,
(uint) rec.record_length,
LSN_IN_PARTS(ref), LSN_IN_PARTS(lsn),
@@ -475,9 +475,9 @@ int main(int argc __attribute__((unused)), char *argv[])
{
fprintf(stderr, "Incorrect LOGREC_FIXED_RECORD_2LSN_EXAMPLE "
"data read(%d) "
- "type %u, strid %u, len %u, ref1(%lu,0x%lx), "
- "ref2(%lu,0x%lx) %x%x%x%x%x%x%x%x%x "
- "lsn(%lu,0x%lx)\n",
+ "type %u, strid %u, len %u, ref1" LSN_FMT ", "
+ "ref2" LSN_FMT " %x%x%x%x%x%x%x%x%x "
+ "lsn" LSN_FMT "\n",
i, (uint) rec.type, (uint) rec.short_trid,
(uint) rec.record_length,
LSN_IN_PARTS(ref1), LSN_IN_PARTS(ref2),
@@ -522,7 +522,7 @@ int main(int argc __attribute__((unused)), char *argv[])
"data read(%d)"
"type %u (%d), strid %u (%d), len %lu, %lu + 7 (%d), "
"hdr len: %u (%d), "
- "ref(%lu,0x%lx), lsn(%lu,0x%lx) (%d), content: %d\n",
+ "ref" LSN_FMT ", lsn" LSN_FMT " (%d), content: %d\n",
i, (uint) rec.type,
rec.type != LOGREC_VARIABLE_RECORD_1LSN_EXAMPLE,
(uint) rec.short_trid,
@@ -541,7 +541,7 @@ int main(int argc __attribute__((unused)), char *argv[])
{
fprintf(stderr,
"Incorrect LOGREC_VARIABLE_RECORD_1LSN_EXAMPLE "
- "in whole rec read lsn(%lu,0x%lx)\n",
+ "in whole rec read lsn" LSN_FMT "\n",
LSN_IN_PARTS(rec.lsn));
goto err;
}
@@ -565,8 +565,8 @@ int main(int argc __attribute__((unused)), char *argv[])
fprintf(stderr, "Incorrect LOGREC_VARIABLE_RECORD_2LSN_EXAMPLE "
"data read(%d) "
"type %u, strid %u, len %lu != %lu + 14, hdr len: %d, "
- "ref1(%lu,0x%lx), ref2(%lu,0x%lx), "
- "lsn(%lu,0x%lx)\n",
+ "ref1" LSN_FMT ", ref2" LSN_FMT ", "
+ "lsn" LSN_FMT "\n",
i, (uint) rec.type, (uint) rec.short_trid,
(ulong) rec.record_length, (ulong) rec_len,
len, LSN_IN_PARTS(ref1), LSN_IN_PARTS(ref2),
@@ -577,7 +577,7 @@ int main(int argc __attribute__((unused)), char *argv[])
{
fprintf(stderr,
"Incorrect LOGREC_VARIABLE_RECORD_2LSN_EXAMPLE "
- "in whole rec read lsn(%lu,0x%lx)\n",
+ "in whole rec read lsn" LSN_FMT "\n",
LSN_IN_PARTS(rec.lsn));
goto err;
}
@@ -606,7 +606,7 @@ int main(int argc __attribute__((unused)), char *argv[])
fprintf(stderr, "Incorrect LOGREC_FIXED_RECORD_0LSN_EXAMPLE "
"data read(%d)\n"
"type %u, strid %u, len %u, i: %u, 4: %u 5: %u "
- "lsn(%lu,0x%lx)\n",
+ "lsn" LSN_FMT "\n",
i, (uint) rec.type, (uint) rec.short_trid,
(uint) rec.record_length,
(uint) uint4korr(rec.header), (uint) rec.header[4],
@@ -629,7 +629,7 @@ int main(int argc __attribute__((unused)), char *argv[])
fprintf(stderr, "Incorrect LOGREC_VARIABLE_RECORD_0LSN_EXAMPLE "
"data read(%d) "
"type %u, strid %u, len %lu != %lu, hdr len: %d, "
- "lsn(%lu,0x%lx)\n",
+ "lsn" LSN_FMT "\n",
i, (uint) rec.type, (uint) rec.short_trid,
(ulong) rec.record_length, (ulong) rec_len,
len, LSN_IN_PARTS(rec.lsn));
@@ -639,7 +639,7 @@ int main(int argc __attribute__((unused)), char *argv[])
{
fprintf(stderr,
"Incorrect LOGREC_VARIABLE_RECORD_2LSN_EXAMPLE "
- "in whole rec read lsn(%lu,0x%lx)\n",
+ "in whole rec read lsn" LSN_FMT "\n",
LSN_IN_PARTS(rec.lsn));
goto err;
}
diff --git a/storage/maria/unittest/ma_test_loghandler_first_lsn-t.c b/storage/maria/unittest/ma_test_loghandler_first_lsn-t.c
index 9306be3958e..87f0cf6c72c 100644
--- a/storage/maria/unittest/ma_test_loghandler_first_lsn-t.c
+++ b/storage/maria/unittest/ma_test_loghandler_first_lsn-t.c
@@ -102,7 +102,7 @@ int main(int argc __attribute__((unused)), char *argv[])
first_lsn= translog_first_lsn_in_log();
if (first_lsn != LSN_IMPOSSIBLE)
{
- fprintf(stderr, "Incorrect first lsn response (%lu,0x%lx).",
+ fprintf(stderr, "Incorrect first lsn response " LSN_FMT ".",
LSN_IN_PARTS(first_lsn));
translog_destroy();
exit(1);
@@ -140,8 +140,8 @@ int main(int argc __attribute__((unused)), char *argv[])
first_lsn= translog_first_lsn_in_log();
if (first_lsn != theor_lsn)
{
- fprintf(stderr, "Incorrect first lsn: (%lu,0x%lx) "
- " theoretical first: (%lu,0x%lx)\n",
+ fprintf(stderr, "Incorrect first lsn: " LSN_FMT " "
+ " theoretical first: " LSN_FMT "\n",
LSN_IN_PARTS(first_lsn), LSN_IN_PARTS(theor_lsn));
translog_destroy();
exit(1);
diff --git a/storage/maria/unittest/ma_test_loghandler_max_lsn-t.c b/storage/maria/unittest/ma_test_loghandler_max_lsn-t.c
index 9ff391b3814..6cb2fcb55e5 100644
--- a/storage/maria/unittest/ma_test_loghandler_max_lsn-t.c
+++ b/storage/maria/unittest/ma_test_loghandler_max_lsn-t.c
@@ -94,7 +94,7 @@ int main(int argc __attribute__((unused)), char *argv[])
}
if (max_lsn != LSN_IMPOSSIBLE)
{
- fprintf(stderr, "Incorrect first lsn response (%lu,0x%lx).",
+ fprintf(stderr, "Incorrect first lsn response " LSN_FMT ".",
LSN_IN_PARTS(max_lsn));
translog_destroy();
exit(1);
@@ -138,8 +138,8 @@ int main(int argc __attribute__((unused)), char *argv[])
}
if (max_lsn != last_lsn)
{
- fprintf(stderr, "Incorrect max lsn: (%lu,0x%lx) "
- " last lsn on first file: (%lu,0x%lx)\n",
+ fprintf(stderr, "Incorrect max lsn: " LSN_FMT " "
+ " last lsn on first file: " LSN_FMT "\n",
LSN_IN_PARTS(max_lsn), LSN_IN_PARTS(last_lsn));
translog_destroy();
exit(1);
diff --git a/storage/maria/unittest/ma_test_loghandler_multigroup-t.c b/storage/maria/unittest/ma_test_loghandler_multigroup-t.c
index 39cff18a3ab..776fcb56570 100644
--- a/storage/maria/unittest/ma_test_loghandler_multigroup-t.c
+++ b/storage/maria/unittest/ma_test_loghandler_multigroup-t.c
@@ -533,7 +533,7 @@ int main(int argc __attribute__((unused)), char *argv[])
{
fprintf(stderr, "Incorrect LOGREC_FIXED_RECORD_1LSN_EXAMPLE "
"data read(%d)"
- "type %u, strid %u, len %u, ref(%lu,0x%lx), lsn(%lu,0x%lx)\n",
+ "type %u, strid %u, len %u, ref" LSN_FMT ", lsn" LSN_FMT "\n",
i, (uint) rec.type, (uint) rec.short_trid,
(uint) rec.record_length,
LSN_IN_PARTS(ref), LSN_IN_PARTS(rec.lsn));
@@ -563,9 +563,9 @@ int main(int argc __attribute__((unused)), char *argv[])
{
fprintf(stderr, "Incorrect LOGREC_FIXED_RECORD_2LSN_EXAMPLE "
"data read(%d) "
- "type %u, strid %u, len %u, ref1(%lu,0x%lx), "
- "ref2(%lu,0x%lx) %x%x%x%x%x%x%x%x%x "
- "lsn(%lu,0x%lx)\n",
+ "type %u, strid %u, len %u, ref1" LSN_FMT ", "
+ "ref2" LSN_FMT " %x%x%x%x%x%x%x%x%x "
+ "lsn" LSN_FMT "\n",
i, (uint) rec.type, (uint) rec.short_trid,
(uint) rec.record_length,
LSN_IN_PARTS(ref1), LSN_IN_PARTS(ref2),
@@ -611,7 +611,7 @@ int main(int argc __attribute__((unused)), char *argv[])
"data read(%d)"
"type %u (%d), strid %u (%d), len %lu, %lu + 7 (%d), "
"hdr len: %d (%d), "
- "ref(%lu,0x%lx), lsn(%lu,0x%lx) (%d), content: %d\n",
+ "ref" LSN_FMT ", lsn" LSN_FMT " (%d), content: %d\n",
i, (uint) rec.type,
rec.type !=LOGREC_VARIABLE_RECORD_1LSN_EXAMPLE,
(uint) rec.short_trid,
@@ -631,7 +631,7 @@ int main(int argc __attribute__((unused)), char *argv[])
{
fprintf(stderr,
"Incorrect LOGREC_VARIABLE_RECORD_1LSN_EXAMPLE "
- "in whole rec read lsn(%lu,0x%lx)\n",
+ "in whole rec read lsn" LSN_FMT "\n",
LSN_IN_PARTS(rec.lsn));
translog_free_record_header(&rec);
goto err;
@@ -655,8 +655,8 @@ int main(int argc __attribute__((unused)), char *argv[])
fprintf(stderr, "Incorrect LOGREC_VARIABLE_RECORD_2LSN_EXAMPLE "
" data read(%d) "
"type %u, strid %u, len %lu != %lu + 14, hdr len: %d, "
- "ref1(%lu,0x%lx), ref2(%lu,0x%lx), "
- "lsn(%lu,0x%lx)\n",
+ "ref1" LSN_FMT ", ref2" LSN_FMT ", "
+ "lsn" LSN_FMT "\n",
i, (uint) rec.type, (uint) rec.short_trid,
(ulong) rec.record_length, (ulong) rec_len,
len,
@@ -669,7 +669,7 @@ int main(int argc __attribute__((unused)), char *argv[])
{
fprintf(stderr,
"Incorrect LOGREC_VARIABLE_RECORD_2LSN_EXAMPLE "
- "in whole rec read lsn(%lu,0x%lx)\n",
+ "in whole rec read lsn" LSN_FMT "\n",
LSN_IN_PARTS(rec.lsn));
translog_free_record_header(&rec);
goto err;
@@ -701,7 +701,7 @@ int main(int argc __attribute__((unused)), char *argv[])
fprintf(stderr, "Incorrect LOGREC_FIXED_RECORD_0LSN_EXAMPLE "
"data read(%d)\n"
"type %u, strid %u, len %u, i: %u, 4: %u 5: %u "
- "lsn(%lu,0x%lx)\n",
+ "lsn" LSN_FMT "\n",
i, (uint) rec.type, (uint) rec.short_trid,
(uint) rec.record_length,
(uint)uint4korr(rec.header), (uint) rec.header[4],
@@ -725,7 +725,7 @@ int main(int argc __attribute__((unused)), char *argv[])
fprintf(stderr, "Incorrect LOGREC_VARIABLE_RECORD_0LSN_EXAMPLE "
"data read(%d) "
"type %u, strid %u, len %lu != %lu, hdr len: %d, "
- "lsn(%lu,0x%lx)\n",
+ "lsn" LSN_FMT "\n",
i, (uint) rec.type, (uint) rec.short_trid,
(ulong) rec.record_length, (ulong) rec_len,
len, LSN_IN_PARTS(rec.lsn));
@@ -736,7 +736,7 @@ int main(int argc __attribute__((unused)), char *argv[])
{
fprintf(stderr,
"Incorrect LOGREC_VARIABLE_RECORD_2LSN_EXAMPLE "
- "in whole rec read lsn(%lu,0x%lx)\n",
+ "in whole rec read lsn" LSN_FMT "\n",
LSN_IN_PARTS(rec.lsn));
translog_free_record_header(&rec);
goto err;
diff --git a/storage/maria/unittest/ma_test_loghandler_multithread-t.c b/storage/maria/unittest/ma_test_loghandler_multithread-t.c
index ff843937fcd..8b834527dd0 100644
--- a/storage/maria/unittest/ma_test_loghandler_multithread-t.c
+++ b/storage/maria/unittest/ma_test_loghandler_multithread-t.c
@@ -486,7 +486,7 @@ int main(int argc __attribute__((unused)),
fprintf(stderr, "Incorrect LOGREC_FIXED_RECORD_0LSN_EXAMPLE "
"data read(%d)\n"
"type %u, strid %u %u, len %u, i: %u %u, "
- "lsn(%lu,0x%lx) (%lu,0x%lx)\n",
+ "lsn" LSN_FMT " " LSN_FMT "\n",
i, (uint) rec.type,
(uint) rec.short_trid, (uint) uint2korr(rec.header),
(uint) rec.record_length,
@@ -510,7 +510,7 @@ int main(int argc __attribute__((unused)),
"data read(%d) "
"thread: %d, iteration %d, stage %d\n"
"type %u (%d), len %d, length %lu %lu (%d) "
- "lsn(%lu,0x%lx) (%lu,0x%lx)\n",
+ "lsn" LSN_FMT " " LSN_FMT "\n",
i, (uint) rec.short_trid, index, stage,
(uint) rec.type, (rec.type !=
LOGREC_VARIABLE_RECORD_0LSN_EXAMPLE),
@@ -526,7 +526,7 @@ int main(int argc __attribute__((unused)),
{
fprintf(stderr,
"Incorrect LOGREC_VARIABLE_RECORD_0LSN_EXAMPLE "
- "in whole rec read lsn(%lu,0x%lx)\n",
+ "in whole rec read lsn" LSN_FMT "\n",
LSN_IN_PARTS(rec.lsn));
translog_free_record_header(&rec);
goto err;
diff --git a/storage/maria/unittest/ma_test_loghandler_noflush-t.c b/storage/maria/unittest/ma_test_loghandler_noflush-t.c
index 9555cc0842f..2be6dc1da3c 100644
--- a/storage/maria/unittest/ma_test_loghandler_noflush-t.c
+++ b/storage/maria/unittest/ma_test_loghandler_noflush-t.c
@@ -116,7 +116,7 @@ int main(int argc __attribute__((unused)), char *argv[])
"data read(0)\n"
"type: %u (%d) strid: %u (%d) len: %u (%d) i: %u (%d), "
"4: %u (%d) 5: %u (%d) "
- "lsn(%lu,0x%lx) (%d)\n",
+ "lsn" LSN_FMT " (%d)\n",
(uint) rec.type, (rec.type !=LOGREC_FIXED_RECORD_0LSN_EXAMPLE),
(uint) rec.short_trid, (rec.short_trid != 0),
(uint) rec.record_length, (rec.record_length != 6),