database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

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

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


client/mysql.cc:
  Auto merged
This commit is contained in:
unknown
2005-03-25 10:51:08 -08:00
parent 55ee20010c 3785d2188f
commit fa2bdf4df6
4 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bdb/btree/bt_open.c
View File

@ -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;
} }

2
bdb/hash/hash_open.c
View File

@ -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;
} }

9
client/mysql.cc
View File

@ -3090,9 +3090,14 @@ void tee_fprintf(FILE *file, const char *fmt, ...)
#ifdef OS2 #ifdef OS2
fflush( file); fflush( file);
#endif #endif
if (opt_outfile)
(void) vfprintf(OUTFILE, fmt, args);
va_end(args); va_end(args);
if (opt_outfile)
{
va_start(args, fmt);
(void) vfprintf(OUTFILE, fmt, args);
va_end(args);
}
} }

4
ndb/src/kernel/vm/VMSignal.cpp
View File

@ -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