diff options
| author | shess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-11 21:49:46 +0000 |
|---|---|---|
| committer | shess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-11 21:49:46 +0000 |
| commit | e12ca65eec4c7778dff4330beb6060f95914f5ce (patch) | |
| tree | f5cf6708babddaf9ce07094dc14a2a8daa760fd2 /tools | |
| parent | 25898d64396ac91275a9bc72a77817347ab474dd (diff) | |
| download | chromium_src-e12ca65eec4c7778dff4330beb6060f95914f5ce.zip chromium_src-e12ca65eec4c7778dff4330beb6060f95914f5ce.tar.gz chromium_src-e12ca65eec4c7778dff4330beb6060f95914f5ce.tar.bz2 | |
Revert 228217 "Recover version 6 Favicons, fix meta table."
[Broke android dbg tests.]
> Recover version 6 Favicons, fix meta table.
>
> Version 6 is exactly like version 7, except it has an extra trailing
> column on favicons which was never used. The version-7 recovery code
> works for it, so long as the meta table is updated correctly.
>
> In writing this change, I realized that the meta table wasn't being
> created for recovered databases. Instead, SQLite was resolving to the
> corrupt.meta table. This works so long as the version doesn't change
> (next open will populate meta with kCurrentVersion). This change
> makes the table references absolute, and fixes the meta table setup.
>
> BUG=240396
> R=jar@chromium.org, pkotwicz@chromium.org, sky@chromium.org
>
> Review URL: https://codereview.chromium.org/25032004
TBR=shess@chromium.org
Review URL: https://codereview.chromium.org/27062003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@228260 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/metrics/histograms/histograms.xml | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml index 5221424..2b5b538 100644 --- a/tools/metrics/histograms/histograms.xml +++ b/tools/metrics/histograms/histograms.xml @@ -22580,12 +22580,6 @@ other types of suffix sets. <int value="15" label="RECOVERY_EVENT_FAILED_ICON_MAPPING_INSERT"> Failed to copy recovery icon_mapping table. </int> - <int value="16" label="RECOVERY_EVENT_RECOVERED_VERSION6"> - Successful recovery of version 6 database. - </int> - <int value="17" label="RECOVERY_EVENT_FAILED_META_INIT"> - Failed sql::MetaTable::Init(). - </int> </enum> <enum name="HttpAuthCount" type="int"> |