Commit b641ae9b authored by Michael Widenius's avatar Michael Widenius

Fixed wrong argument to translog_write_record() that caused core dump in...

Fixed wrong argument to translog_write_record() that caused core dump in maria.maria-gis-rtree-trans and some other tests
(Bug introduced by my last push)
parent 31f03de5
...@@ -1914,7 +1914,6 @@ my_bool _ma_log_change(MARIA_PAGE *ma_page, const uchar *key_pos, uint length, ...@@ -1914,7 +1914,6 @@ my_bool _ma_log_change(MARIA_PAGE *ma_page, const uchar *key_pos, uint length,
uchar log_data[FILEID_STORE_SIZE + PAGE_STORE_SIZE + 2 + 6 + 7], *log_pos; uchar log_data[FILEID_STORE_SIZE + PAGE_STORE_SIZE + 2 + 6 + 7], *log_pos;
LEX_CUSTRING log_array[TRANSLOG_INTERNAL_PARTS + 3]; LEX_CUSTRING log_array[TRANSLOG_INTERNAL_PARTS + 3];
uint offset= (uint) (key_pos - ma_page->buff), translog_parts; uint offset= (uint) (key_pos - ma_page->buff), translog_parts;
uint extra_length= 0;
my_off_t page; my_off_t page;
MARIA_HA *info= ma_page->info; MARIA_HA *info= ma_page->info;
DBUG_ENTER("_ma_log_change"); DBUG_ENTER("_ma_log_change");
...@@ -1956,15 +1955,14 @@ my_bool _ma_log_change(MARIA_PAGE *ma_page, const uchar *key_pos, uint length, ...@@ -1956,15 +1955,14 @@ my_bool _ma_log_change(MARIA_PAGE *ma_page, const uchar *key_pos, uint length,
int4store(log_pos+3, crc); int4store(log_pos+3, crc);
log_array[TRANSLOG_INTERNAL_PARTS + translog_parts].str= log_pos; log_array[TRANSLOG_INTERNAL_PARTS + translog_parts].str= log_pos;
log_array[TRANSLOG_INTERNAL_PARTS + translog_parts].length= 7; log_array[TRANSLOG_INTERNAL_PARTS + translog_parts].length= 7;
extra_length+= 7; log_pos+= 7;
translog_parts++; translog_parts++;
} }
#endif #endif
if (translog_write_record(&lsn, LOGREC_REDO_INDEX, if (translog_write_record(&lsn, LOGREC_REDO_INDEX,
info->trn, info, info->trn, info,
(translog_size_t) (sizeof(log_data) - 7 + length + (translog_size_t) (log_pos - log_data) + length,
extra_length),
TRANSLOG_INTERNAL_PARTS + translog_parts, TRANSLOG_INTERNAL_PARTS + translog_parts,
log_array, log_data, NULL)) log_array, log_data, NULL))
DBUG_RETURN(1); DBUG_RETURN(1);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment