Commit 965d0929 authored Jun 11, 2004 by unknown

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

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

parents d9b81f3a f203beba

client/mysqlbinlog.cc

+0 −1

Original line number	Diff line number	Diff line
		@@ -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

+0 −1

Original line number	Diff line number	Diff line
		@@ -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

+0 −1

Original line number	Diff line number	Diff line
		@@ -18,7 +18,6 @@

		#include "heapdef.h"
		#include <m_ctype.h>
		#include <assert.h>

include/m_string.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -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

+1 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		#ifndef _dbug_h
		#define _dbug_h
		#include <assert.h>
		#ifdef __cplusplus
		extern "C" {
		#endif