diff options
| author | mpcomplete@google.com <mpcomplete@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-06 22:39:41 +0000 |
|---|---|---|
| committer | mpcomplete@google.com <mpcomplete@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-06 22:39:41 +0000 |
| commit | 586381f8db3497c24c11f96234f1879b34e74bc7 (patch) | |
| tree | 99f7d18350289b135ef6dd5c161baba8bce668a3 /chrome | |
| parent | 6e3b12ff2cbbe8c481f986c8f0dd230bb50add2a (diff) | |
| download | chromium_src-586381f8db3497c24c11f96234f1879b34e74bc7.zip chromium_src-586381f8db3497c24c11f96234f1879b34e74bc7.tar.gz chromium_src-586381f8db3497c24c11f96234f1879b34e74bc7.tar.bz2 | |
Upgrade our sqlite to 3.6.1, with the local changes made by Gears. I'm
checking in the full sqlite tree to make upstream merges easier. This means
we'll have generated sources split out from the originals.
One important change this makes is that "BEGIN" now defaults to "BEGIN
IMMEDIATE" rather than "BEGIN DEFERRED". This doesn't affect us because we
don't use unqualified BEGIN statements.
The full CL is too big for Rietveld. I'm splitting it into 2. This one is
reviewable. The other CL is just a fresh drop of:
//depot/googleclient/gears/opensource/third_party/sqlite_google
Review URL: http://codereview.chromium.org/15067
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7623 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/common/sqlite_compiled_statement.h | 2 | ||||
| -rw-r--r-- | chrome/common/sqlite_utils.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/chrome/common/sqlite_compiled_statement.h b/chrome/common/sqlite_compiled_statement.h index 27aa73927..36bb588 100644 --- a/chrome/common/sqlite_compiled_statement.h +++ b/chrome/common/sqlite_compiled_statement.h @@ -10,7 +10,7 @@ #include "chrome/common/sqlite_utils.h" -#include "third_party/sqlite/sqlite3.h" +#include "third_party/sqlite/preprocessed/sqlite3.h" // Stores a list of precompiled sql statements for a database. Each statement // is given a unique name by the caller. diff --git a/chrome/common/sqlite_utils.h b/chrome/common/sqlite_utils.h index 7b38d2f..fcf384d 100644 --- a/chrome/common/sqlite_utils.h +++ b/chrome/common/sqlite_utils.h @@ -10,7 +10,7 @@ #include "base/basictypes.h" -#include "third_party/sqlite/sqlite3.h" +#include "third_party/sqlite/preprocessed/sqlite3.h" // forward declarations of classes defined here class SQLTransaction; |