summaryrefslogtreecommitdiff
path: root/innobase/btr
diff options
context:
space:
mode:
authormarko@hundin.mysql.fi <>2004-05-27 15:27:43 +0300
committermarko@hundin.mysql.fi <>2004-05-27 15:27:43 +0300
commitfc85c80b88c0717684184f22a91f8b027a8f8559 (patch)
tree566268309e7e64b4e2f6a23700e7b8623521cbbd /innobase/btr
parente27322d8264c56e2f86435c6f6b1f80dbb448f1c (diff)
downloadmariadb-git-fc85c80b88c0717684184f22a91f8b027a8f8559.tar.gz
InnoDB cleanup:
Disable log archiving code unless #ifdef UNIV_LOG_ARCHIVE Remove (char*) casts of string constants; add const qualifiers Remove some Hot Backup code unless #ifdef UNIV_HOTBACKUP
Diffstat (limited to 'innobase/btr')
-rw-r--r--innobase/btr/btr0cur.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/innobase/btr/btr0cur.c b/innobase/btr/btr0cur.c
index 5829cc2c406..2e9194ff30f 100644
--- a/innobase/btr/btr0cur.c
+++ b/innobase/btr/btr0cur.c
@@ -2937,7 +2937,7 @@ btr_cur_mark_dtuple_inherited_extern(
if (!is_updated) {
dfield = dtuple_get_nth_field(entry, ext_vec[i]);
- data = dfield_get_data(dfield);
+ data = (byte*) dfield_get_data(dfield);
len = dfield_get_len(dfield);
len -= BTR_EXTERN_FIELD_REF_SIZE;
@@ -2997,7 +2997,7 @@ btr_cur_unmark_dtuple_extern_fields(
for (i = 0; i < n_ext_vec; i++) {
dfield = dtuple_get_nth_field(entry, ext_vec[i]);
- data = dfield_get_data(dfield);
+ data = (byte*) dfield_get_data(dfield);
len = dfield_get_len(dfield);
len -= BTR_EXTERN_FIELD_REF_SIZE;