summaryrefslogtreecommitdiffstats
path: root/third_party/sqlite/src
diff options
context:
space:
mode:
authordumi@google.com <dumi@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-12 05:16:29 +0000
committerdumi@google.com <dumi@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-12 05:16:29 +0000
commit87eacb992a5fcc517a29a7097937df217b6839ff (patch)
tree2c4809551376f143d31e45017832dec7ba2d004d /third_party/sqlite/src
parent1b4b23a7d82fce6e0637ed96b124af229fc21f22 (diff)
downloadchromium_src-87eacb992a5fcc517a29a7097937df217b6839ff.zip
chromium_src-87eacb992a5fcc517a29a7097937df217b6839ff.tar.gz
chromium_src-87eacb992a5fcc517a29a7097937df217b6839ff.tar.bz2
Revert the patch that makes SQLite interpret BEGIN as BEGIN IMMEDIATE,
and go back to the default behavior which treats BEGIN as BEGIN DEFERRED. TEST=none BUG=none Review URL: http://codereview.chromium.org/387030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31763 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/sqlite/src')
-rw-r--r--third_party/sqlite/src/parse.y5
1 files changed, 0 insertions, 5 deletions
diff --git a/third_party/sqlite/src/parse.y b/third_party/sqlite/src/parse.y
index 702da8e..39af6c0 100644
--- a/third_party/sqlite/src/parse.y
+++ b/third_party/sqlite/src/parse.y
@@ -121,12 +121,7 @@ trans_opt ::= .
trans_opt ::= TRANSACTION.
trans_opt ::= TRANSACTION nm.
%type transtype {int}
-%ifdef SQLITE_TRANSACTION_DEFAULT_IMMEDIATE
-transtype(A) ::= . {A = TK_IMMEDIATE;}
-%endif SQLITE_TRANSACTION_DEFAULT_IMMEDIATE
-%ifndef SQLITE_TRANSACTION_DEFAULT_IMMEDIATE
transtype(A) ::= . {A = TK_DEFERRED;}
-%endif SQLITE_TRANSACTION_DEFAULT_IMMEDIATE
transtype(A) ::= DEFERRED(X). {A = @X;}
transtype(A) ::= IMMEDIATE(X). {A = @X;}
transtype(A) ::= EXCLUSIVE(X). {A = @X;}