Merge mysql.com:/home/jimw/my/mysql-4.1-9323
into mysql.com:/home/jimw/my/mysql-4.1-clean
This commit is contained in:
commit
4f19826d80
@ -489,7 +489,7 @@ __bam_new_file(dbp, txn, fhp, name)
|
|||||||
goto err;
|
goto err;
|
||||||
} else {
|
} else {
|
||||||
#ifdef DIAGNOSTIC
|
#ifdef DIAGNOSTIC
|
||||||
memset(buf, dbp->pgsize, 0);
|
memset(buf, 0, dbp->pgsize);
|
||||||
#endif
|
#endif
|
||||||
root = (PAGE *)buf;
|
root = (PAGE *)buf;
|
||||||
}
|
}
|
||||||
|
@ -409,7 +409,7 @@ __ham_new_file(dbp, txn, fhp, name)
|
|||||||
goto err;
|
goto err;
|
||||||
} else {
|
} else {
|
||||||
#ifdef DIAGNOSTIC
|
#ifdef DIAGNOSTIC
|
||||||
memset(buf, dbp->pgsize, 0);
|
memset(buf, 0, dbp->pgsize);
|
||||||
#endif
|
#endif
|
||||||
page = (PAGE *)buf;
|
page = (PAGE *)buf;
|
||||||
}
|
}
|
||||||
|
@ -18,8 +18,8 @@
|
|||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
Signal::Signal(){
|
Signal::Signal(){
|
||||||
memset(&header, sizeof(header), 0);
|
memset(&header, 0, sizeof(header));
|
||||||
memset(theData, sizeof(theData), 0);
|
memset(theData, 0, sizeof(theData));
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
Loading…
x
Reference in New Issue
Block a user