From f203bebafcde65f560b40a9f718f5ac0d3c75ab2 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 10 Jun 2004 23:58:39 +0400 Subject: [PATCH] assert.h needed for my_dbug.h now is included in my_dbug.h, where it for some reason wasn't included before. A lot of files cleaned up from #include client/mysqlbinlog.cc: assert.h needed for my_dbug.h now is included in my_dbug.h, where it for some reason wasn't included before. client/mysqldump.c: assert.h needed for my_dbug.h now is included in my_dbug.h, where it for some reason wasn't included before. heap/hp_hash.c: assert.h needed for my_dbug.h now is included in my_dbug.h, where it for some reason wasn't included before. include/m_string.h: assert.h needed for my_dbug.h now is included in my_dbug.h, where it for some reason wasn't included before. include/my_dbug.h: include assert.h needed for DBUG_ASSERT libmysql/libmysql.c: assert.h needed for my_dbug.h now is included in my_dbug.h, where it for some reason wasn't included before. myisam/ftdefs.h: assert.h needed for my_dbug.h now is included in my_dbug.h, where it for some reason wasn't included before. myisam/mi_delete.c: assert.h needed for my_dbug.h now is included in my_dbug.h, where it for some reason wasn't included before. myisam/mi_dynrec.c: assert.h needed for my_dbug.h now is included in my_dbug.h, where it for some reason wasn't included before. myisam/mi_key.c: assert.h needed for my_dbug.h now is included in my_dbug.h, where it for some reason wasn't included before. myisam/mi_open.c: assert.h needed for my_dbug.h now is included in my_dbug.h, where it for some reason wasn't included before. myisam/mi_search.c: assert.h needed for my_dbug.h now is included in my_dbug.h, where it for some reason wasn't included before. myisam/mi_write.c: assert.h needed for my_dbug.h now is included in my_dbug.h, where it for some reason wasn't included before. mysys/mf_iocache.c: assert.h needed for my_dbug.h now is included in my_dbug.h, where it for some reason wasn't included before. mysys/mf_iocache2.c: assert.h needed for my_dbug.h now is included in my_dbug.h, where it for some reason wasn't included before. mysys/mf_keycache.c: assert.h needed for my_dbug.h now is included in my_dbug.h, where it for some reason wasn't included before. mysys/my_bitmap.c: assert.h needed for my_dbug.h now is included in my_dbug.h, where it for some reason wasn't included before. mysys/my_gethostbyname.c: assert.h needed for my_dbug.h now is included in my_dbug.h, where it for some reason wasn't included before. mysys/my_getopt.c: assert.h needed for my_dbug.h now is included in my_dbug.h, where it for some reason wasn't included before. mysys/my_pthread.c: assert.h needed for my_dbug.h now is included in my_dbug.h, where it for some reason wasn't included before. mysys/my_seek.c: assert.h needed for my_dbug.h now is included in my_dbug.h, where it for some reason wasn't included before. mysys/rijndael.c: assert.h needed for my_dbug.h now is included in my_dbug.h, where it for some reason wasn't included before. mysys/thr_alarm.c: assert.h needed for my_dbug.h now is included in my_dbug.h, where it for some reason wasn't included before. sql-common/client.c: assert.h needed for my_dbug.h now is included in my_dbug.h, where it for some reason wasn't included before. sql/mysql_priv.h: assert.h needed for my_dbug.h now is included in my_dbug.h, where it for some reason wasn't included before. sql/sql_string.cc: assert.h needed for my_dbug.h now is included in my_dbug.h, where it for some reason wasn't included before. strings/ctype-simple.c: assert.h needed for my_dbug.h now is included in my_dbug.h, where it for some reason wasn't included before. strings/ctype-ucs2.c: assert.h needed for my_dbug.h now is included in my_dbug.h, where it for some reason wasn't included before. strings/my_vsnprintf.c: assert.h needed for my_dbug.h now is included in my_dbug.h, where it for some reason wasn't included before. --- client/mysqlbinlog.cc | 1 - client/mysqldump.c | 1 - heap/hp_hash.c | 1 - include/m_string.h | 1 - include/my_dbug.h | 1 + libmysql/libmysql.c | 1 - myisam/ftdefs.h | 1 - myisam/mi_delete.c | 1 - myisam/mi_dynrec.c | 1 - myisam/mi_key.c | 1 - myisam/mi_open.c | 1 - myisam/mi_search.c | 1 - myisam/mi_write.c | 1 - mysys/mf_iocache.c | 1 - mysys/mf_iocache2.c | 1 - mysys/mf_keycache.c | 1 - mysys/my_bitmap.c | 1 - mysys/my_gethostbyname.c | 1 - mysys/my_getopt.c | 1 - mysys/my_pthread.c | 1 - mysys/my_seek.c | 1 - mysys/rijndael.c | 1 - mysys/thr_alarm.c | 1 - sql-common/client.c | 1 - sql/mysql_priv.h | 1 - sql/sql_string.cc | 1 - strings/ctype-simple.c | 1 - strings/ctype-ucs2.c | 1 - strings/my_vsnprintf.c | 1 - 29 files changed, 1 insertion(+), 28 deletions(-) diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc index 221015f8c7d..ba030379792 100644 --- a/client/mysqlbinlog.cc +++ b/client/mysqlbinlog.cc @@ -18,7 +18,6 @@ #undef MYSQL_SERVER #include "client_priv.h" #include -#include #include "log_event.h" #define BIN_LOG_HEADER_SIZE 4 diff --git a/client/mysqldump.c b/client/mysqldump.c index 9c64e2d1b3a..218a97c252e 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -43,7 +43,6 @@ #include #include #include -#include #include "client_priv.h" #include "mysql.h" diff --git a/heap/hp_hash.c b/heap/hp_hash.c index 1f36f9b3059..2014b2b0adc 100644 --- a/heap/hp_hash.c +++ b/heap/hp_hash.c @@ -18,7 +18,6 @@ #include "heapdef.h" #include -#include diff --git a/include/m_string.h b/include/m_string.h index 7fc35dc2e48..0709dbaffb4 100644 --- a/include/m_string.h +++ b/include/m_string.h @@ -123,7 +123,6 @@ extern void bmove_align(gptr dst,const gptr src,uint len); #endif #ifdef HAVE_purify -#include #define memcpy_overlap(A,B,C) \ DBUG_ASSERT((A) <= (B) || ((B)+(C)) <= (A)); \ bmove((byte*) (A),(byte*) (B),(size_t) (C)); diff --git a/include/my_dbug.h b/include/my_dbug.h index 5c88e2e42db..d02ea5bf050 100644 --- a/include/my_dbug.h +++ b/include/my_dbug.h @@ -16,6 +16,7 @@ #ifndef _dbug_h #define _dbug_h +#include #ifdef __cplusplus extern "C" { #endif diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index b77fc5fd6fd..522b0869a60 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -27,7 +27,6 @@ #include #include #include -#include /* for DBUG_ASSERT() */ #ifdef HAVE_PWD_H #include #endif diff --git a/myisam/ftdefs.h b/myisam/ftdefs.h index a97485ec021..e23bc3b75ac 100644 --- a/myisam/ftdefs.h +++ b/myisam/ftdefs.h @@ -22,7 +22,6 @@ #include #include #include -#include #define true_word_char(s,X) (my_isalnum(s,X) || (X)=='_') #define misc_word_char(X) ((X)=='\'') diff --git a/myisam/mi_delete.c b/myisam/mi_delete.c index 3eb8e9a7226..c19f2582b9c 100644 --- a/myisam/mi_delete.c +++ b/myisam/mi_delete.c @@ -18,7 +18,6 @@ #include "fulltext.h" #include "rt_index.h" -#include static int d_search(MI_INFO *info,MI_KEYDEF *keyinfo,uint comp_flag, uchar *key,uint key_length,my_off_t page,uchar *anc_buff); diff --git a/myisam/mi_dynrec.c b/myisam/mi_dynrec.c index f64e774810d..0b8d3c97872 100644 --- a/myisam/mi_dynrec.c +++ b/myisam/mi_dynrec.c @@ -25,7 +25,6 @@ */ #include "myisamdef.h" -#include /* Enough for comparing if number is zero */ static char zero_string[]={0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}; diff --git a/myisam/mi_key.c b/myisam/mi_key.c index 4aebba041f8..d19a3130a86 100644 --- a/myisam/mi_key.c +++ b/myisam/mi_key.c @@ -19,7 +19,6 @@ #include "myisamdef.h" #include "m_ctype.h" #include "sp_defs.h" -#include #ifdef HAVE_IEEEFP_H #include #endif diff --git a/myisam/mi_open.c b/myisam/mi_open.c index d03c18091aa..562227d2f03 100644 --- a/myisam/mi_open.c +++ b/myisam/mi_open.c @@ -20,7 +20,6 @@ #include "sp_defs.h" #include "rt_index.h" #include -#include #if defined(MSDOS) || defined(__WIN__) #ifdef __WIN__ diff --git a/myisam/mi_search.c b/myisam/mi_search.c index 51ced6fa15a..1b03acddbc1 100644 --- a/myisam/mi_search.c +++ b/myisam/mi_search.c @@ -18,7 +18,6 @@ #include "fulltext.h" #include "m_ctype.h" -#include static my_bool _mi_get_prev_key(MI_INFO *info, MI_KEYDEF *keyinfo, uchar *page, uchar *key, uchar *keypos, diff --git a/myisam/mi_write.c b/myisam/mi_write.c index c17f47fc1ae..dc596672a84 100644 --- a/myisam/mi_write.c +++ b/myisam/mi_write.c @@ -18,7 +18,6 @@ #include "fulltext.h" #include "rt_index.h" -#include #define MAX_POINTER_LENGTH 8 diff --git a/mysys/mf_iocache.c b/mysys/mf_iocache.c index 7b5371c4289..f16f2b7ab72 100644 --- a/mysys/mf_iocache.c +++ b/mysys/mf_iocache.c @@ -55,7 +55,6 @@ TODO: #include "mysys_err.h" static void my_aiowait(my_aio_result *result); #endif -#include #include #ifdef THREAD diff --git a/mysys/mf_iocache2.c b/mysys/mf_iocache2.c index 70b2f288538..3755bcdb53d 100644 --- a/mysys/mf_iocache2.c +++ b/mysys/mf_iocache2.c @@ -23,7 +23,6 @@ #include #include #include -#include my_off_t my_b_append_tell(IO_CACHE* info) { diff --git a/mysys/mf_keycache.c b/mysys/mf_keycache.c index 168483f276b..32b3154b8ed 100644 --- a/mysys/mf_keycache.c +++ b/mysys/mf_keycache.c @@ -44,7 +44,6 @@ #include "my_static.h" #include #include -#include #include /* diff --git a/mysys/my_bitmap.c b/mysys/my_bitmap.c index 0f8984e6b3d..3a09255b0b0 100644 --- a/mysys/my_bitmap.c +++ b/mysys/my_bitmap.c @@ -35,7 +35,6 @@ #include "mysys_priv.h" #include -#include #include diff --git a/mysys/my_gethostbyname.c b/mysys/my_gethostbyname.c index 5044a505054..27281f3489d 100644 --- a/mysys/my_gethostbyname.c +++ b/mysys/my_gethostbyname.c @@ -18,7 +18,6 @@ /* Thread safe version of gethostbyname_r() */ #include "mysys_priv.h" -#include #if !defined(MSDOS) && !defined(__WIN__) #include #endif diff --git a/mysys/my_getopt.c b/mysys/my_getopt.c index 8d0b05d55f7..d7a9babe5e7 100644 --- a/mysys/my_getopt.c +++ b/mysys/my_getopt.c @@ -18,7 +18,6 @@ #include #include #include -#include #include #include diff --git a/mysys/my_pthread.c b/mysys/my_pthread.c index d721418ffa1..37517fb8327 100644 --- a/mysys/my_pthread.c +++ b/mysys/my_pthread.c @@ -23,7 +23,6 @@ #include #include #include -#include #if (defined(__BSD__) || defined(_BSDI_VERSION)) && !defined(HAVE_mit_thread) #define SCHED_POLICY SCHED_RR diff --git a/mysys/my_seek.c b/mysys/my_seek.c index ec24a26b3d9..6af65d70fd0 100644 --- a/mysys/my_seek.c +++ b/mysys/my_seek.c @@ -15,7 +15,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "mysys_priv.h" -#include /* Seek to position in file */ /*ARGSUSED*/ diff --git a/mysys/rijndael.c b/mysys/rijndael.c index dd0c45445d5..43cd14101ca 100644 --- a/mysys/rijndael.c +++ b/mysys/rijndael.c @@ -26,7 +26,6 @@ */ #include -#include #include "rijndael.h" /* diff --git a/mysys/thr_alarm.c b/mysys/thr_alarm.c index 54aa4d421f6..84a8e779ae1 100644 --- a/mysys/thr_alarm.c +++ b/mysys/thr_alarm.c @@ -27,7 +27,6 @@ #include #include #include "thr_alarm.h" -#include #ifdef HAVE_SYS_SELECT_H #include /* AIX needs this for fd_set */ diff --git a/sql-common/client.c b/sql-common/client.c index 962faf5cbe1..61ffd2b52e6 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -63,7 +63,6 @@ my_bool net_flush(NET *net); #include "mysqld_error.h" #include "errmsg.h" #include -#include #if defined(THREAD) && !defined(__WIN__) #include /* because of signal() */ #endif /* defined(THREAD) && !defined(__WIN__) */ diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 587fdf5d42b..b2d21c3fb55 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -15,7 +15,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include -#include #include #include #include diff --git a/sql/sql_string.cc b/sql/sql_string.cc index 991fb4d5c5a..f7e4e436495 100644 --- a/sql/sql_string.cc +++ b/sql/sql_string.cc @@ -24,7 +24,6 @@ #include #include #include -#include #ifdef HAVE_FCONVERT #include #endif diff --git a/strings/ctype-simple.c b/strings/ctype-simple.c index ba1fc1c424a..5f0a7426db3 100644 --- a/strings/ctype-simple.c +++ b/strings/ctype-simple.c @@ -20,7 +20,6 @@ #include #include "stdarg.h" -#include "assert.h" int my_strnxfrm_simple(CHARSET_INFO * cs, diff --git a/strings/ctype-ucs2.c b/strings/ctype-ucs2.c index bdf9b0f9252..9f1accf841f 100644 --- a/strings/ctype-ucs2.c +++ b/strings/ctype-ucs2.c @@ -312,7 +312,6 @@ static int my_mbcharlen_ucs2(CHARSET_INFO *cs __attribute__((unused)) , #include #include -#include static int my_vsnprintf_ucs2(char *dst, uint n, const char* fmt, va_list ap) { diff --git a/strings/my_vsnprintf.c b/strings/my_vsnprintf.c index dc03c130dcd..784c4762724 100644 --- a/strings/my_vsnprintf.c +++ b/strings/my_vsnprintf.c @@ -18,7 +18,6 @@ #include #include #include -#include /* Limited snprintf() implementations