summaryrefslogtreecommitdiff
path: root/innobase/data
diff options
context:
space:
mode:
authorunknown <heikki@donna.mysql.fi>2001-03-02 17:33:11 +0200
committerunknown <heikki@donna.mysql.fi>2001-03-02 17:33:11 +0200
commitde135a120adbd646838dbb8341109a8c1c748445 (patch)
tree868e9755d9dc59d5618bf6b66d2de668f9107b00 /innobase/data
parent6bd98a63b9900604fd7aa1697f574bd9f3f2a80e (diff)
downloadmariadb-git-de135a120adbd646838dbb8341109a8c1c748445.tar.gz
ut0ut.c Fixes for 64-bit Linux, bug fixes, compiler warning fixes
mem0pool.c Fixes for 64-bit Linux, bug fixes, compiler warning fixes os0file.c Fixes for 64-bit Linux, bug fixes, compiler warning fixes os0shm.c Fixes for 64-bit Linux, bug fixes, compiler warning fixes os0sync.c Fixes for 64-bit Linux, bug fixes, compiler warning fixes os0thread.c Fixes for 64-bit Linux, bug fixes, compiler warning fixes page0page.c Fixes for 64-bit Linux, bug fixes, compiler warning fixes que0que.c Fixes for 64-bit Linux, bug fixes, compiler warning fixes row0ins.c Fixes for 64-bit Linux, bug fixes, compiler warning fixes row0mysql.c Fixes for 64-bit Linux, bug fixes, compiler warning fixes row0sel.c Fixes for 64-bit Linux, bug fixes, compiler warning fixes row0upd.c Fixes for 64-bit Linux, bug fixes, compiler warning fixes row0vers.c Fixes for 64-bit Linux, bug fixes, compiler warning fixes srv0srv.c Fixes for 64-bit Linux, bug fixes, compiler warning fixes srv0start.c Fixes for 64-bit Linux, bug fixes, compiler warning fixes sync0arr.c Fixes for 64-bit Linux, bug fixes, compiler warning fixes sync0rw.c Fixes for 64-bit Linux, bug fixes, compiler warning fixes sync0sync.c Fixes for 64-bit Linux, bug fixes, compiler warning fixes trx0rec.c Fixes for 64-bit Linux, bug fixes, compiler warning fixes trx0trx.c Fixes for 64-bit Linux, bug fixes, compiler warning fixes srv0srv.h Fixes for 64-bit Linux, bug fixes, compiler warning fixes sync0rw.h Fixes for 64-bit Linux, bug fixes, compiler warning fixes sync0sync.h Fixes for 64-bit Linux, bug fixes, compiler warning fixes ut0dbg.h Fixes for 64-bit Linux, bug fixes, compiler warning fixes lock0lock.c Fixes for 64-bit Linux, bug fixes, compiler warning fixes log0log.c Fixes for 64-bit Linux, bug fixes, compiler warning fixes log0recv.c Fixes for 64-bit Linux, bug fixes, compiler warning fixes ibuf0ibuf.c Fixes for 64-bit Linux, bug fixes, compiler warning fixes buf0buf.h Fixes for 64-bit Linux, bug fixes, compiler warning fixes buf0buf.ic Fixes for 64-bit Linux, bug fixes, compiler warning fixes hash0hash.ic Fixes for 64-bit Linux, bug fixes, compiler warning fixes mach0data.ic Fixes for 64-bit Linux, bug fixes, compiler warning fixes mem0mem.h Fixes for 64-bit Linux, bug fixes, compiler warning fixes mem0pool.h Fixes for 64-bit Linux, bug fixes, compiler warning fixes mtr0mtr.h Fixes for 64-bit Linux, bug fixes, compiler warning fixes os0file.h Fixes for 64-bit Linux, bug fixes, compiler warning fixes os0sync.h Fixes for 64-bit Linux, bug fixes, compiler warning fixes os0sync.ic Fixes for 64-bit Linux, bug fixes, compiler warning fixes os0thread.h Fixes for 64-bit Linux, bug fixes, compiler warning fixes univ.i Fixes for 64-bit Linux, bug fixes, compiler warning fixes row0mysql.ic Fixes for 64-bit Linux, bug fixes, compiler warning fixes com0shm.c Fixes for 64-bit Linux, bug fixes, compiler warning fixes data0data.c Fixes for 64-bit Linux, bug fixes, compiler warning fixes data0type.c Fixes for 64-bit Linux, bug fixes, compiler warning fixes dict0crea.c Fixes for 64-bit Linux, bug fixes, compiler warning fixes dict0dict.c Fixes for 64-bit Linux, bug fixes, compiler warning fixes fil0fil.c Fixes for 64-bit Linux, bug fixes, compiler warning fixes fsp0fsp.c Fixes for 64-bit Linux, bug fixes, compiler warning fixes fut0lst.c Fixes for 64-bit Linux, bug fixes, compiler warning fixes btr0sea.c Fixes for 64-bit Linux, bug fixes, compiler warning fixes buf0buf.c Fixes for 64-bit Linux, bug fixes, compiler warning fixes buf0flu.c Fixes for 64-bit Linux, bug fixes, compiler warning fixes btr0btr.c Fixes for 64-bit Linux, bug fixes, compiler warning fixes btr0cur.c Fixes for 64-bit Linux, bug fixes, compiler warning fixes innobase/btr/btr0btr.c: Fixes for 64-bit Linux, bug fixes, compiler warning fixes innobase/btr/btr0cur.c: Fixes for 64-bit Linux, bug fixes, compiler warning fixes innobase/btr/btr0sea.c: Fixes for 64-bit Linux, bug fixes, compiler warning fixes innobase/buf/buf0buf.c: Fixes for 64-bit Linux, bug fixes, compiler warning fixes innobase/buf/buf0flu.c: Fixes for 64-bit Linux, bug fixes, compiler warning fixes innobase/com/com0shm.c: Fixes for 64-bit Linux, bug fixes, compiler warning fixes innobase/data/data0data.c: Fixes for 64-bit Linux, bug fixes, compiler warning fixes innobase/data/data0type.c: Fixes for 64-bit Linux, bug fixes, compiler warning fixes innobase/dict/dict0crea.c: Fixes for 64-bit Linux, bug fixes, compiler warning fixes innobase/dict/dict0dict.c: Fixes for 64-bit Linux, bug fixes, compiler warning fixes innobase/fil/fil0fil.c: Fixes for 64-bit Linux, bug fixes, compiler warning fixes innobase/fsp/fsp0fsp.c: Fixes for 64-bit Linux, bug fixes, compiler warning fixes innobase/fut/fut0lst.c: Fixes for 64-bit Linux, bug fixes, compiler warning fixes innobase/ibuf/ibuf0ibuf.c: Fixes for 64-bit Linux, bug fixes, compiler warning fixes innobase/include/buf0buf.h: Fixes for 64-bit Linux, bug fixes, compiler warning fixes innobase/include/buf0buf.ic: Fixes for 64-bit Linux, bug fixes, compiler warning fixes innobase/include/hash0hash.ic: Fixes for 64-bit Linux, bug fixes, compiler warning fixes innobase/include/mach0data.ic: Fixes for 64-bit Linux, bug fixes, compiler warning fixes innobase/include/mem0mem.h: Fixes for 64-bit Linux, bug fixes, compiler warning fixes innobase/include/mem0pool.h: Fixes for 64-bit Linux, bug fixes, compiler warning fixes innobase/include/mtr0mtr.h: Fixes for 64-bit Linux, bug fixes, compiler warning fixes innobase/include/os0file.h: Fixes for 64-bit Linux, bug fixes, compiler warning fixes innobase/include/os0sync.h: Fixes for 64-bit Linux, bug fixes, compiler warning fixes innobase/include/os0sync.ic: Fixes for 64-bit Linux, bug fixes, compiler warning fixes innobase/include/os0thread.h: Fixes for 64-bit Linux, bug fixes, compiler warning fixes innobase/include/row0mysql.ic: Fixes for 64-bit Linux, bug fixes, compiler warning fixes innobase/include/univ.i: Fixes for 64-bit Linux, bug fixes, compiler warning fixes innobase/include/srv0srv.h: Fixes for 64-bit Linux, bug fixes, compiler warning fixes innobase/include/sync0rw.h: Fixes for 64-bit Linux, bug fixes, compiler warning fixes innobase/include/sync0sync.h: Fixes for 64-bit Linux, bug fixes, compiler warning fixes innobase/include/ut0dbg.h: Fixes for 64-bit Linux, bug fixes, compiler warning fixes innobase/lock/lock0lock.c: Fixes for 64-bit Linux, bug fixes, compiler warning fixes innobase/log/log0log.c: Fixes for 64-bit Linux, bug fixes, compiler warning fixes innobase/log/log0recv.c: Fixes for 64-bit Linux, bug fixes, compiler warning fixes innobase/mem/mem0pool.c: Fixes for 64-bit Linux, bug fixes, compiler warning fixes innobase/os/os0file.c: Fixes for 64-bit Linux, bug fixes, compiler warning fixes innobase/os/os0shm.c: Fixes for 64-bit Linux, bug fixes, compiler warning fixes innobase/os/os0sync.c: Fixes for 64-bit Linux, bug fixes, compiler warning fixes innobase/os/os0thread.c: Fixes for 64-bit Linux, bug fixes, compiler warning fixes innobase/page/page0page.c: Fixes for 64-bit Linux, bug fixes, compiler warning fixes innobase/que/que0que.c: Fixes for 64-bit Linux, bug fixes, compiler warning fixes innobase/row/row0ins.c: Fixes for 64-bit Linux, bug fixes, compiler warning fixes innobase/row/row0mysql.c: Fixes for 64-bit Linux, bug fixes, compiler warning fixes innobase/row/row0sel.c: Fixes for 64-bit Linux, bug fixes, compiler warning fixes innobase/row/row0upd.c: Fixes for 64-bit Linux, bug fixes, compiler warning fixes innobase/row/row0vers.c: Fixes for 64-bit Linux, bug fixes, compiler warning fixes innobase/srv/srv0srv.c: Fixes for 64-bit Linux, bug fixes, compiler warning fixes innobase/srv/srv0start.c: Fixes for 64-bit Linux, bug fixes, compiler warning fixes innobase/sync/sync0arr.c: Fixes for 64-bit Linux, bug fixes, compiler warning fixes innobase/sync/sync0rw.c: Fixes for 64-bit Linux, bug fixes, compiler warning fixes innobase/sync/sync0sync.c: Fixes for 64-bit Linux, bug fixes, compiler warning fixes innobase/trx/trx0rec.c: Fixes for 64-bit Linux, bug fixes, compiler warning fixes innobase/trx/trx0trx.c: Fixes for 64-bit Linux, bug fixes, compiler warning fixes innobase/ut/ut0ut.c: Fixes for 64-bit Linux, bug fixes, compiler warning fixes
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);
}
-
-