Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(195)

Unified Diff: third_party/sqlite/src/src/test3.c

Issue 6990047: Import SQLite 3.7.6.3. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/sqlite/src/src/test2.c ('k') | third_party/sqlite/src/src/test4.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/sqlite/src/src/test3.c
diff --git a/third_party/sqlite/src/src/test3.c b/third_party/sqlite/src/src/test3.c
index f630275950a651730c6331e4c83c5b5f6ac543f7..ef004ca7133aa239887d9532758d01d147d7a298 100644
--- a/third_party/sqlite/src/src/test3.c
+++ b/third_party/sqlite/src/src/test3.c
@@ -12,8 +12,6 @@
** Code for testing the btree.c module in SQLite. This code
** is not included in the SQLite library. It is used for automated
** testing of the SQLite library.
-**
-** $Id: test3.c,v 1.111 2009/07/09 05:07:38 danielk1977 Exp $
*/
#include "sqliteInt.h"
#include "btreeInt.h"
@@ -55,7 +53,7 @@ static sqlite3 sDb;
static int nRefSqlite3 = 0;
/*
-** Usage: btree_open FILENAME NCACHE FLAGS
+** Usage: btree_open FILENAME NCACHE
**
** Open a new database
*/
@@ -66,22 +64,21 @@ static int btree_open(
const char **argv /* Text of each argument */
){
Btree *pBt;
- int rc, nCache, flags;
+ int rc, nCache;
char zBuf[100];
- if( argc!=4 ){
+ if( argc!=3 ){
Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0],
" FILENAME NCACHE FLAGS\"", 0);
return TCL_ERROR;
}
if( Tcl_GetInt(interp, argv[2], &nCache) ) return TCL_ERROR;
- if( Tcl_GetInt(interp, argv[3], &flags) ) return TCL_ERROR;
nRefSqlite3++;
if( nRefSqlite3==1 ){
sDb.pVfs = sqlite3_vfs_find(0);
sDb.mutex = sqlite3MutexAlloc(SQLITE_MUTEX_RECURSIVE);
sqlite3_mutex_enter(sDb.mutex);
}
- rc = sqlite3BtreeOpen(argv[1], &sDb, &pBt, flags,
+ rc = sqlite3BtreeOpen(argv[1], &sDb, &pBt, 0,
SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | SQLITE_OPEN_MAIN_DB);
if( rc!=SQLITE_OK ){
Tcl_AppendResult(interp, errorName(rc), 0);
@@ -221,7 +218,7 @@ static int btree_cursor(
Btree *pBt;
int iTable;
BtCursor *pCur;
- int rc;
+ int rc = SQLITE_OK;
int wrFlag;
char zBuf[30];
@@ -236,7 +233,9 @@ static int btree_cursor(
pCur = (BtCursor *)ckalloc(sqlite3BtreeCursorSize());
memset(pCur, 0, sqlite3BtreeCursorSize());
sqlite3BtreeEnter(pBt);
+#ifndef SQLITE_OMIT_SHARED_CACHE
rc = sqlite3BtreeLockTable(pBt, iTable, wrFlag);
+#endif
if( rc==SQLITE_OK ){
rc = sqlite3BtreeCursor(pBt, iTable, wrFlag, 0, pCur);
}
« no previous file with comments | « third_party/sqlite/src/src/test2.c ('k') | third_party/sqlite/src/src/test4.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698