Merge bk-internal.mysql.com:/home/bk/mysql-maria

into  janus.mylan:/usr/home/serg/Abk/mysql-maria


dbug/dbug.c:
  Auto merged
include/my_dbug.h:
  Auto merged
storage/maria/ha_maria.cc:
  Auto merged
storage/maria/ma_check.c:
  Auto merged
storage/maria/ma_open.c:
  Auto merged
storage/maria/maria_def.h:
  Auto merged

1 files changed, 0 insertions, 1 deletions

diff --git a/dbug/dbug.c b/dbug/dbug.c
index 68e52388ae3..136f86e6c33 100644
--- a/dbug/dbug.c
+++ b/dbug/dbug.c
@@ -951,7 +951,6 @@ void _db_enter_(const char *_func_, const char *_file_,
     *_slevel_= 0; /* Set to avoid valgrind warnings if dbug is enabled later */
     return;
   }
-  get_code_state_or_return;
   save_errno= errno;
 
   *_sfunc_= cs->func;