database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-24 19:42:23 +03:00
Code Activity

propagation to maria_repair_by_sort() and maria_repair_parallel()

Browse Source 
of bugfix made to maria_repair() yesterday.
Fail "bk delta" (and thus "bk citool") if an added or modified line
of a C/C++ file has white space at end of line


BitKeeper/triggers/pre-delta:
  detection gave false alarm on added newline
storage/maria/ma_check.c:
  propagation to maria_repair_by_sort() and maria_repair_parallel()
  of bugfix made to maria_repair() yesterday. No effect now as
  those two repair variants are never used with BLOCK_RECORD.
This commit is contained in:
unknown
2007-08-08 11:36:41 +02:00
parent 1ad3a05dd7
commit 62b30a1922
2 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
BitKeeper/triggers/pre-delta
View File

@ -20,3 +20,18 @@ then
exit 1
fi
# detect if C/C++ files have new trailing white space
trailingblank=`echo $BK_FILE | egrep '\.(c|.h)'`
if [ -n "$trailingblank" ]
then
trailingblank=`bk diffs $BK_FILE | grep '^> .*[[:space:]]$'`
if [ -n "$trailingblank" ]
then
echo "bk diffs $BK_FILE | grep '^> .*[[:space:]]$'"
echo "reported white space at end of some added/modified lines"
echo ""
echo "Checkin FAILED!"
echo "Fix the problem and retry."
exit 1
fi
fi

8
storage/maria/ma_check.c
View File

@ -2752,6 +2752,10 @@ int maria_repair_by_sort(HA_CHECK *param, register MARIA_HA *info,
if (info->s->options & (HA_OPTION_CHECKSUM | HA_OPTION_COMPRESS_RECORD))
param->testflag|=T_CALC_CHECKSUM;
if (_ma_flush_table_files(info, MARIA_FLUSH_DATA, FLUSH_FORCE_WRITE,
FLUSH_KEEP))
goto err;
if (!(sort_info.key_block=
alloc_key_blocks(param,
(uint) param->sort_key_blocks,
@ -3173,6 +3177,10 @@ int maria_repair_parallel(HA_CHECK *param, register MARIA_HA *info,
if (info->s->options & (HA_OPTION_CHECKSUM | HA_OPTION_COMPRESS_RECORD))
param->testflag|=T_CALC_CHECKSUM;
if (_ma_flush_table_files(info, MARIA_FLUSH_DATA, FLUSH_FORCE_WRITE,
FLUSH_KEEP))
goto err;
/*
Quick repair (not touching data file, rebuilding indexes):
{