summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2010-08-23 12:52:57 +0300
committerMichael Widenius <monty@askmonty.org>2010-08-23 12:52:57 +0300
commit53310c6ee7d602768998856c85519b9420820f46 (patch)
tree95ffbb4f77cca73b89f42c9555a10da251608017 /scripts
parentb6fe4713fe14c059c4bceca60ed1863a90b7e512 (diff)
downloadmariadb-git-53310c6ee7d602768998856c85519b9420820f46.tar.gz
Trivial fixes, more safe DBUG_ASSERT()'s and some more DBUG_
- CTRL-C now aborts 'source' commands in mysql client - Fix that thread id's are removed in convert-debug-for-diff.sh client/mysql.cc: CTRL-C now aborts 'source' commands scripts/convert-debug-for-diff.sh: Fix expression to remove thread id storage/maria/ha_maria.cc: Don't call DBUG_ASSERT() when we kill a query during REPAIR / ALTER TABLE storage/maria/ma_bitmap.c: Added DBUG_ASSERT() if we call _ma_bitmap_set_full_page_bits() storage/maria/ma_key_recover.c: Don't do an assert if table is marked crashed. storage/maria/ma_recovery.c: Added DBUG_ENTER
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/convert-debug-for-diff.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/convert-debug-for-diff.sh b/scripts/convert-debug-for-diff.sh
index 2c4c86acd3c..b6c837504cb 100755
--- a/scripts/convert-debug-for-diff.sh
+++ b/scripts/convert-debug-for-diff.sh
@@ -18,7 +18,7 @@
while (<>)
{
- s/^T@[0-9]+://g;
+ s/^T@[0-9]+\s*://g;
s/0x[0-9a-f]+(\s|\n|\))/#$1/g;
s/size: [0-9]+/size: #/g;
print $_;