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.

1 files changed, 3 insertions, 3 deletions

diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc
index ef94d06a567..1e117ae93ba 100644
--- a/sql/sql_prepare.cc
+++ b/sql/sql_prepare.cc
@@ -2953,7 +2953,7 @@ void reinit_stmt_before_use(THD *thd, LEX *lex)
       for (order= sl->order_list.first; order; order= order->next)
         order->item= &order->item_ptr;
       {
-#ifndef DBUG_OFF
+#ifdef DBUG_ASSERT_EXISTS
         bool res=
 #endif
           sl->handle_derived(lex, DT_REINIT);
@@ -4254,7 +4254,7 @@ Prepared_statement::execute_bulk_loop(String *expanded_query,
   packet_end= packet_end_arg;
   iterations= TRUE;
   start_param= true;
-#ifndef DBUG_OFF
+#ifdef DBUG_ASSERT_EXISTS
   Item *free_list_state= thd->free_list;
 #endif
   thd->select_number= select_number_after_prepare;
@@ -4479,7 +4479,7 @@ Prepared_statement::reprepare()
   {
     swap_prepared_statement(&copy);
     swap_parameter_array(param_array, copy.param_array, param_count);
-#ifndef DBUG_OFF
+#ifdef DBUG_ASSERT_EXISTS
     is_reprepared= TRUE;
 #endif
     /*