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

Side by Side Diff: third_party/sqlite/src/parse.y

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
« no previous file with comments | « third_party/sqlite/preprocessed/parse.c ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 ** 2001 September 15 2 ** 2001 September 15
3 ** 3 **
4 ** The author disclaims copyright to this source code. In place of 4 ** The author disclaims copyright to this source code. In place of
5 ** a legal notice, here is a blessing: 5 ** a legal notice, here is a blessing:
6 ** 6 **
7 ** May you do good and not evil. 7 ** May you do good and not evil.
8 ** May you find forgiveness for yourself and forgive others. 8 ** May you find forgiveness for yourself and forgive others.
9 ** May you share freely, never taking more than you give. 9 ** May you share freely, never taking more than you give.
10 ** 10 **
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 cmdx ::= cmd. { sqlite3FinishCoding(pParse); } 114 cmdx ::= cmd. { sqlite3FinishCoding(pParse); }
115 115
116 ///////////////////// Begin and end transactions. //////////////////////////// 116 ///////////////////// Begin and end transactions. ////////////////////////////
117 // 117 //
118 118
119 cmd ::= BEGIN transtype(Y) trans_opt. {sqlite3BeginTransaction(pParse, Y);} 119 cmd ::= BEGIN transtype(Y) trans_opt. {sqlite3BeginTransaction(pParse, Y);}
120 trans_opt ::= . 120 trans_opt ::= .
121 trans_opt ::= TRANSACTION. 121 trans_opt ::= TRANSACTION.
122 trans_opt ::= TRANSACTION nm. 122 trans_opt ::= TRANSACTION nm.
123 %type transtype {int} 123 %type transtype {int}
124 %ifdef SQLITE_TRANSACTION_DEFAULT_IMMEDIATE
125 transtype(A) ::= . {A = TK_IMMEDIATE;}
126 %endif SQLITE_TRANSACTION_DEFAULT_IMMEDIATE
127 %ifndef SQLITE_TRANSACTION_DEFAULT_IMMEDIATE
128 transtype(A) ::= . {A = TK_DEFERRED;} 124 transtype(A) ::= . {A = TK_DEFERRED;}
129 %endif SQLITE_TRANSACTION_DEFAULT_IMMEDIATE
130 transtype(A) ::= DEFERRED(X). {A = @X;} 125 transtype(A) ::= DEFERRED(X). {A = @X;}
131 transtype(A) ::= IMMEDIATE(X). {A = @X;} 126 transtype(A) ::= IMMEDIATE(X). {A = @X;}
132 transtype(A) ::= EXCLUSIVE(X). {A = @X;} 127 transtype(A) ::= EXCLUSIVE(X). {A = @X;}
133 cmd ::= COMMIT trans_opt. {sqlite3CommitTransaction(pParse);} 128 cmd ::= COMMIT trans_opt. {sqlite3CommitTransaction(pParse);}
134 cmd ::= END trans_opt. {sqlite3CommitTransaction(pParse);} 129 cmd ::= END trans_opt. {sqlite3CommitTransaction(pParse);}
135 cmd ::= ROLLBACK trans_opt. {sqlite3RollbackTransaction(pParse);} 130 cmd ::= ROLLBACK trans_opt. {sqlite3RollbackTransaction(pParse);}
136 131
137 savepoint_opt ::= SAVEPOINT. 132 savepoint_opt ::= SAVEPOINT.
138 savepoint_opt ::= . 133 savepoint_opt ::= .
139 cmd ::= SAVEPOINT nm(X). { 134 cmd ::= SAVEPOINT nm(X). {
(...skipping 1186 matching lines...) Expand 10 before | Expand all | Expand 10 after
1326 vtabarglist ::= vtabarglist COMMA vtabarg. 1321 vtabarglist ::= vtabarglist COMMA vtabarg.
1327 vtabarg ::= . {sqlite3VtabArgInit(pParse);} 1322 vtabarg ::= . {sqlite3VtabArgInit(pParse);}
1328 vtabarg ::= vtabarg vtabargtoken. 1323 vtabarg ::= vtabarg vtabargtoken.
1329 vtabargtoken ::= ANY(X). {sqlite3VtabArgExtend(pParse,&X);} 1324 vtabargtoken ::= ANY(X). {sqlite3VtabArgExtend(pParse,&X);}
1330 vtabargtoken ::= lp anylist RP(X). {sqlite3VtabArgExtend(pParse,&X);} 1325 vtabargtoken ::= lp anylist RP(X). {sqlite3VtabArgExtend(pParse,&X);}
1331 lp ::= LP(X). {sqlite3VtabArgExtend(pParse,&X);} 1326 lp ::= LP(X). {sqlite3VtabArgExtend(pParse,&X);}
1332 anylist ::= . 1327 anylist ::= .
1333 anylist ::= anylist LP anylist RP. 1328 anylist ::= anylist LP anylist RP.
1334 anylist ::= anylist ANY. 1329 anylist ::= anylist ANY.
1335 %endif SQLITE_OMIT_VIRTUALTABLE 1330 %endif SQLITE_OMIT_VIRTUALTABLE
OLDNEW
« no previous file with comments | « third_party/sqlite/preprocessed/parse.c ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698