diff options
author | unknown <marko@hundin.mysql.fi> | 2005-03-10 15:16:16 +0200 |
---|---|---|
committer | unknown <marko@hundin.mysql.fi> | 2005-03-10 15:16:16 +0200 |
commit | 066e8900d63e85500b7f6a48b2cada93924aa600 (patch) | |
tree | ea08f06b68af52a8bab01638d9c412e1b2d239b5 /innobase/row | |
parent | db32810d02ca5cae3a5619d5008923a197425e84 (diff) | |
download | mariadb-git-066e8900d63e85500b7f6a48b2cada93924aa600.tar.gz |
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/btr/btr0btr.c:
s/100/REC_OFFS_NORMAL_SIZE/
innobase/btr/btr0cur.c:
s/100/REC_OFFS_NORMAL_SIZE/
innobase/btr/btr0sea.c:
s/100/REC_OFFS_NORMAL_SIZE/
innobase/include/rem0rec.h:
Define REC_OFFS_NORMAL_SIZE and REC_OFFS_SMALL_SIZE.
innobase/lock/lock0lock.c:
s/100/REC_OFFS_NORMAL_SIZE/
innobase/page/page0cur.c:
s/100/REC_OFFS_NORMAL_SIZE/
innobase/page/page0page.c:
s/100/REC_OFFS_NORMAL_SIZE/
innobase/rem/rem0rec.c:
s/100/REC_OFFS_NORMAL_SIZE/
innobase/row/row0ins.c:
s/100/REC_OFFS_NORMAL_SIZE/
innobase/row/row0mysql.c:
s/100/REC_OFFS_NORMAL_SIZE/
innobase/row/row0purge.c:
s/100/REC_OFFS_NORMAL_SIZE/
innobase/row/row0row.c:
s/100/REC_OFFS_NORMAL_SIZE/
innobase/row/row0sel.c:
s/100/REC_OFFS_NORMAL_SIZE/
s/10/REC_OFFS_SMALL_SIZE/
innobase/row/row0undo.c:
s/100/REC_OFFS_NORMAL_SIZE/
innobase/row/row0upd.c:
s/100/REC_OFFS_NORMAL_SIZE/
s/10/REC_OFFS_SMALL_SIZE/
innobase/trx/trx0rec.c:
s/100/REC_OFFS_NORMAL_SIZE/
Diffstat (limited to 'innobase/row')
-rw-r--r-- | innobase/row/row0ins.c | 8 | ||||
-rw-r--r-- | innobase/row/row0mysql.c | 2 | ||||
-rw-r--r-- | innobase/row/row0purge.c | 2 | ||||
-rw-r--r-- | innobase/row/row0row.c | 8 | ||||
-rw-r--r-- | innobase/row/row0sel.c | 12 | ||||
-rw-r--r-- | innobase/row/row0undo.c | 2 | ||||
-rw-r--r-- | innobase/row/row0upd.c | 14 |
7 files changed, 24 insertions, 24 deletions
diff --git a/innobase/row/row0ins.c b/innobase/row/row0ins.c index 99a74501ade..fdbbe993ff0 100644 --- a/innobase/row/row0ins.c +++ b/innobase/row/row0ins.c @@ -1134,7 +1134,7 @@ row_ins_check_foreign_constraint( 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 @@ row_ins_scan_sec_index_for_duplicate( 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 @@ row_ins_duplicate_error_in_clust( 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 @@ row_ins_index_entry_low( 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_; diff --git a/innobase/row/row0mysql.c b/innobase/row/row0mysql.c index fd8c2b060ef..5009f017053 100644 --- a/innobase/row/row0mysql.c +++ b/innobase/row/row0mysql.c @@ -3673,7 +3673,7 @@ row_scan_and_check_index( 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_; diff --git a/innobase/row/row0purge.c b/innobase/row/row0purge.c index 659a13b42a9..5893e016011 100644 --- a/innobase/row/row0purge.c +++ b/innobase/row/row0purge.c @@ -101,7 +101,7 @@ row_purge_remove_clust_if_poss_low( 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); diff --git a/innobase/row/row0row.c b/innobase/row/row0row.c index 4f080c22af3..a6d3f1d5ab0 100644 --- a/innobase/row/row0row.c +++ b/innobase/row/row0row.c @@ -203,7 +203,7 @@ row_build( 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 @@ row_rec_to_index_entry( 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 @@ row_build_row_ref( 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 @@ row_build_row_ref_in_tuple( 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_; diff --git a/innobase/row/row0sel.c b/innobase/row/row0sel.c index 16e2dc69e0b..8915d795451 100644 --- a/innobase/row/row0sel.c +++ b/innobase/row/row0sel.c @@ -79,8 +79,8 @@ row_sel_sec_rec_is_for_clust_rec( 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 @@ row_sel_get_clust_rec( 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 @@ row_sel_try_search_shortcut( 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 @@ row_sel( 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 @@ row_search_for_mysql( 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_; diff --git a/innobase/row/row0undo.c b/innobase/row/row0undo.c index 895303e361c..abe73cbe705 100644 --- a/innobase/row/row0undo.c +++ b/innobase/row/row0undo.c @@ -152,7 +152,7 @@ row_undo_search_clust_to_pcur( 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_; diff --git a/innobase/row/row0upd.c b/innobase/row/row0upd.c index d04e3c3aef1..3305724a89b 100644 --- a/innobase/row/row0upd.c +++ b/innobase/row/row0upd.c @@ -706,7 +706,7 @@ row_upd_build_sec_rec_difference_binary( 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 @@ row_upd_build_difference_binary( 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 @@ row_upd_store_row( 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 @@ row_upd_clust_rec_by_insert( 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 @@ row_upd_clust_rec( 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 @@ row_upd_clust_step( 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 @@ row_upd_in_place_in_select( 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); |