diff options
| author | unknown <guilhem@gbichot4.local> | 2008-04-24 23:13:56 +0200 |
|---|---|---|
| committer | unknown <guilhem@gbichot4.local> | 2008-04-24 23:13:56 +0200 |
| commit | 5e0fc121fb84723ea73a5d014b519549515435d1 (patch) | |
| tree | 7a6c8e72be83cbb9a131b6703286fac44e860fb4 /storage/maria/ma_rt_split.c | |
| parent | 0b421a3e06300321bc746072c5f231b1f5247889 (diff) | |
| download | mariadb-git-5e0fc121fb84723ea73a5d014b519549515435d1.tar.gz | |
No more 'have_maria' variable, use information schema.engines.
Fix for some pushbuild failures.
BitKeeper/deleted/.del-have_maria.require:
Delete: mysql-test/r/have_maria.require
mysql-test/include/have_maria.inc:
no more 'have_maria' variable, use information schema.engines
mysql-test/r/maria-recovery-rtree-ft.result:
removed piece
mysql-test/t/maria-recovery-rtree-ft.test:
This portion seems to break on some pushbuild machine, let's disable
it for now until BUG#36319 is fixed.
sql/set_var.cc:
no more 'have_maria' variable, use information schema.engines
storage/maria/ma_rt_split.c:
On non-debug builds, the logging was wrong
Diffstat (limited to 'storage/maria/ma_rt_split.c')
| -rw-r--r-- | storage/maria/ma_rt_split.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/storage/maria/ma_rt_split.c b/storage/maria/ma_rt_split.c index 0e3a6284c13..92d61ba2eb7 100644 --- a/storage/maria/ma_rt_split.c +++ b/storage/maria/ma_rt_split.c @@ -327,6 +327,7 @@ static my_bool _ma_log_rt_split(MARIA_HA *info, int2store(log_pos, full_length); log_pos+= 2; int2store(log_pos, log_internal_copy_length); + log_pos+= 2; log_array[TRANSLOG_INTERNAL_PARTS + 0].str= log_data; log_array[TRANSLOG_INTERNAL_PARTS + 0].length= sizeof(log_data) - 7; log_array[TRANSLOG_INTERNAL_PARTS + 1].str= log_internal_copy; @@ -346,14 +347,16 @@ static my_bool _ma_log_rt_split(MARIA_HA *info, { int page_length= _ma_get_page_used(share, buff); ha_checksum crc; + uchar *check_start= log_pos; crc= my_checksum(0, buff + LSN_STORE_SIZE, page_length - LSN_STORE_SIZE); - log_pos+= 2; log_pos[0]= KEY_OP_CHECK; - int2store(log_pos + 1, page_length); - int4store(log_pos + 3, crc); - log_array[TRANSLOG_INTERNAL_PARTS + translog_parts].str= log_pos; + log_pos++; + int2store(log_pos, page_length); + log_pos+= 2; + int4store(log_pos, crc); + log_pos+= 4; + log_array[TRANSLOG_INTERNAL_PARTS + translog_parts].str= check_start; log_array[TRANSLOG_INTERNAL_PARTS + translog_parts].length= 7; - extra_length+= 7; translog_parts++; } #endif |