mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 13:02:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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 =
mem_heap_alloc(heap,
min_size);
pad_start = ufield->new_val.data
pad_start =
((char*) ufield->new_val.data)
+ ufield->new_val.len;
pad_end = ufield->new_val.data
pad_end =
((char*) ufield->new_val.data)
+ min_size;
ufield->new_val.len = min_size;
ut_memcpy(ufield->new_val.data,
@ -1578,7 +1580,6 @@ row_ins_scan_sec_index_for_duplicate(
ulint err = DB_SUCCESS;
ibool moved;
mtr_t mtr;
trx_t* trx;
mem_heap_t* heap = NULL;
ulint offsets_[REC_OFFS_NORMAL_SIZE];
ulint* offsets = offsets_;
@ -1618,11 +1619,6 @@ row_ins_scan_sec_index_for_duplicate(
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,
ULINT_UNDEFINED, &heap);