Commit fa2bdf4d authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/jimw/my/mysql-4.1-clean 

into mysql.com:/home/jimw/my/mysql-5.0-clean


client/mysql.cc:
  Auto merged
parents 55ee2001 3785d218

bdb/btree/bt_open.c

+1 −1
Original line number Diff line number Diff line
@@ -489,7 +489,7 @@ __bam_new_file(dbp, txn, fhp, name) 
			goto err;

	} else {

#ifdef DIAGNOSTIC

		memset(buf, dbp->pgsize, 0);

		memset(buf, 0, dbp->pgsize);

#endif

		root = (PAGE *)buf;

	}

bdb/hash/hash_open.c

+1 −1
Original line number Diff line number Diff line
@@ -409,7 +409,7 @@ __ham_new_file(dbp, txn, fhp, name) 
			goto err;

	} else {

#ifdef DIAGNOSTIC

		memset(buf, dbp->pgsize, 0);

		memset(buf, 0, dbp->pgsize);

#endif

		page = (PAGE *)buf;

	}

client/mysql.cc

+6 −1
Original line number Diff line number Diff line
@@ -3090,10 +3090,15 @@ void tee_fprintf(FILE *file, const char *fmt, ...) 
#ifdef OS2

  fflush( file);

#endif

  va_end(args);



  if (opt_outfile)

  {

    va_start(args, fmt);

    (void) vfprintf(OUTFILE, fmt, args);

    va_end(args);

  }

}





void tee_fputs(const char *s, FILE *file)

ndb/src/kernel/vm/VMSignal.cpp

+2 −2
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ 
#include <string.h>



Signal::Signal(){

  memset(&header, sizeof(header), 0);

  memset(theData, sizeof(theData), 0);

  memset(&header, 0, sizeof(header));

  memset(theData, 0, sizeof(theData));

}



void