summaryrefslogtreecommitdiff
path: root/innobase/row/row0sel.c
diff options
context:
space:
mode:
authorunknown <marko@hundin.mysql.fi>2004-12-03 17:57:44 +0200
committerunknown <marko@hundin.mysql.fi>2004-12-03 17:57:44 +0200
commitf09c8b35f4d36de42be7ced51f1200727385ce79 (patch)
treeb32c4cc4107240ca3ea5b1f70a93f02fa49fc0f5 /innobase/row/row0sel.c
parent6865b71c73d2af3e5b06bc92c563aeb3ba6db4ff (diff)
downloadmariadb-git-f09c8b35f4d36de42be7ced51f1200727385ce79.tar.gz
InnoDB: Fix ctype_utf8 test failure caused by the new record format.
innobase/btr/btr0btr.c: Cache the value of dtype_get_fixed_size(type) in order to avoid repeated calls to an external function innobase_is_mb_cset() innobase/include/data0type.ic: Declare innobase_is_mb_cset(). dtype_get_fixed_size(): Invoke innobase_is_mb_cset() for DATA_MYSQL. innobase/row/row0ins.c: Cache the value of dtype_get_fixed_size(type) in order to avoid repeated calls to an external function innobase_is_mb_cset() innobase/row/row0sel.c: row_search_for_mysql(): Added a missing rec_reget_offsets() call that caused an InnoDB debug assertion failure in ctype_utf8 test. sql/ha_innodb.cc: Define innobase_is_mb_cset().
Diffstat (limited to 'innobase/row/row0sel.c')
-rw-r--r--innobase/row/row0sel.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/innobase/row/row0sel.c b/innobase/row/row0sel.c
index c36e62f4e74..2b40b62e5bc 100644
--- a/innobase/row/row0sel.c
+++ b/innobase/row/row0sel.c
@@ -3694,6 +3694,8 @@ rec_loop:
}
if (prebuilt->clust_index_was_generated) {
+ offsets = rec_reget_offsets(index_rec, index, offsets,
+ ULINT_UNDEFINED, heap);
row_sel_store_row_id_to_prebuilt(prebuilt, index_rec,
index, offsets);
}