Below is the list of changes that have just been committed into a local
5.0 repository of marko. When marko does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet
1.1793 05/03/10 15:16:16 marko@stripped +16 -0
InnoDB: Introduce the symbols REC_OFFS_NORMAL_SIZE and
REC_OFFS_SMALL_SIZE for the initial allocation sizes of
arrays passed to rec_get_offsets().
innobase/trx/trx0rec.c
1.20 05/03/10 15:16:00 marko@stripped +1 -1
s/100/REC_OFFS_NORMAL_SIZE/
innobase/row/row0upd.c
1.34 05/03/10 15:16:00 marko@stripped +7 -7
s/100/REC_OFFS_NORMAL_SIZE/
s/10/REC_OFFS_SMALL_SIZE/
innobase/row/row0undo.c
1.13 05/03/10 15:16:00 marko@stripped +1 -1
s/100/REC_OFFS_NORMAL_SIZE/
innobase/row/row0sel.c
1.75 05/03/10 15:16:00 marko@stripped +6 -6
s/100/REC_OFFS_NORMAL_SIZE/
s/10/REC_OFFS_SMALL_SIZE/
innobase/row/row0row.c
1.18 05/03/10 15:16:00 marko@stripped +4 -4
s/100/REC_OFFS_NORMAL_SIZE/
innobase/row/row0purge.c
1.21 05/03/10 15:16:00 marko@stripped +1 -1
s/100/REC_OFFS_NORMAL_SIZE/
innobase/row/row0mysql.c
1.101 05/03/10 15:16:00 marko@stripped +1 -1
s/100/REC_OFFS_NORMAL_SIZE/
innobase/row/row0ins.c
1.64 05/03/10 15:16:00 marko@stripped +4 -4
s/100/REC_OFFS_NORMAL_SIZE/
innobase/rem/rem0rec.c
1.15 05/03/10 15:16:00 marko@stripped +3 -3
s/100/REC_OFFS_NORMAL_SIZE/
innobase/page/page0page.c
1.27 05/03/10 15:16:00 marko@stripped +6 -6
s/100/REC_OFFS_NORMAL_SIZE/
innobase/page/page0cur.c
1.23 05/03/10 15:16:00 marko@stripped +7 -7
s/100/REC_OFFS_NORMAL_SIZE/
innobase/lock/lock0lock.c
1.55 05/03/10 15:15:59 marko@stripped +5 -5
s/100/REC_OFFS_NORMAL_SIZE/
innobase/include/rem0rec.h
1.11 05/03/10 15:15:59 marko@stripped +5 -0
Define REC_OFFS_NORMAL_SIZE and REC_OFFS_SMALL_SIZE.
innobase/btr/btr0sea.c
1.30 05/03/10 15:15:59 marko@stripped +6 -6
s/100/REC_OFFS_NORMAL_SIZE/
innobase/btr/btr0cur.c
1.44 05/03/10 15:15:59 marko@stripped +10 -10
s/100/REC_OFFS_NORMAL_SIZE/
innobase/btr/btr0btr.c
1.38 05/03/10 15:15:59 marko@stripped +4 -4
s/100/REC_OFFS_NORMAL_SIZE/
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: marko
# Host: hundin.mysql.fi
# Root: /home/marko/mysql-5.0
--- 1.37/innobase/btr/btr0btr.c Wed Mar 9 22:04:45 2005
+++ 1.38/innobase/btr/btr0btr.c Thu Mar 10 15:15:59 2005
@@ -567,7 +567,7 @@
btr_cur_t cursor;
rec_t* node_ptr;
dict_index_t* index;
- ulint offsets_[100];
+ ulint offsets_[REC_OFFS_NORMAL_SIZE];
ulint* offsets = offsets_;
*offsets_ = (sizeof offsets_) / sizeof *offsets_;
@@ -2099,7 +2099,7 @@
btr_node_ptr_delete(tree, page, mtr);
} else {
mem_heap_t* heap = NULL;
- ulint offsets_[100];
+ ulint offsets_[REC_OFFS_NORMAL_SIZE];
*offsets_ = (sizeof offsets_) / sizeof *offsets_;
/* Replace the address of the old child node (= page) with the
address of the merge page to the right */
@@ -2389,7 +2389,7 @@
mtr_t mtr;
page_t* root;
mem_heap_t* heap = NULL;
- ulint offsets_[100];
+ ulint offsets_[REC_OFFS_NORMAL_SIZE];
ulint* offsets = offsets_;
*offsets_ = (sizeof offsets_) / sizeof *offsets_;
@@ -2491,7 +2491,7 @@
ulint i;
page_t* page;
mem_heap_t* heap = NULL;
- ulint offsets_[100];
+ ulint offsets_[REC_OFFS_NORMAL_SIZE];
ulint* offsets = offsets_;
*offsets_ = (sizeof offsets_) / sizeof *offsets_;
--- 1.43/innobase/btr/btr0cur.c Wed Mar 9 22:04:45 2005
+++ 1.44/innobase/btr/btr0cur.c Thu Mar 10 15:15:59 2005
@@ -275,7 +275,7 @@
btr_search_t* info;
#endif
mem_heap_t* heap = NULL;
- ulint offsets_[100];
+ ulint offsets_[REC_OFFS_NORMAL_SIZE];
ulint* offsets = offsets_;
*offsets_ = (sizeof offsets_) / sizeof *offsets_;
/* Currently, PAGE_CUR_LE is the only search mode used for searches
@@ -579,7 +579,7 @@
ulint estimate;
ulint savepoint;
mem_heap_t* heap = NULL;
- ulint offsets_[100];
+ ulint offsets_[REC_OFFS_NORMAL_SIZE];
ulint* offsets = offsets_;
*offsets_ = (sizeof offsets_) / sizeof *offsets_;
@@ -705,7 +705,7 @@
ulint height;
rec_t* node_ptr;
mem_heap_t* heap = NULL;
- ulint offsets_[100];
+ ulint offsets_[REC_OFFS_NORMAL_SIZE];
ulint* offsets = offsets_;
*offsets_ = (sizeof offsets_) / sizeof *offsets_;
@@ -1255,7 +1255,7 @@
if (!(flags & BTR_NO_LOCKING_FLAG)) {
mem_heap_t* heap = NULL;
- ulint offsets_[100];
+ ulint offsets_[REC_OFFS_NORMAL_SIZE];
*offsets_ = (sizeof offsets_) / sizeof *offsets_;
err = lock_clust_rec_modify_check_and_lock(flags, rec, index,
@@ -1431,7 +1431,7 @@
trx_t* trx;
ibool was_delete_marked;
mem_heap_t* heap = NULL;
- ulint offsets_[100];
+ ulint offsets_[REC_OFFS_NORMAL_SIZE];
ulint* offsets = offsets_;
*offsets_ = (sizeof offsets_) / sizeof *offsets_;
@@ -2071,7 +2071,7 @@
if (!(flags & BTR_KEEP_SYS_FLAG)) {
mem_heap_t* heap = NULL;
- ulint offsets_[100];
+ ulint offsets_[REC_OFFS_NORMAL_SIZE];
*offsets_ = (sizeof offsets_) / sizeof *offsets_;
row_upd_rec_sys_fields_in_recovery(rec,
@@ -2117,7 +2117,7 @@
rec_t* rec;
trx_t* trx;
mem_heap_t* heap = NULL;
- ulint offsets_[100];
+ ulint offsets_[REC_OFFS_NORMAL_SIZE];
ulint* offsets = offsets_;
*offsets_ = (sizeof offsets_) / sizeof *offsets_;
@@ -2408,7 +2408,7 @@
ulint max_ins_size;
rec_t* rec;
mem_heap_t* heap = NULL;
- ulint offsets_[100];
+ ulint offsets_[REC_OFFS_NORMAL_SIZE];
ulint* offsets = offsets_;
ibool no_compress_needed;
*offsets_ = (sizeof offsets_) / sizeof *offsets_;
@@ -2813,8 +2813,8 @@
ulint add_on;
mtr_t mtr;
mem_heap_t* heap = NULL;
- ulint offsets1_[100];
- ulint offsets2_[100];
+ ulint offsets1_[REC_OFFS_NORMAL_SIZE];
+ ulint offsets2_[REC_OFFS_NORMAL_SIZE];
ulint* offsets1 = offsets1_;
ulint* offsets2 = offsets2_;
*offsets1_ = (sizeof offsets1_) / sizeof *offsets1_;
--- 1.29/innobase/btr/btr0sea.c Wed Mar 9 22:04:45 2005
+++ 1.30/innobase/btr/btr0sea.c Thu Mar 10 15:15:59 2005
@@ -420,7 +420,7 @@
&& (block->curr_n_bytes == info->n_bytes)
&& (block->curr_side == info->side)) {
mem_heap_t* heap = NULL;
- ulint offsets_[100];
+ ulint offsets_[REC_OFFS_NORMAL_SIZE];
*offsets_ = (sizeof offsets_) / sizeof *offsets_;
rec = btr_cur_get_rec(cursor);
@@ -553,7 +553,7 @@
ulint bytes;
int cmp;
mem_heap_t* heap = NULL;
- ulint offsets_[100];
+ ulint offsets_[REC_OFFS_NORMAL_SIZE];
ulint* offsets = offsets_;
ibool success = FALSE;
*offsets_ = (sizeof offsets_) / sizeof *offsets_;
@@ -1100,7 +1100,7 @@
rec_t** recs;
ulint i;
mem_heap_t* heap = NULL;
- ulint offsets_[100];
+ ulint offsets_[REC_OFFS_NORMAL_SIZE];
ulint* offsets = offsets_;
*offsets_ = (sizeof offsets_) / sizeof *offsets_;
@@ -1344,7 +1344,7 @@
ulint fold;
dulint tree_id;
ibool found;
- ulint offsets_[100];
+ ulint offsets_[REC_OFFS_NORMAL_SIZE];
mem_heap_t* heap = NULL;
*offsets_ = (sizeof offsets_) / sizeof *offsets_;
@@ -1456,7 +1456,7 @@
ulint side;
ibool locked = FALSE;
mem_heap_t* heap = NULL;
- ulint offsets_[100];
+ ulint offsets_[REC_OFFS_NORMAL_SIZE];
ulint* offsets = offsets_;
*offsets_ = (sizeof offsets_) / sizeof *offsets_;
@@ -1596,7 +1596,7 @@
ibool ok = TRUE;
ulint i;
mem_heap_t* heap = NULL;
- ulint offsets_[100];
+ ulint offsets_[REC_OFFS_NORMAL_SIZE];
ulint* offsets = offsets_;
*offsets_ = (sizeof offsets_) / sizeof *offsets_;
--- 1.10/innobase/include/rem0rec.h Tue Mar 1 13:52:02 2005
+++ 1.11/innobase/include/rem0rec.h Thu Mar 10 15:15:59 2005
@@ -36,6 +36,11 @@
#define REC_STATUS_INFIMUM 2
#define REC_STATUS_SUPREMUM 3
+/* Number of elements that should be initially allocated for the
+offsets[] array, first passed to rec_get_offsets() */
+#define REC_OFFS_NORMAL_SIZE 1/*00*/
+#define REC_OFFS_SMALL_SIZE 1/*0*/
+
/**********************************************************
The following function is used to get the offset of the
next chained record on the same page. */
--- 1.54/innobase/lock/lock0lock.c Wed Mar 9 22:04:45 2005
+++ 1.55/innobase/lock/lock0lock.c Thu Mar 10 15:15:59 2005
@@ -4094,7 +4094,7 @@
ulint i;
mtr_t mtr;
mem_heap_t* heap = NULL;
- ulint offsets_[100];
+ ulint offsets_[REC_OFFS_NORMAL_SIZE];
ulint* offsets = offsets_;
*offsets_ = (sizeof offsets_) / sizeof *offsets_;
@@ -4593,7 +4593,7 @@
ulint i;
mtr_t mtr;
mem_heap_t* heap = NULL;
- ulint offsets_[100];
+ ulint offsets_[REC_OFFS_NORMAL_SIZE];
ulint* offsets = offsets_;
*offsets_ = (sizeof offsets_) / sizeof *offsets_;
@@ -4843,7 +4843,7 @@
#ifdef UNIV_DEBUG
{
mem_heap_t* heap = NULL;
- ulint offsets_[100];
+ ulint offsets_[REC_OFFS_NORMAL_SIZE];
const ulint* offsets;
*offsets_ = (sizeof offsets_) / sizeof *offsets_;
@@ -4992,7 +4992,7 @@
#ifdef UNIV_DEBUG
{
mem_heap_t* heap = NULL;
- ulint offsets_[100];
+ ulint offsets_[REC_OFFS_NORMAL_SIZE];
const ulint* offsets;
*offsets_ = (sizeof offsets_) / sizeof *offsets_;
@@ -5166,7 +5166,7 @@
que_thr_t* thr) /* in: query thread */
{
mem_heap_t* tmp_heap = NULL;
- ulint offsets_[100];
+ ulint offsets_[REC_OFFS_NORMAL_SIZE];
ulint* offsets = offsets_;
ulint ret;
*offsets_ = (sizeof offsets_) / sizeof *offsets_;
--- 1.22/innobase/page/page0cur.c Wed Mar 9 22:04:45 2005
+++ 1.23/innobase/page/page0cur.c Thu Mar 10 15:16:00 2005
@@ -59,7 +59,7 @@
#endif
ibool success = FALSE;
mem_heap_t* heap = NULL;
- ulint offsets_[100];
+ ulint offsets_[REC_OFFS_NORMAL_SIZE];
ulint* offsets = offsets_;
*offsets_ = (sizeof offsets_) / sizeof *offsets_;
@@ -231,7 +231,7 @@
ulint dbg_matched_bytes;
#endif
mem_heap_t* heap = NULL;
- ulint offsets_[100];
+ ulint offsets_[REC_OFFS_NORMAL_SIZE];
ulint* offsets = offsets_;
*offsets_ = (sizeof offsets_) / sizeof *offsets_;
@@ -520,8 +520,8 @@
{
mem_heap_t* heap = NULL;
- ulint cur_offs_[100];
- ulint ins_offs_[100];
+ ulint cur_offs_[REC_OFFS_NORMAL_SIZE];
+ ulint ins_offs_[REC_OFFS_NORMAL_SIZE];
ulint* cur_offs;
ulint* ins_offs;
@@ -677,7 +677,7 @@
ulint info_and_status_bits = 0; /* remove warning */
page_cur_t cursor;
mem_heap_t* heap = NULL;
- ulint offsets_[100];
+ ulint offsets_[REC_OFFS_NORMAL_SIZE];
ulint* offsets = offsets_;
*offsets_ = (sizeof offsets_) / sizeof *offsets_;
@@ -1086,7 +1086,7 @@
ulint log_data_len;
ibool comp = page_is_comp(page);
mem_heap_t* heap = NULL;
- ulint offsets_[100];
+ ulint offsets_[REC_OFFS_NORMAL_SIZE];
ulint* offsets = offsets_;
*offsets_ = (sizeof offsets_) / sizeof *offsets_;
@@ -1276,7 +1276,7 @@
if (page) {
mem_heap_t* heap = NULL;
- ulint offsets_[100];
+ ulint offsets_[REC_OFFS_NORMAL_SIZE];
rec_t* rec = page + offset;
*offsets_ = (sizeof offsets_) / sizeof *offsets_;
--- 1.26/innobase/page/page0page.c Wed Mar 9 22:04:46 2005
+++ 1.27/innobase/page/page0page.c Thu Mar 10 15:16:00 2005
@@ -232,7 +232,7 @@
if (rec) {
mem_heap_t* heap = NULL;
- ulint offsets_[100];
+ ulint offsets_[REC_OFFS_NORMAL_SIZE];
ulint* offsets = offsets_;
*offsets_ = (sizeof offsets_) / sizeof *offsets_;
@@ -467,7 +467,7 @@
page_cur_t cur2;
rec_t* sup;
mem_heap_t* heap = NULL;
- ulint offsets_[100];
+ ulint offsets_[REC_OFFS_NORMAL_SIZE];
ulint* offsets = offsets_;
*offsets_ = (sizeof offsets_) / sizeof *offsets_;
@@ -568,7 +568,7 @@
page_cur_t cur2;
rec_t* old_end;
mem_heap_t* heap = NULL;
- ulint offsets_[100];
+ ulint offsets_[REC_OFFS_NORMAL_SIZE];
ulint* offsets = offsets_;
*offsets_ = (sizeof offsets_) / sizeof *offsets_;
@@ -750,7 +750,7 @@
if ((size == ULINT_UNDEFINED) || (n_recs == ULINT_UNDEFINED)) {
mem_heap_t* heap = NULL;
- ulint offsets_[100];
+ ulint offsets_[REC_OFFS_NORMAL_SIZE];
ulint* offsets = offsets_;
*offsets_ = (sizeof offsets_) / sizeof *offsets_;
/* Calculate the sum of sizes and the number of records */
@@ -835,7 +835,7 @@
{
page_cur_t cur1;
ulint log_mode;
- ulint offsets_[100];
+ ulint offsets_[REC_OFFS_NORMAL_SIZE];
ulint* offsets = offsets_;
mem_heap_t* heap = NULL;
byte type;
@@ -1331,7 +1331,7 @@
ulint count;
ulint n_recs;
mem_heap_t* heap = NULL;
- ulint offsets_[100];
+ ulint offsets_[REC_OFFS_NORMAL_SIZE];
ulint* offsets = offsets_;
*offsets_ = (sizeof offsets_) / sizeof *offsets_;
--- 1.14/innobase/rem/rem0rec.c Wed Mar 9 22:04:46 2005
+++ 1.15/innobase/rem/rem0rec.c Thu Mar 10 15:16:00 2005
@@ -958,7 +958,7 @@
#ifdef UNIV_DEBUG
{
mem_heap_t* heap = NULL;
- ulint offsets_[100];
+ ulint offsets_[REC_OFFS_NORMAL_SIZE];
const ulint* offsets;
*offsets_ = (sizeof offsets_) / sizeof *offsets_;
@@ -991,7 +991,7 @@
ulint len;
byte* buf = NULL;
ulint i;
- ulint offsets_[100];
+ ulint offsets_[REC_OFFS_NORMAL_SIZE];
ulint* offsets = offsets_;
*offsets_ = (sizeof offsets_) / sizeof *offsets_;
@@ -1407,7 +1407,7 @@
return;
} else {
mem_heap_t* heap = NULL;
- ulint offsets_[100];
+ ulint offsets_[REC_OFFS_NORMAL_SIZE];
*offsets_ = (sizeof offsets_) / sizeof *offsets_;
rec_print_new(file, rec, rec_get_offsets(rec, index, offsets_,
--- 1.63/innobase/row/row0ins.c Wed Mar 9 22:04:46 2005
+++ 1.64/innobase/row/row0ins.c Thu Mar 10 15:16:00 2005
@@ -1134,7 +1134,7 @@
mtr_t mtr;
trx_t* trx = thr_get_trx(thr);
mem_heap_t* heap = NULL;
- ulint offsets_[100];
+ ulint offsets_[REC_OFFS_NORMAL_SIZE];
ulint* offsets = offsets_;
*offsets_ = (sizeof offsets_) / sizeof *offsets_;
@@ -1559,7 +1559,7 @@
mtr_t mtr;
trx_t* trx;
mem_heap_t* heap = NULL;
- ulint offsets_[100];
+ ulint offsets_[REC_OFFS_NORMAL_SIZE];
ulint* offsets = offsets_;
*offsets_ = (sizeof offsets_) / sizeof *offsets_;
@@ -1697,7 +1697,7 @@
ulint n_unique;
trx_t* trx = thr_get_trx(thr);
mem_heap_t*heap = NULL;
- ulint offsets_[100];
+ ulint offsets_[REC_OFFS_NORMAL_SIZE];
ulint* offsets = offsets_;
*offsets_ = (sizeof offsets_) / sizeof *offsets_;
@@ -1899,7 +1899,7 @@
big_rec_t* big_rec = NULL;
mtr_t mtr;
mem_heap_t* heap = NULL;
- ulint offsets_[100];
+ ulint offsets_[REC_OFFS_NORMAL_SIZE];
ulint* offsets = offsets_;
*offsets_ = (sizeof offsets_) / sizeof *offsets_;
--- 1.100/innobase/row/row0mysql.c Wed Mar 9 22:04:46 2005
+++ 1.101/innobase/row/row0mysql.c Thu Mar 10 15:16:00 2005
@@ -3673,7 +3673,7 @@
ibool contains_null;
ulint i;
mem_heap_t* heap = NULL;
- ulint offsets_[100];
+ ulint offsets_[REC_OFFS_NORMAL_SIZE];
ulint* offsets = offsets_;
*offsets_ = (sizeof offsets_) / sizeof *offsets_;
--- 1.20/innobase/row/row0purge.c Wed Mar 9 22:04:46 2005
+++ 1.21/innobase/row/row0purge.c Thu Mar 10 15:16:00 2005
@@ -101,7 +101,7 @@
mtr_t mtr;
rec_t* rec;
mem_heap_t* heap = NULL;
- ulint offsets_[100];
+ ulint offsets_[REC_OFFS_NORMAL_SIZE];
*offsets_ = (sizeof offsets_) / sizeof *offsets_;
index = dict_table_get_first_index(node->table);
--- 1.17/innobase/row/row0row.c Wed Mar 9 22:04:46 2005
+++ 1.18/innobase/row/row0row.c Thu Mar 10 15:16:00 2005
@@ -203,7 +203,7 @@
byte* buf;
ulint i;
mem_heap_t* tmp_heap = NULL;
- ulint offsets_[100];
+ ulint offsets_[REC_OFFS_NORMAL_SIZE];
*offsets_ = (sizeof offsets_) / sizeof *offsets_;
ut_ad(index && rec && heap);
@@ -297,7 +297,7 @@
ulint rec_len;
byte* buf;
mem_heap_t* tmp_heap = NULL;
- ulint offsets_[100];
+ ulint offsets_[REC_OFFS_NORMAL_SIZE];
ulint* offsets = offsets_;
*offsets_ = (sizeof offsets_) / sizeof *offsets_;
@@ -379,7 +379,7 @@
ulint clust_col_prefix_len;
ulint i;
mem_heap_t* tmp_heap = NULL;
- ulint offsets_[100];
+ ulint offsets_[REC_OFFS_NORMAL_SIZE];
ulint* offsets = offsets_;
*offsets_ = (sizeof offsets_) / sizeof *offsets_;
@@ -473,7 +473,7 @@
ulint clust_col_prefix_len;
ulint i;
mem_heap_t* heap = NULL;
- ulint offsets_[100];
+ ulint offsets_[REC_OFFS_NORMAL_SIZE];
ulint* offsets = offsets_;
*offsets_ = (sizeof offsets_) / sizeof *offsets_;
--- 1.74/innobase/row/row0sel.c Wed Mar 9 22:04:46 2005
+++ 1.75/innobase/row/row0sel.c Thu Mar 10 15:16:00 2005
@@ -79,8 +79,8 @@
ulint i;
dtype_t* cur_type;
mem_heap_t* heap = NULL;
- ulint clust_offsets_[100];
- ulint sec_offsets_[10];
+ ulint clust_offsets_[REC_OFFS_NORMAL_SIZE];
+ ulint sec_offsets_[REC_OFFS_SMALL_SIZE];
ulint* clust_offs = clust_offsets_;
ulint* sec_offs = sec_offsets_;
ibool is_equal = TRUE;
@@ -626,7 +626,7 @@
rec_t* old_vers;
ulint err;
mem_heap_t* heap = NULL;
- ulint offsets_[100];
+ ulint offsets_[REC_OFFS_NORMAL_SIZE];
ulint* offsets = offsets_;
*offsets_ = (sizeof offsets_) / sizeof *offsets_;
@@ -992,7 +992,7 @@
dict_index_t* index;
rec_t* rec;
mem_heap_t* heap = NULL;
- ulint offsets_[100];
+ ulint offsets_[REC_OFFS_NORMAL_SIZE];
ulint* offsets = offsets_;
ulint ret;
*offsets_ = (sizeof offsets_) / sizeof *offsets_;
@@ -1118,7 +1118,7 @@
ulint found_flag;
ulint err;
mem_heap_t* heap = NULL;
- ulint offsets_[100];
+ ulint offsets_[REC_OFFS_NORMAL_SIZE];
ulint* offsets = offsets_;
*offsets_ = (sizeof offsets_) / sizeof *offsets_;
@@ -3039,7 +3039,7 @@
ulint next_offs;
mtr_t mtr;
mem_heap_t* heap = NULL;
- ulint offsets_[100];
+ ulint offsets_[REC_OFFS_NORMAL_SIZE];
ulint* offsets = offsets_;
*offsets_ = (sizeof offsets_) / sizeof *offsets_;
--- 1.12/innobase/row/row0undo.c Wed Mar 9 22:04:46 2005
+++ 1.13/innobase/row/row0undo.c Thu Mar 10 15:16:00 2005
@@ -152,7 +152,7 @@
ibool ret;
rec_t* rec;
mem_heap_t* heap = NULL;
- ulint offsets_[100];
+ ulint offsets_[REC_OFFS_NORMAL_SIZE];
ulint* offsets = offsets_;
*offsets_ = (sizeof offsets_) / sizeof *offsets_;
--- 1.33/innobase/row/row0upd.c Wed Mar 9 22:04:46 2005
+++ 1.34/innobase/row/row0upd.c Thu Mar 10 15:16:00 2005
@@ -706,7 +706,7 @@
upd_t* update;
ulint n_diff;
ulint i;
- ulint offsets_[10];
+ ulint offsets_[REC_OFFS_SMALL_SIZE];
const ulint* offsets;
*offsets_ = (sizeof offsets_) / sizeof *offsets_;
@@ -784,7 +784,7 @@
ulint trx_id_pos;
ibool extern_bit;
ulint i;
- ulint offsets_[100];
+ ulint offsets_[REC_OFFS_NORMAL_SIZE];
const ulint* offsets;
*offsets_ = (sizeof offsets_) / sizeof *offsets_;
@@ -1195,7 +1195,7 @@
upd_t* update;
rec_t* rec;
mem_heap_t* heap = NULL;
- ulint offsets_[100];
+ ulint offsets_[REC_OFFS_NORMAL_SIZE];
const ulint* offsets;
*offsets_ = (sizeof offsets_) / sizeof *offsets_;
@@ -1396,7 +1396,7 @@
btr_cur = btr_pcur_get_btr_cur(pcur);
if (node->state != UPD_NODE_INSERT_CLUSTERED) {
- ulint offsets_[100];
+ ulint offsets_[REC_OFFS_NORMAL_SIZE];
*offsets_ = (sizeof offsets_) / sizeof *offsets_;
err = btr_cur_del_mark_set_clust_rec(BTR_NO_LOCKING_FLAG,
@@ -1537,7 +1537,7 @@
if (err == DB_SUCCESS && big_rec) {
mem_heap_t* heap = NULL;
- ulint offsets_[100];
+ ulint offsets_[REC_OFFS_NORMAL_SIZE];
rec_t* rec;
*offsets_ = (sizeof offsets_) / sizeof *offsets_;
@@ -1637,7 +1637,7 @@
mtr_t mtr_buf;
rec_t* rec;
mem_heap_t* heap = NULL;
- ulint offsets_[100];
+ ulint offsets_[REC_OFFS_NORMAL_SIZE];
const ulint* offsets;
*offsets_ = (sizeof offsets_) / sizeof *offsets_;
@@ -1995,7 +1995,7 @@
btr_cur_t* btr_cur;
ulint err;
mem_heap_t* heap = NULL;
- ulint offsets_[100];
+ ulint offsets_[REC_OFFS_NORMAL_SIZE];
*offsets_ = (sizeof offsets_) / sizeof *offsets_;
ut_ad(sel_node->select_will_do_update);
--- 1.19/innobase/trx/trx0rec.c Wed Mar 9 22:04:46 2005
+++ 1.20/innobase/trx/trx0rec.c Thu Mar 10 15:16:00 2005
@@ -1016,7 +1016,7 @@
trx_rseg_t* rseg;
mtr_t mtr;
mem_heap_t* heap = NULL;
- ulint offsets_[100];
+ ulint offsets_[REC_OFFS_NORMAL_SIZE];
ulint* offsets = offsets_;
*offsets_ = (sizeof offsets_) / sizeof *offsets_;
| Thread |
|---|
| • bk commit into 5.0 tree (marko:1.1793) | Marko Mäkelä | 10 Mar |
