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

into mysql.com:/home/kostja/mysql/mysql-4.1-root

client/mysqlbinlog.cc

@@ -18,7 +18,6 @@
 #undef MYSQL_SERVER
 #include "client_priv.h"
 #include <time.h>
-#include <assert.h>
 #include "log_event.h"
 
 #define BIN_LOG_HEADER_SIZE	4

client/mysqldump.c

@@ -43,7 +43,6 @@
 #include <my_sys.h>
 #include <m_string.h>
 #include <m_ctype.h>
-#include <assert.h>
 
 #include "client_priv.h"
 #include "mysql.h"

heap/hp_hash.c

@@ -18,7 +18,6 @@
 
 #include "heapdef.h"
 #include <m_ctype.h>
-#include <assert.h>
 
 
 

include/m_string.h

@@ -123,7 +123,6 @@ extern	void bmove_align(gptr dst,const gptr src,uint len);
 #endif
 
 #ifdef HAVE_purify
-#include <assert.h>
 #define memcpy_overlap(A,B,C) \
 DBUG_ASSERT((A) <= (B) || ((B)+(C)) <= (A)); \
 bmove((byte*) (A),(byte*) (B),(size_t) (C));

include/my_dbug.h

@@ -16,6 +16,7 @@
 
 #ifndef _dbug_h
 #define _dbug_h
+#include <assert.h>
 #ifdef	__cplusplus
 extern "C" {
 #endif

libmysql/libmysql.c

@@ -27,7 +27,6 @@
 #include <sys/stat.h>
 #include <signal.h>
 #include <time.h>
-#include <assert.h> /* for DBUG_ASSERT() */
 #ifdef	 HAVE_PWD_H
 #include <pwd.h>
 #endif

myisam/ftdefs.h

@@ -22,7 +22,6 @@
 #include <m_ctype.h>
 #include <my_tree.h>
 #include <queues.h>
-#include <assert.h>
 
 #define true_word_char(s,X)	(my_isalnum(s,X) || (X)=='_')
 #define misc_word_char(X)	((X)=='\'')

myisam/mi_delete.c

@@ -18,7 +18,6 @@
 
 #include "fulltext.h"
 #include "rt_index.h"
-#include <assert.h>
 
 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);

myisam/mi_dynrec.c

@@ -25,7 +25,6 @@
 */
 
 #include "myisamdef.h"
-#include <assert.h>
 
 /* 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};

myisam/mi_key.c

@@ -19,7 +19,6 @@
 #include "myisamdef.h"
 #include "m_ctype.h"
 #include "sp_defs.h"
-#include <assert.h>
 #ifdef HAVE_IEEEFP_H
 #include <ieeefp.h>
 #endif

myisam/mi_open.c

@@ -20,7 +20,6 @@
 #include "sp_defs.h"
 #include "rt_index.h"
 #include <m_ctype.h>
-#include <assert.h>
 
 #if defined(MSDOS) || defined(__WIN__)
 #ifdef __WIN__

myisam/mi_search.c

@@ -18,7 +18,6 @@
 
 #include "fulltext.h"
 #include "m_ctype.h"
-#include <assert.h>
 
 static my_bool _mi_get_prev_key(MI_INFO *info, MI_KEYDEF *keyinfo, uchar *page,
                                 uchar *key, uchar *keypos,

myisam/mi_write.c

@@ -18,7 +18,6 @@
 
 #include "fulltext.h"
 #include "rt_index.h"
-#include <assert.h>
 
 #define MAX_POINTER_LENGTH 8
 

mysys/mf_iocache.c

@@ -55,7 +55,6 @@
 #include "mysys_err.h"
 static void my_aiowait(my_aio_result *result);
 #endif
-#include <assert.h>
 #include <errno.h>
 
 #ifdef THREAD

mysys/mf_iocache2.c

@@ -23,7 +23,6 @@
 #include <m_string.h>
 #include <stdarg.h>
 #include <m_ctype.h>
-#include <assert.h>
 
 my_off_t my_b_append_tell(IO_CACHE* info)
 {

mysys/mf_keycache.c

@@ -44,7 +44,6 @@
 #include "my_static.h"
 #include <m_string.h>
 #include <errno.h>
-#include <assert.h>
 #include <stdarg.h>
 
 /*

mysys/my_bitmap.c

@@ -35,7 +35,6 @@
 
 #include "mysys_priv.h"
 #include <my_bitmap.h>
-#include <assert.h>
 #include <m_string.h>
 
 

mysys/my_gethostbyname.c

@@ -18,7 +18,6 @@
 /* Thread safe version of gethostbyname_r() */
 
 #include "mysys_priv.h"
-#include <assert.h>
 #if !defined(MSDOS) && !defined(__WIN__)
 #include <netdb.h>
 #endif

mysys/my_getopt.c

@@ -18,7 +18,6 @@
 #include <m_string.h>
 #include <stdlib.h>
 #include <my_getopt.h>
-#include <assert.h>
 #include <my_sys.h>
 #include <mysys_err.h>
 

mysys/my_pthread.c

@@ -23,7 +23,6 @@
 #include <signal.h>
 #include <m_string.h>
 #include <thr_alarm.h>
-#include <assert.h>
 
 #if (defined(__BSD__) || defined(_BSDI_VERSION)) && !defined(HAVE_mit_thread)
 #define SCHED_POLICY SCHED_RR

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 <assert.h>
 
 	/* Seek to position in file */
 	/*ARGSUSED*/

mysys/rijndael.c

@@ -26,7 +26,6 @@
 */
 
 #include <my_global.h>
-#include <assert.h>
 #include "rijndael.h"
 
 /*

mysys/thr_alarm.c

@@ -27,7 +27,6 @@
 #include <m_string.h>
 #include <queues.h>
 #include "thr_alarm.h"
-#include <assert.h>
 
 #ifdef HAVE_SYS_SELECT_H
 #include <sys/select.h>				/* AIX needs this for fd_set */

sql-common/client.c

@@ -63,7 +63,6 @@ my_bool	net_flush(NET *net);
 #include "mysqld_error.h"
 #include "errmsg.h"
 #include <violite.h>
-#include <assert.h>
 #if defined(THREAD) && !defined(__WIN__)
 #include <my_pthread.h>				/* because of signal()	*/
 #endif /* defined(THREAD) && !defined(__WIN__) */

sql/mysql_priv.h

@@ -15,7 +15,6 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #include <my_global.h>
-#include <assert.h>
 #include <mysql_version.h>
 #include <mysql_embed.h>
 #include <my_sys.h>

sql/sql_string.cc

@@ -24,7 +24,6 @@
 #include <my_sys.h>
 #include <m_string.h>
 #include <m_ctype.h>
-#include <assert.h>
 #ifdef HAVE_FCONVERT
 #include <floatingpoint.h>
 #endif

strings/ctype-simple.c

@@ -20,7 +20,6 @@
 #include <errno.h>
 
 #include "stdarg.h"
-#include "assert.h"
 
 
 int my_strnxfrm_simple(CHARSET_INFO * cs, 

strings/ctype-ucs2.c

@@ -312,7 +312,6 @@ static int my_mbcharlen_ucs2(CHARSET_INFO *cs  __attribute__((unused)) ,
 
 #include <m_string.h>
 #include <stdarg.h>
-#include <assert.h>
 
 static int my_vsnprintf_ucs2(char *dst, uint n, const char* fmt, va_list ap)
 {

strings/my_vsnprintf.c

@@ -18,7 +18,6 @@
 #include <m_string.h>
 #include <stdarg.h>
 #include <m_ctype.h>
-#include <assert.h>
 
 /*
   Limited snprintf() implementations