diff options
| -rw-r--r-- | dbug/dbug.c | 2 | ||||
| -rw-r--r-- | include/my_dbug.h | 1 | ||||
| -rw-r--r-- | include/my_sys.h | 2 | ||||
| -rw-r--r-- | mysys/checksum.c | 8 | ||||
| -rw-r--r-- | sql/mysqld.cc | 4 |
5 files changed, 3 insertions, 14 deletions
diff --git a/dbug/dbug.c b/dbug/dbug.c index 2aaee9324bd..34246575cae 100644 --- a/dbug/dbug.c +++ b/dbug/dbug.c @@ -2399,7 +2399,7 @@ static void dbug_flush(CODE_STATE *cs) /* For debugging */ -void _db_force_flush() +void _db_force_flush_() { CODE_STATE *cs; get_code_state_or_return; diff --git a/include/my_dbug.h b/include/my_dbug.h index 6a9cedc6650..bce22668eed 100644 --- a/include/my_dbug.h +++ b/include/my_dbug.h @@ -52,7 +52,6 @@ extern void _db_end_(void); extern void _db_lock_file_(void); extern void _db_unlock_file_(void); extern FILE *_db_fp_(void); -extern void _db_force_flush(); #define DBUG_ENTER(a) struct _db_stack_frame_ _db_stack_frame_; \ _db_enter_ (a,__FILE__,__LINE__,&_db_stack_frame_) diff --git a/include/my_sys.h b/include/my_sys.h index 5f39fd1098f..363f3a12e64 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -871,7 +871,7 @@ extern ha_checksum my_checksum(ha_checksum crc, const uchar *mem, #ifndef DBUG_OFF extern void my_debug_put_break_here(void); #else -#define my_debug_put_break_here() {} +#define my_debug_put_break_here() do {} while(0) #endif extern void my_sleep(ulong m_seconds); diff --git a/mysys/checksum.c b/mysys/checksum.c index 0cc9801c2b1..1d264b54321 100644 --- a/mysys/checksum.c +++ b/mysys/checksum.c @@ -32,17 +32,9 @@ ha_checksum my_crc_dbug_check= 1; /* Unlikely number */ ha_checksum my_checksum(ha_checksum crc, const uchar *pos, size_t length) { -#ifdef NOT_USED - const uchar *end=pos+length; - for ( ; pos != end ; pos++) - crc=((crc << 8) + *((uchar*) pos)) + (crc >> (8*sizeof(ha_checksum)-8)); -#else crc= (ha_checksum) crc32((uint)crc, pos, length); -#endif /* NOT_USED */ DBUG_PRINT("info", ("crc: %lu", (ulong) crc)); -#ifndef DBUG_OFF if (crc == my_crc_dbug_check) my_debug_put_break_here(); -#endif return crc; } diff --git a/sql/mysqld.cc b/sql/mysqld.cc index f2a36042b94..56c5734146c 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -7430,10 +7430,8 @@ mysqld_get_one_option(int optid, { switch(optid) { case '#': -#ifndef DBUG_OFF - DBUG_SET_INITIAL(argument ? argument : default_dbug_option); -#endif DEBUGGER_ON; + DBUG_SET_INITIAL(argument ? argument : default_dbug_option); opt_endinfo=1; /* unireg: memory allocation */ break; case 'a': |