diff options
| author | mrossetti@chromium.org <mrossetti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-31 23:12:11 +0000 |
|---|---|---|
| committer | mrossetti@chromium.org <mrossetti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-31 23:12:11 +0000 |
| commit | 21799f4bffc69ec1b1ccd485a15e1ba08faccf1d (patch) | |
| tree | 9ad3dd930b892c93b5ec4efb07c681a2fa3d0a3f /third_party/sqlite/README.chromium | |
| parent | 29a6897f96acbc960cc0d4fd07657caa7969a5e5 (diff) | |
| download | chromium_src-21799f4bffc69ec1b1ccd485a15e1ba08faccf1d.zip chromium_src-21799f4bffc69ec1b1ccd485a15e1ba08faccf1d.tar.gz chromium_src-21799f4bffc69ec1b1ccd485a15e1ba08faccf1d.tar.bz2 | |
Mac SQLite TimeMachine File Exclusions
When an SQLite database has been excluded from Time Machine backups also exclude its -journal.
(In fts3_porter.c: had to rename the cType due to a conflict with an included Apple library.)
BUG=74053
TEST=Manually: 1) Launch browser. 2) Run the following command:
/usr/bin/xattr-2.6 ~/Library/Application\ Support/Chromium/Default/History-journal
3) Verify that the following is shown as one of the results of running the xattr-2.6 command:
com.apple.metadata:com_apple_backup_excludeItem
Review URL: http://codereview.chromium.org/6990066
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87391 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/sqlite/README.chromium')
| -rw-r--r-- | third_party/sqlite/README.chromium | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/third_party/sqlite/README.chromium b/third_party/sqlite/README.chromium index b501a9f..714da32 100644 --- a/third_party/sqlite/README.chromium +++ b/third_party/sqlite/README.chromium @@ -44,8 +44,8 @@ kdiff3 -m sqlite-$BASE sqlite-$LATEST sqlite # Change to the sqlite directory: cd sqlite -# Run the google_generate_preprocessed.sh script: -./google_generate_preprocessed.sh +# Run the google_generate_amalgamation.sh script: +./google_generate_amalgamation.sh # Find a sucker. Send review. # TODO(shess) Describe an appropriate comment style. Seems like it @@ -68,20 +68,19 @@ icu-shell.patch attach-integer.patch webdb.patch test.patch +mac_time_machine.patch So, e.g. you could do this to apply all our patches to vanilla SQLite: cd sqlite-$LATEST patch -p0 < ../sqlite/misc.patch patch -p0 < ../sqlite/preload-cache.patch -patch -p0 < ../sqlite/safe-tolower.patch patch -p0 < ../sqlite/fts2.patch patch -p0 < ../sqlite/fts3.patch -patch -p0 < ../sqlite/icu-regexp.patch patch -p0 < ../sqlite/icu-shell.patch -patch -p0 < ../sqlite/attach-integer.patch patch -p0 < ../sqlite/webdb.patch patch -p0 < ../sqlite/test.patch +patch -p0 < ../sqlite/mac_time_machine.patch This will only be the case if all changes we make also update the corresponding patch files. Therefore please remember to do that whenever you make a change! @@ -177,3 +176,11 @@ Changes from Chrome: chromium_sqlite3_fill_in_unix_sqlite3_file() function that calls fillInUnixFile(), which will be made static again as soon as a WebKit patch using the new function lands. + - From mac_time_machine.patch: + When __APPLE__ and when creating a -journal file, determine if the database + for which the journal is being created has been excluded from being backed + up using Apple's Time Machine and if so then also exclude the journal. These + changes were made in pager.c with includes of Apple interfaces being made in + sqliteInt.h. In order to eliminate a symbol conflict with an Apple library + after amalgamation it was also necessary to rename fts3_porter.c's 'cType' + to 'vOrCType'. |