mirrors/sqlite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge in the latest changes from trunk.

Browse Source 
FossilOrigin-Name: 0d99229a7a58da07748072326f6261c533c1958f
This commit is contained in:
drh 2011-04-02 20:08:10 +00:00
commit 069d32592d
10 changed files with 70 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
manifest
View File

@ -1,5 +1,5 @@
C When\sresetting\sany\snon-TEMP\sschema,\salso\sreset\sthe\sTEMP\sschema\ssince\sit\smight\nbe\sholding\sreferences\sto\sthe\snon-TEMP\sschema\sthat\sjust\sgot\sreset.
D 2011-04-02T16:50:25.018
C Merge\sin\sthe\slatest\schanges\sfrom\strunk.
D 2011-04-02T20:08:10.095
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in 7a4d9524721d40ef9ee26f93f9bd6a51dba106f2
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@ -124,7 +124,7 @@ F src/btmutex.c 96a12f50f7a17475155971a241d85ec5171573ff
F src/btree.c 2b9c81ff64da339a67dda4f94c0d763627be0b67
F src/btree.h 8d36f774ec4b1d0027b8966f8c03d9a72a518c14
F src/btreeInt.h 20f73dc93b1eeb83afd7259fbc6bd7dcf2df7fe4
F src/build.c fcdd8f47361261432fb10d0e7234ba617025d1f2
F src/build.c 0dd1fd5a9d38534e99d7ed70c325647917e571c5
F src/callback.c 5069f224882cbdccd559f591271d28d7f37745bc
F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
F src/ctime.c 52ff72f966cee3087e0138a3ec69371c22be3c01
@ -162,7 +162,7 @@ F src/os.c 22ac61d06e72a0dac900400147333b07b13d8e1d
F src/os.h 9dbed8c2b9c1f2f2ebabc09e49829d4777c26bf9
F src/os_common.h a8f95b81eca8a1ab8593d23e94f8a35f35d4078f
F src/os_os2.c 2596fd2d5d0976c6c0c628d0c3c7c4e7a724f4cf
F src/os_unix.c a3b4cdf50a9c9be8b50dc4932354ab749962a07f
F src/os_unix.c 32414676594a0a26cfccd7e02656230a3406eee7
F src/os_win.c 24d72407a90551969744cf9bcbb1b4c72c5fa845
F src/pager.c 6aa906b60a59664ba58d3f746164bb010d407ce1
F src/pager.h 3f8c783de1d4706b40b1ac15b64f5f896bcc78d1
@ -180,7 +180,7 @@ F src/select.c d24406c45dd2442eb2eeaac413439066b149c944
F src/shell.c 9dc0b4bb59290c0a35256d278cab0f314987ad6a
F src/sqlite.h.in e047f69a61d604d4f8be6cf1d1bdfc68be9ba7e5
F src/sqlite3ext.h c90bd5507099f62043832d73f6425d8d5c5da754
F src/sqliteInt.h f8f1d00a22c98fd3f2fbc94da74eeb880879f89f
F src/sqliteInt.h d45b0b1db417d5308e3bf9c8983aaf2d06e7cd36
F src/sqliteLimit.h a17dcd3fb775d63b64a43a55c54cb282f9726f44
F src/status.c 4997380fbb915426fef9e500b4872e79c99267fc
F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@ -222,7 +222,7 @@ F src/test_schema.c 8c06ef9ddb240c7a0fcd31bc221a6a2aade58bf0
F src/test_server.c bbba05c144b5fc4b52ff650a4328027b3fa5fcc6
F src/test_stat.c f682704b5d1ba8e1d4e7e882a6d7922e2dcf066c
F src/test_superlock.c 2b97936ca127d13962c3605dbc9a4ef269c424cd
F src/test_syscall.c 61bb14684142a19c580a13b4dde680044d37e0f5
F src/test_syscall.c 34ce1be806cd180e241bc688ae3762e5e7825bda
F src/test_tclvar.c f4dc67d5f780707210d6bb0eb6016a431c04c7fa
F src/test_thread.c bedd05cad673dba53326f3aa468cc803038896c0
F src/test_vfs.c 2ed8853c1e51ac6f9ea091f7ce4e0d618bba8b86
@ -237,9 +237,9 @@ F src/util.c cd997077bad039efc0597eb027c929658f93c018
F src/vacuum.c 3b2b0998f4f277e4bc61469c2d78d8424d02899b
F src/vdbe.c 6b15a8fb9bb5d5abd232fbc72cc6410c2fd70c1b
F src/vdbe.h 4de0efb4b0fdaaa900cf419b35c458933ef1c6d2
F src/vdbeInt.h e1c6254641168507d25b46affb6dfb53c782f553
F src/vdbeInt.h 8ee9302ecc1036509956df8aceea6b0b5e0e231c
F src/vdbeapi.c a09ad9164cafc505250d5dd6b69660c960f1308c
F src/vdbeaux.c e97565fb2fea822a2e853370c440b493ef09d7e7
F src/vdbeaux.c f4b4a7dce084fbe49f6ba761f4ce42e732eb95b1
F src/vdbeblob.c c3ccb7c8732858c680f442932e66ad06bb036562
F src/vdbemem.c 0498796b6ffbe45e32960d6a1f5adfb6e419883b
F src/vdbetrace.c 3ba13bc32bdf16d2bdea523245fd16736bed67b5
@ -594,7 +594,7 @@ F test/notnull.test cc7c78340328e6112a13c3e311a9ab3127114347
F test/null.test a8b09b8ed87852742343b33441a9240022108993
F test/omitunique.test bbb2ec4345d9125d9ee21cd9488d97a163020d5f
F test/openv2.test af02ed0a9cbc0d2a61b8f35171d4d117e588e4ec
F test/oserror.test 6c61c859cd94864cfd6af83e0549e2800238c413
F test/oserror.test 0abf1b4a935aae329b95da27388d7ca61aaea6f0
F test/pager1.test d8672fd0af5f4f9b99b06283d00f01547809bebe
F test/pager2.test 745b911dde3d1f24ae0870bd433dfa83d7c658c1
F test/pager3.test 3856d9c80839be0668efee1b74811b1b7f7fc95f
@ -677,7 +677,7 @@ F test/subselect.test d24fd8757daf97dafd2e889c73ea4c4272dcf4e4
F test/substr.test 18f57c4ca8a598805c4d64e304c418734d843c1a
F test/superlock.test 5d7a4954b0059c903f82c7b67867bc5451a7c082
F test/sync.test ded6b39d8d8ca3c0c5518516c6371b3316d3e3a3
F test/syscall.test d1dae1fee88613cf763d97ad0038d867509e0c42
F test/syscall.test b967e1f5405bb1c9e2e223dbf7d7cd35220589a3
F test/sysfault.test c79441d88d23696fbec7b147dba98d42a04f523f
F test/table.test 04ba066432430657712d167ebf28080fe878d305
F test/tableapi.test 2674633fa95d80da917571ebdd759a14d9819126
@ -926,7 +926,7 @@ F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c
F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
P 6a8ad6e31e0d2b8a5ace38faf0efd805155ee5f3
R bc8973ff15cc98898e96282e6b2f93e3
P 211d5dde1f9c15048c65d1d700141aa7b2491011 3d6f2e82358c0d8c0ca04e0da20b84fc65c3f7fa
R 290acaeec121836b8a1b99b53f8bb8b6
U drh
Z af325c6ab15f4448779a96c9a9fe8dd3
Z 38fca8897a28d9359be9824575889a08

2
manifest.uuid
View File

@ -1 +1 @@
211d5dde1f9c15048c65d1d700141aa7b2491011
0d99229a7a58da07748072326f6261c533c1958f

8
src/build.c
View File

@ -148,7 +148,7 @@ void sqlite3FinishCoding(Parse *pParse){
** on each used database.
*/
if( pParse->cookieGoto>0 ){
tAttachMask mask;
yDbMask mask;
int iDb;
sqlite3VdbeJumpHere(v, pParse->cookieGoto-1);
for(iDb=0, mask=1; iDb<db->nDb; mask<<=1, iDb++){
@ -3459,12 +3459,12 @@ void sqlite3CodeVerifySchema(Parse *pParse, int iDb){
}
if( iDb>=0 ){
sqlite3 *db = pToplevel->db;
tAttachMask mask;
yDbMask mask;
assert( iDb<db->nDb );
assert( db->aDb[iDb].pBt!=0 || iDb==1 );
assert( iDb<SQLITE_MAX_ATTACHED+2 );
mask = ((tAttachMask)1)<<iDb;
mask = ((yDbMask)1)<<iDb;
if( (pToplevel->cookieMask & mask)==0 ){
pToplevel->cookieMask |= mask;
pToplevel->cookieValue[iDb] = db->aDb[iDb].pSchema->schema_cookie;
@ -3491,7 +3491,7 @@ void sqlite3CodeVerifySchema(Parse *pParse, int iDb){
void sqlite3BeginWriteOperation(Parse *pParse, int setStatement, int iDb){
Parse *pToplevel = sqlite3ParseToplevel(pParse);
sqlite3CodeVerifySchema(pParse, iDb);
pToplevel->writeMask |= ((tAttachMask)1)<<iDb;
pToplevel->writeMask |= ((yDbMask)1)<<iDb;
pToplevel->isMultiWrite |= setStatement;
}

2
src/os_unix.c
View File

@ -394,10 +394,10 @@ static int unixSetSystemCall(
/* If no zName is given, restore all system calls to their default
** settings and return NULL
*/
rc = SQLITE_OK;
for(i=0; i<sizeof(aSyscall)/sizeof(aSyscall[0]); i++){
if( aSyscall[i].pDefault ){
aSyscall[i].pCurrent = aSyscall[i].pDefault;
rc = SQLITE_OK;
}
}
}else{

12
src/sqliteInt.h
View File

@ -2125,11 +2125,13 @@ struct TriggerPrg {
TriggerPrg *pNext; /* Next entry in Parse.pTriggerPrg list */
};
/* Datatype for the bitmask of all attached databases */
/*
** The yDbMask datatype for the bitmask of all attached databases.
*/
#if SQLITE_MAX_ATTACHED>30
typedef sqlite3_uint64 tAttachMask;
typedef sqlite3_uint64 yDbMask;
#else
typedef unsigned int tAttachMask;
typedef unsigned int yDbMask;
#endif
/*
@ -2180,8 +2182,8 @@ struct Parse {
int iReg; /* Reg with value of this column. 0 means none. */
int lru; /* Least recently used entry has the smallest value */
} aColCache[SQLITE_N_COLCACHE]; /* One for each column cache entry */
tAttachMask writeMask; /* Start a write transaction on these databases */
tAttachMask cookieMask; /* Bitmask of schema verified databases */
yDbMask writeMask; /* Start a write transaction on these databases */
yDbMask cookieMask; /* Bitmask of schema verified databases */
u8 isMultiWrite; /* True if statement may affect/insert multiple rows */
u8 mayAbort; /* True if statement may throw an ABORT exception */
int cookieGoto; /* Address of OP_Goto to cookie verifier subroutine */

33
src/test_syscall.c
View File

@ -599,6 +599,24 @@ static int test_syscall_list(
return TCL_OK;
}
static int test_syscall_defaultvfs(
void * clientData,
Tcl_Interp *interp,
int objc,
Tcl_Obj *CONST objv[]
){
sqlite3_vfs *pVfs;
if( objc!=2 ){
Tcl_WrongNumArgs(interp, 2, objv, "");
return TCL_ERROR;
}
pVfs = sqlite3_vfs_find(0);
Tcl_SetObjResult(interp, Tcl_NewStringObj(pVfs->zName, -1));
return TCL_OK;
}
static int test_syscall(
void * clientData,
Tcl_Interp *interp,
@ -609,13 +627,14 @@ static int test_syscall(
const char *zName;
Tcl_ObjCmdProc *xCmd;
} aCmd[] = {
{ "fault", test_syscall_fault },
{ "install", test_syscall_install },
{ "uninstall", test_syscall_uninstall },
{ "reset", test_syscall_reset },
{ "errno", test_syscall_errno },
{ "exists", test_syscall_exists },
{ "list", test_syscall_list },
{ "fault", test_syscall_fault },
{ "install", test_syscall_install },
{ "uninstall", test_syscall_uninstall },
{ "reset", test_syscall_reset },
{ "errno", test_syscall_errno },
{ "exists", test_syscall_exists },
{ "list", test_syscall_list },
{ "defaultvfs", test_syscall_defaultvfs },
{ 0, 0 }
};
int iCmd;

2
src/vdbeInt.h
View File

@ -302,7 +302,7 @@ struct Vdbe {
u8 readOnly; /* True for read-only statements */
u8 isPrepareV2; /* True if prepared with prepare_v2() */
int nChange; /* Number of db changes made since last reset */
tAttachMask btreeMask; /* Bitmask of db->aDb[] entries referenced */
yDbMask btreeMask; /* Bitmask of db->aDb[] entries referenced */
int iStatement; /* Statement number (or 0 if has not opened stmt) */
int aCounter[3]; /* Counters used by sqlite3_stmt_status() */
BtreeMutexArray aMutex; /* An array of Btree used here and needing locks */

4
src/vdbeaux.c
View File

@ -951,8 +951,8 @@ static char *displayP4(Op *pOp, char *zTemp, int nTemp){
** in order (and released in reverse order) to avoid deadlocks.
*/
void sqlite3VdbeUsesBtree(Vdbe *p, int i){
tAttachMask mask;
assert( i>=0 && i<p->db->nDb && i<sizeof(tAttachMask)*8 );
yDbMask mask;
assert( i>=0 && i<p->db->nDb && i<sizeof(yDbMask)*8 );
assert( i<(int)sizeof(p->btreeMask)*8 );
mask = ((u32)1)<<i;
if( (p->btreeMask & mask)==0 ){

1
test/oserror.test
View File

@ -111,6 +111,7 @@ do_test 2.1.3 {
} {}
test_syscall reset
sqlite3_shutdown
test_sqlite3_log
sqlite3_initialize

23
test/syscall.test
View File

@ -19,8 +19,12 @@ if {[llength [info commands test_syscall]]==0} {
finish_test
return
}
set testprefix syscall
if {[test_syscall defaultvfs] != "unix"} {
finish_test
return
}
set testprefix syscall
#-------------------------------------------------------------------------
# Tests for the xSetSystemCall method.
@ -52,12 +56,14 @@ do_test 2.1.2 { test_syscall exists nosuchcall } 0
#-------------------------------------------------------------------------
# Tests for the xNextSystemCall method.
#
set syscall_list [list \
open close access getcwd stat fstat ftruncate \
fcntl read pread write pwrite fchmod \
]
if {[test_syscall exists fallocate]} {lappend syscall_list fallocate}
do_test 3.1 { test_syscall list } $syscall_list
foreach s {
open close access getcwd stat fstat ftruncate
fcntl read pread write pwrite fchmod fallocate
pread64 pwrite64
} {
if {[test_syscall exists $s]} {lappend syscall_list $s}
}
do_test 3.1 { lsort [test_syscall list] } [lsort $syscall_list]
#-------------------------------------------------------------------------
# This test verifies that if a call to open() fails and errno is set to
@ -245,6 +251,5 @@ foreach {tn hint size} {
} $size
}
test_syscall reset
finish_test