diff options
author | Monty <monty@mariadb.org> | 2017-07-03 11:35:44 +0300 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2017-08-24 01:05:50 +0200 |
commit | 536215e32fc43aa423684e9807640dcf3453924b (patch) | |
tree | d7249d3c4268c9a57becc5fea554e2379ffe1cf1 /storage/maria/ma_page.c | |
parent | 52a1e4d613a6c7de759e93da8dfbd8cac08a11ee (diff) | |
download | mariadb-git-536215e32fc43aa423684e9807640dcf3453924b.tar.gz |
Added DBUG_ASSERT_AS_PRINTF compile flag
If compiling a non DBUG binary with
-DDBUG_ASSERT_AS_PRINTF asserts will be
changed to printf + stack trace (of stack
trace are enabled).
- Changed #ifndef DBUG_OFF to
#ifdef DBUG_ASSERT_EXISTS
for those DBUG_OFF that was just used to enable
assert
- Assert checking that could greatly impact
performance where changed to DBUG_ASSERT_SLOW which
is not affected by DBUG_ASSERT_AS_PRINTF
- Added one extra option to my_print_stacktrace() to
get more silent in case of stack trace printing as
part of assert.
Diffstat (limited to 'storage/maria/ma_page.c')
-rw-r--r-- | storage/maria/ma_page.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/storage/maria/ma_page.c b/storage/maria/ma_page.c index 4021fb8e161..d6acc0520c1 100644 --- a/storage/maria/ma_page.c +++ b/storage/maria/ma_page.c @@ -420,11 +420,11 @@ my_off_t _ma_new(register MARIA_HA *info, int level, Next deleted page's number is in the header of the present page (single linked list): */ -#ifndef DBUG_OFF +#ifdef DBUG_ASSERT_EXISTS my_off_t key_del_current; #endif share->key_del_current= mi_sizekorr(buff+share->keypage_header); -#ifndef DBUG_OFF +#ifdef DBUG_ASSERT_EXISTS key_del_current= share->key_del_current; DBUG_ASSERT((key_del_current != 0) && ((key_del_current == HA_OFFSET_ERROR) || @@ -512,7 +512,7 @@ static my_bool _ma_log_compact_keypage(MARIA_PAGE *ma_page, @param min_read_from Remove all trids from page less than this @retval 0 Ok - ®retval 1 Error; my_errno contains the error + ®retval 1 Error; my_errno contains the error */ my_bool _ma_compact_keypage(MARIA_PAGE *ma_page, TrID min_read_from) |