diff options
| author | marko@hundin.mysql.fi <> | 2005-06-22 12:51:00 +0300 |
|---|---|---|
| committer | marko@hundin.mysql.fi <> | 2005-06-22 12:51:00 +0300 |
| commit | 5f2ddcf580988ffa644dab89f2100c8d7c4e87cf (patch) | |
| tree | cb7516ffc785407083d353019836258413d5cab9 /innobase | |
| parent | eb42421e4a15e8b3732888bf5b0256918f887efa (diff) | |
| download | mariadb-git-5f2ddcf580988ffa644dab89f2100c8d7c4e87cf.tar.gz | |
InnoDB: Remove compilation warnings and errors on SGI IRIX.
Diffstat (limited to 'innobase')
| -rw-r--r-- | innobase/row/row0ins.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/innobase/row/row0ins.c b/innobase/row/row0ins.c index 776094d0de5..bce775c25d6 100644 --- a/innobase/row/row0ins.c +++ b/innobase/row/row0ins.c @@ -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); |