archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 23:18:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Updated libsqlite in ext/sqlite to 2.8.17.

Browse source 
Use in-memory database for tests.
This commit is contained in:
Ilia Alshanetsky 2005-12-20 15:26:26 +00:00
parent 5961160f95
commit 61c9b22536
9 changed files with 13 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

1
ext/sqlite/libsqlite/src/os.c
View file

@ -1778,6 +1778,7 @@ char *sqliteOsFullPathname(const char *zRelative){
sqliteSetString(&zFull, zRelative, (char*)0);
}else{
char zBuf[5000];
zBuf[0] = 0;
sqliteSetString(&zFull, getcwd(zBuf, sizeof(zBuf)), "/", zRelative,
(char*)0);
}

2
ext/sqlite/libsqlite/src/pager.c
View file

@ -1929,7 +1929,7 @@ void sqlitepager_dont_write(Pager *pPager, Pgno pgno){
pPg = pager_lookup(pPager, pgno);
pPg->alwaysRollback = 1;
if( pPg && pPg->dirty ){
if( pPg && pPg->dirty && !pPager->ckptInUse ){
if( pPager->dbSize==(int)pPg->pgno && pPager->origDbSize<pPager->dbSize ){
/* If this pages is the last page in the file and the file has grown
** during the current transaction, then do NOT mark the page as clean.

2
ext/sqlite/libsqlite/src/sqlite.w32.h
View file

@ -28,7 +28,7 @@ extern "C" {
/*
** The version of the SQLite library.
*/
#define SQLITE_VERSION "2.8.16"
#define SQLITE_VERSION "2.8.17"
/*
** The version string is also compiled into the library so that a program

2
ext/sqlite/libsqlite/src/sqliteInt.h
View file

@ -1120,7 +1120,7 @@ void sqliteRealToSortable(double r, char *);
#endif
char *sqliteMPrintf(const char*, ...);
char *sqliteVMPrintf(const char*, va_list);
void sqliteSetString(char **, const char *, ...);
void sqliteSetString(char **, ...);
void sqliteSetNString(char **, ...);
void sqliteErrorMsg(Parse*, const char*, ...);
void sqliteDequote(char*);

11
ext/sqlite/libsqlite/src/util.c
View file

@ -330,15 +330,15 @@ char *sqliteStrNDup(const char *z, int n){
** point to that string. The 1st argument must either be NULL or
** point to memory obtained from sqliteMalloc().
*/
void sqliteSetString(char **pz, const char *zFirst, ...){
void sqliteSetString(char **pz, ...){
va_list ap;
int nByte;
const char *z;
char *zResult;
if( pz==0 ) return;
nByte = strlen(zFirst) + 1;
va_start(ap, zFirst);
nByte = 1;
va_start(ap, pz);
while( (z = va_arg(ap, const char*))!=0 ){
nByte += strlen(z);
}
@ -348,9 +348,8 @@ void sqliteSetString(char **pz, const char *zFirst, ...){
if( zResult==0 ){
return;
}
strcpy(zResult, zFirst);
zResult += strlen(zResult);
va_start(ap, zFirst);
*zResult = 0;
va_start(ap, pz);
while( (z = va_arg(ap, const char*))!=0 ){
strcpy(zResult, z);
zResult += strlen(zResult);