1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

InnoDB: Remove compilation warnings and errors on SGI IRIX.

Browse Source
This commit is contained in:
marko@hundin.mysql.fi 2005-06-22 12:51:00 +03:00
parent eb42421e4a
commit 5f2ddcf580
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
innobase/row/row0ins.c
View File

@ -533,9 +533,11 @@ row_ins_cascade_calc_update_vec(
ufield->new_val.data = ufield->new_val.data =
mem_heap_alloc(heap, mem_heap_alloc(heap,
min_size); min_size);
pad_start = ufield->new_val.data pad_start =
((char*) ufield->new_val.data)
+ ufield->new_val.len; + ufield->new_val.len;
pad_end = ufield->new_val.data pad_end =
((char*) ufield->new_val.data)
+ min_size; + min_size;
ufield->new_val.len = min_size; ufield->new_val.len = min_size;
ut_memcpy(ufield->new_val.data, ut_memcpy(ufield->new_val.data,
@ -1578,7 +1580,6 @@ row_ins_scan_sec_index_for_duplicate(
ulint err = DB_SUCCESS; ulint err = DB_SUCCESS;
ibool moved; ibool moved;
mtr_t mtr; mtr_t mtr;
trx_t* trx;
mem_heap_t* heap = NULL; mem_heap_t* heap = NULL;
ulint offsets_[REC_OFFS_NORMAL_SIZE]; ulint offsets_[REC_OFFS_NORMAL_SIZE];
ulint* offsets = offsets_; ulint* offsets = offsets_;
@ -1618,11 +1619,6 @@ row_ins_scan_sec_index_for_duplicate(
goto next_rec; goto next_rec;
} }
/* Try to place a lock on the index record */
trx = thr_get_trx(thr);
ut_ad(trx);
offsets = rec_get_offsets(rec, index, offsets, offsets = rec_get_offsets(rec, index, offsets,
ULINT_UNDEFINED, &heap); ULINT_UNDEFINED, &heap);