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

Side by Side Diff: third_party/sqlite/misc.patch

Issue 387030: Revert the patch that makes SQLite interpret BEGIN as BEGIN IMMEDIATE,... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Final version. Had to sync README.chromium. Created 11 years, 1 month 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 Index: Makefile.linux-gcc 1 Index: Makefile.linux-gcc
2 =================================================================== 2 ===================================================================
3 --- Makefile.linux-gcc 2009-09-03 13:32:06.000000000 -0700 3 --- Makefile.linux-gcc 2009-09-03 13:32:06.000000000 -0700
4 +++ Makefile.linux-gcc 2009-07-01 12:08:39.000000000 -0700 4 +++ Makefile.linux-gcc 2009-07-01 12:08:39.000000000 -0700
5 @@ -14,7 +14,7 @@ 5 @@ -14,7 +14,7 @@
6 #### The toplevel directory of the source tree. This is the directory 6 #### The toplevel directory of the source tree. This is the directory
7 # that contains this "Makefile.in" and the "configure.in" script. 7 # that contains this "Makefile.in" and the "configure.in" script.
8 # 8 #
9 -TOP = ../sqlite 9 -TOP = ../sqlite
10 +TOP = .. 10 +TOP = ..
(...skipping 277 matching lines...) Expand 10 before | Expand all | Expand 10 after
288 } 288 }
289 289
290 +void chromium_sqlite3_initialize_win_sqlite3_file(sqlite3_file* file, HANDLE ha ndle) { 290 +void chromium_sqlite3_initialize_win_sqlite3_file(sqlite3_file* file, HANDLE ha ndle) {
291 + winFile* winSQLite3File = (winFile*)file; 291 + winFile* winSQLite3File = (winFile*)file;
292 + memset(file, 0, sizeof(*file)); 292 + memset(file, 0, sizeof(*file));
293 + winSQLite3File->pMethod = &winIoMethod; 293 + winSQLite3File->pMethod = &winIoMethod;
294 + winSQLite3File->h = handle; 294 + winSQLite3File->h = handle;
295 +} 295 +}
296 + 296 +
297 #endif /* SQLITE_OS_WIN */ 297 #endif /* SQLITE_OS_WIN */
298 Index: src/parse.y
299 ===================================================================
300 --- src/parse.y 2009-09-04 13:37:42.000000000 -0700
301 +++ src/parse.y 2009-09-15 11:32:03.000000000 -0700
302 @@ -121,7 +121,12 @@
303 trans_opt ::= TRANSACTION.
304 trans_opt ::= TRANSACTION nm.
305 %type transtype {int}
306 +%ifdef SQLITE_TRANSACTION_DEFAULT_IMMEDIATE
307 +transtype(A) ::= . {A = TK_IMMEDIATE;}
308 +%endif SQLITE_TRANSACTION_DEFAULT_IMMEDIATE
309 +%ifndef SQLITE_TRANSACTION_DEFAULT_IMMEDIATE
310 transtype(A) ::= . {A = TK_DEFERRED;}
311 +%endif SQLITE_TRANSACTION_DEFAULT_IMMEDIATE
312 transtype(A) ::= DEFERRED(X). {A = @X;}
313 transtype(A) ::= IMMEDIATE(X). {A = @X;}
314 transtype(A) ::= EXCLUSIVE(X). {A = @X;}
315 Index: src/pcache.c 298 Index: src/pcache.c
316 =================================================================== 299 ===================================================================
317 --- src/pcache.c 2009-09-04 13:37:42.000000000 -0700 300 --- src/pcache.c 2009-09-04 13:37:42.000000000 -0700
318 +++ src/pcache.c 2009-09-15 16:41:55.000000000 -0700 301 +++ src/pcache.c 2009-09-15 16:41:55.000000000 -0700
319 @@ -542,14 +542,12 @@ 302 @@ -542,14 +542,12 @@
320 return nPage; 303 return nPage;
321 } 304 }
322 305
323 -#ifdef SQLITE_TEST 306 -#ifdef SQLITE_TEST
324 /* 307 /*
(...skipping 871 matching lines...) Expand 10 before | Expand all | Expand 10 after
1196 + if {$sqlite_open_file_count>0} { 1179 + if {$sqlite_open_file_count>0} {
1197 + puts "$tail did not close all files: $sqlite_open_file_count" 1180 + puts "$tail did not close all files: $sqlite_open_file_count"
1198 + incr nErr 1181 + incr nErr
1199 + lappend ::failList $tail 1182 + lappend ::failList $tail
1200 + } 1183 + }
1201 +} 1184 +}
1202 +source $testdir/misuse.test 1185 +source $testdir/misuse.test
1203 + 1186 +
1204 +set sqlite_open_file_count 0 1187 +set sqlite_open_file_count 0
1205 +really_finish_test 1188 +really_finish_test
OLDNEW
« no previous file with comments | « third_party/sqlite/google_generate_preprocessed.sh ('k') | third_party/sqlite/preprocessed/parse.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698