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 /strings | |
| 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 'strings')
| -rw-r--r-- | strings/ctype-ucs2.c | 4 | ||||
| -rw-r--r-- | strings/strings_def.h | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/strings/ctype-ucs2.c b/strings/ctype-ucs2.c index 071d50d8256..3913ab054db 100644 --- a/strings/ctype-ucs2.c +++ b/strings/ctype-ucs2.c @@ -2618,14 +2618,14 @@ void my_fill_utf32(CHARSET_INFO *cs, char *s, size_t slen, int fill) { char buf[10]; -#ifndef DBUG_OFF +#ifdef DBUG_ASSERT_EXISTS uint buflen; #endif char *e= s + slen; DBUG_ASSERT((slen % 4) == 0); -#ifndef DBUG_OFF +#ifdef DBUG_ASSERT_EXISTS buflen= #endif cs->cset->wc_mb(cs, (my_wc_t) fill, (uchar*) buf, diff --git a/strings/strings_def.h b/strings/strings_def.h index f1fcfe2f7cc..afe737ab301 100644 --- a/strings/strings_def.h +++ b/strings/strings_def.h @@ -17,6 +17,7 @@ /* This file is to be include first in all files in the string directory */ +#undef DBUG_ASSERT_AS_PRINTF #include <my_global.h> /* Define standar vars */ #include "m_string.h" /* Exernal defintions of string functions */ |