Merge bb-10.2-ext into 10.3

1 files changed, 13 insertions, 13 deletions

diff --git a/storage/maria/unittest/ma_test_loghandler_multigroup-t.c b/storage/maria/unittest/ma_test_loghandler_multigroup-t.c
index 39cff18a3ab..69bc2f70f8c 100644
--- a/storage/maria/unittest/ma_test_loghandler_multigroup-t.c
+++ b/storage/maria/unittest/ma_test_loghandler_multigroup-t.c
@@ -485,7 +485,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(0x%lu,0x%lx)\n",
+              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],
@@ -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;