[sqlite] Fix seperate-page-cache page merge issue.

[sqlite] Fix seperate-page-cache page merge issue.

The previous version set a local variable which was picked up by the
SQLite code to set the global.  SQLite stopped using that local
variable, I apparently didn't notice.

BUG=591962
Committed: https://crrev.com/32fefb99eaec8394ece520cea141c2b7a4fd1ef4
Cr-Commit-Position: refs/heads/master@{#380665}

[Scott Hess - ex-Googler, 2016-03-07 20:32:50]

shess@chromium.org changed reviewers:
+ glider@chromium.org

[Scott Hess - ex-Googler, 2016-03-07 20:32:51]

Was a dumb mistake in the SQLite import a couple months back.

[Scott Hess - ex-Googler, 2016-03-07 20:36:16]

On 2016/03/07 20:32:51, Scott Hess wrote:
> Was a dumb mistake in the SQLite import a couple months back.

Also - all three files are variants of the same change.  pcache1.c is easiest to
review.

[Scott Hess - ex-Googler, 2016-03-07 20:36:28]

The CQ bit was checked by shess@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2016-03-07 20:36:51]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1769213002/1
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1769213002/1

[commit-bot: I haz the power, 2016-03-07 22:14:55]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-03-07 22:14:56]

Dry run: This issue passed the CQ dry run.

[Alexander Potapenko, 2016-03-10 16:37:42]

https://codereview.chromium.org/1769213002/diff/1/third_party/sqlite/amalgama...
File third_party/sqlite/amalgamation/sqlite3.c (left):

https://codereview.chromium.org/1769213002/diff/1/third_party/sqlite/amalgama...
third_party/sqlite/amalgamation/sqlite3.c:42308: -  const int separateCache = 1;
Dumb question: this line didn't touch pcache1_g, how could it be related to
https://bugs.chromium.org/p/chromium/issues/detail?id=591962 ?

[Scott Hess - ex-Googler, 2016-03-10 16:56:45]

https://codereview.chromium.org/1769213002/diff/1/third_party/sqlite/amalgama...
File third_party/sqlite/amalgamation/sqlite3.c (left):

https://codereview.chromium.org/1769213002/diff/1/third_party/sqlite/amalgama...
third_party/sqlite/amalgamation/sqlite3.c:42308: -  const int separateCache = 1;
On 2016/03/10 16:37:42, Alexander Potapenko wrote:
> Dumb question: this line didn't touch pcache1_g, how could it be related to
> https://bugs.chromium.org/p/chromium/issues/detail?id=591962 ?

separate-cache means that each db connection has a local pcache so it doesn't
use the global.  Then the db-local mutex is sufficient.

[Alexander Potapenko, 2016-03-10 16:58:14]

On 2016/03/10 16:56:45, Scott Hess wrote:
>
https://codereview.chromium.org/1769213002/diff/1/third_party/sqlite/amalgama...
> File third_party/sqlite/amalgamation/sqlite3.c (left):
> 
>
https://codereview.chromium.org/1769213002/diff/1/third_party/sqlite/amalgama...
> third_party/sqlite/amalgamation/sqlite3.c:42308: -  const int separateCache =
1;
> On 2016/03/10 16:37:42, Alexander Potapenko wrote:
> > Dumb question: this line didn't touch pcache1_g, how could it be related to
> > https://bugs.chromium.org/p/chromium/issues/detail?id=591962 ?
> 
> separate-cache means that each db connection has a local pcache so it doesn't
> use the global.  Then the db-local mutex is sufficient.

Ok, thanks. LGTM

[Scott Hess - ex-Googler, 2016-03-10 17:49:33]

The CQ bit was checked by shess@chromium.org

[commit-bot: I haz the power, 2016-03-10 17:50:11]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1769213002/1
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1769213002/1

[commit-bot: I haz the power, 2016-03-10 19:42:35]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-03-10 19:42:36]

Try jobs failed on following builders:
  linux_chromium_asan_rel_ng on tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)

[Scott Hess - ex-Googler, 2016-03-10 20:09:17]

The CQ bit was checked by shess@chromium.org

[commit-bot: I haz the power, 2016-03-10 20:09:56]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1769213002/1
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1769213002/1

[commit-bot: I haz the power, 2016-03-10 21:34:33]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-03-10 21:34:34]

Try jobs failed on following builders:
  linux_chromium_asan_rel_ng on tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)

[Scott Hess - ex-Googler, 2016-03-10 21:45:58]

On 2016/03/10 21:34:34, commit-bot: I haz the power wrote:
> Try jobs failed on following builders:
>   linux_chromium_asan_rel_ng on tryserver.chromium.linux (JOB_FAILED,
>
http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)

This is confusing.  It's failing in "Compile", but looks like an exceptional
condition (the stdout is clean, looks like it ran to completion).  Maybe
http://crbug.com/590943 .

I'll give it one more try, then maybe go bug troopers or something.

[Scott Hess - ex-Googler, 2016-03-10 21:46:04]

The CQ bit was checked by shess@chromium.org

[commit-bot: I haz the power, 2016-03-10 21:46:46]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1769213002/1
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1769213002/1

[Scott Hess - ex-Googler, 2016-03-10 22:18:18]

On 2016/03/10 21:45:58, Scott Hess wrote:
> On 2016/03/10 21:34:34, commit-bot: I haz the power wrote:
> > Try jobs failed on following builders:
> >   linux_chromium_asan_rel_ng on tryserver.chromium.linux (JOB_FAILED,
> >
>
http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)
> 
> This is confusing.  It's failing in "Compile", but looks like an exceptional
> condition (the stdout is clean, looks like it ran to completion).  Maybe
> http://crbug.com/590943 .
> 
> I'll give it one more try, then maybe go bug troopers or something.

Could also be crbug.com/593891 .

[commit-bot: I haz the power, 2016-03-10 22:49:11]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-03-10 22:49:12]

Try jobs failed on following builders:
  linux_chromium_asan_rel_ng on tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)

[Scott Hess - ex-Googler, 2016-03-10 23:37:07]

The CQ bit was checked by shess@chromium.org

[commit-bot: I haz the power, 2016-03-10 23:37:36]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1769213002/1
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1769213002/1

[commit-bot: I haz the power, 2016-03-11 00:59:01]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-03-11 00:59:02]

Try jobs failed on following builders:
  linux_chromium_asan_rel_ng on tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)

[Scott Hess - ex-Googler, 2016-03-11 17:02:29]

The CQ bit was checked by shess@chromium.org

[commit-bot: I haz the power, 2016-03-11 17:02:55]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1769213002/1
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1769213002/1

[commit-bot: I haz the power, 2016-03-11 17:49:28]

Committed patchset #1 (id:1)

[commit-bot: I haz the power, 2016-03-11 17:50:35]

Description was changed from

==========
[sqlite] Fix seperate-page-cache page merge issue.

The previous version set a local variable which was picked up by the
SQLite code to set the global.  SQLite stopped using that local
variable, I apparently didn't notice.

BUG=591962
==========

to

==========
[sqlite] Fix seperate-page-cache page merge issue.

The previous version set a local variable which was picked up by the
SQLite code to set the global.  SQLite stopped using that local
variable, I apparently didn't notice.

BUG=591962

Committed: https://crrev.com/32fefb99eaec8394ece520cea141c2b7a4fd1ef4
Cr-Commit-Position: refs/heads/master@{#380665}
==========

[commit-bot: I haz the power, 2016-03-11 17:50:36]

Patchset 1 (id:??) landed as
https://crrev.com/32fefb99eaec8394ece520cea141c2b7a4fd1ef4
Cr-Commit-Position: refs/heads/master@{#380665}