summaryrefslogtreecommitdiff
path: root/innobase/data
diff options
context:
space:
mode:
Diffstat (limited to 'innobase/data')
-rw-r--r--innobase/data/data0data.c14
-rw-r--r--innobase/data/data0type.c2
2 files changed, 8 insertions, 8 deletions
diff --git a/innobase/data/data0data.c b/innobase/data/data0data.c
index df811503b8a..0f237f80d69 100644
--- a/innobase/data/data0data.c
+++ b/innobase/data/data0data.c
@@ -155,9 +155,7 @@ dtuple_validate(
ulint len;
ulint i;
ulint j;
- ulint sum = 0; /* A dummy variable used
- to prevent the compiler
- from erasing the loop below */
+
ut_a(tuple->magic_n = DATA_TUPLE_MAGIC_N);
n_fields = dtuple_get_n_fields(tuple);
@@ -227,7 +225,7 @@ dfield_print(
}
} else if (mtype == DATA_INT) {
ut_a(len == 4); /* only works for 32-bit integers */
- printf("%li", (int)mach_read_from_4(data));
+ printf("%i", (int)mach_read_from_4(data));
} else {
ut_error;
}
@@ -285,13 +283,13 @@ dfield_print_also_hex(
data = dfield_get_data(dfield);
for (i = 0; i < len; i++) {
- printf("%02x", (ulint)*data);
+ printf("%02lx", (ulint)*data);
data++;
}
} else if (mtype == DATA_INT) {
ut_a(len == 4); /* inly works for 32-bit integers */
- printf("%li", (int)mach_read_from_4(data));
+ printf("%i", (int)mach_read_from_4(data));
} else {
ut_error;
}
@@ -380,6 +378,8 @@ dtuple_sprintf(
return(len);
}
+#ifdef notdefined
+
/******************************************************************
Generates random numbers, where 10/16 is uniformly
distributed between 0 and n1, 5/16 between 0 and n2,
@@ -788,3 +788,5 @@ dtuple_gen_search_tuple_TPC_C(
ut_ad(dtuple_validate(tuple));
}
+
+#endif /* notdefined */
diff --git a/innobase/data/data0type.c b/innobase/data/data0type.c
index 313194eb788..be65dd5b1b4 100644
--- a/innobase/data/data0type.c
+++ b/innobase/data/data0type.c
@@ -89,5 +89,3 @@ dtype_print(
printf("; len %lu prec %lu\n", type->len, type->prec);
}
-
-