Commit 37695aaf authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-5.0 

into serg.mylan:/usr/home/serg/Abk/mysql-5.0
parents a004c510 93990166

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ bar@bar.intranet.mysql.r18.ru 
bar@bar.mysql.r18.ru

bar@bar.udmsearch.izhnet.ru

bar@deer.(none)

bar@eagle.intranet.mysql.r18.ru

bar@gw.udmsearch.izhnet.ru

bar@mysql.com

bar@noter.intranet.mysql.r18.ru

BitKeeper/triggers/pre-commit

+11 −0
Original line number Diff line number Diff line 
#!/bin/sh



if [ "$BK_USER" = "Administrator" -o "$BK_USER" = "mysqldev" ]

then

 echo "Error: you cannot commit as 'Administrator' or 'mysqldev' user."

 echo "as a workaround set BK_USER to your nickname"

 echo "e.g.: export BK_USER='bar'"

 echo ""

 echo "Checkin FAILED!"

 echo "Set BK_USER and retry."

 exit 1

fi



if [ "$REAL_EMAIL" = "" ]

then

 echo "Error: you must set REAL_EMAIL in your profile"

VC++Files/mysys/mysys.dsp

+4 −0
Original line number Diff line number Diff line
@@ -536,6 +536,10 @@ SOURCE=.\my_wincond.c 
# End Source File

# Begin Source File



SOURCE=.\my_windac.c

# End Source File

# Begin Source File



SOURCE=.\my_winsem.c

# End Source File

# Begin Source File

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;

	}