SQLite's recover.c should be valid C code

SQLite's recover.c should be valid C code

Move two variable declarations to the top of their function, so
Chromium's version of SQLite compiles on Windows. SQLite is used
by NSS on Dart's standalone Windows executable.

NOTRY=true
This is not based on src/, and is not tested until DEPS are updated.

This patch is not added to recover.patch, because the last 3 patches,
including the one this fixes, are not there, and recover.patch says:
    Since recover.c is in somewhat active development, it is possible that
    the patch below will not reliably re-create the file.

Committed: https://crrev.com/9cc182c2e432c0466b441e8e14a7a5bb956ec492
Cr-Commit-Position: refs/heads/master@{#295260}

[Bill Hesse, 2014-09-16 09:13:23]

whesse@google.com changed reviewers:
+ michaeln@chromium.org

[Bill Hesse, 2014-09-16 09:13:24]

We need this fix in order to update Dart's NSS version to the current Chromium
version.

[michaeln, 2014-09-16 22:15:32]

lgtm

[Bill Hesse, 2014-09-17 06:48:33]

The CQ bit was checked by whesse@google.com

[commit-bot: I haz the power, 2014-09-17 06:49:45]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patchset/552673003/1

[commit-bot: I haz the power, 2014-09-17 06:52:51]

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

[commit-bot: I haz the power, 2014-09-17 06:52:52]

Try jobs failed on following builders:
  mac_gpu on tryserver.chromium.gpu
(http://build.chromium.org/p/tryserver.chromium.gpu/builders/mac_gpu/builds/56992)
  win_chromium_compile_dbg on tryserver.chromium.win
(http://build.chromium.org/p/tryserver.chromium.win/builders/win_chromium_comp...)
  win_chromium_x64_rel_swarming on tryserver.chromium.win
(http://build.chromium.org/p/tryserver.chromium.win/builders/win_chromium_x64_...)

[agable, 2014-09-17 11:51:31]

On 2014/09/17 06:52:52, I haz the power (commit-bot) wrote:
> Try jobs failed on following builders:
>   mac_gpu on tryserver.chromium.gpu
>
(http://build.chromium.org/p/tryserver.chromium.gpu/builders/mac_gpu/builds/56992)
>   win_chromium_compile_dbg on tryserver.chromium.win
>
(http://build.chromium.org/p/tryserver.chromium.win/builders/win_chromium_comp...)
>   win_chromium_x64_rel_swarming on tryserver.chromium.win
>
(http://build.chromium.org/p/tryserver.chromium.win/builders/win_chromium_x64_...)

These tryjobs won't work. This is for a change to src/third_party/sqlite, not a
change to src.git itself. The correct way to do this is to land this change
directly (running whatever tests the sqlite repo has configured for itself), and
then upload a DEPS roll in src.git pointing to this new commit. That DEPS roll
will be able to go through all the trybots just fine.

[Bill Hesse, 2014-09-17 12:51:34]

The CQ bit was checked by whesse@google.com

[commit-bot: I haz the power, 2014-09-17 12:51:49]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patchset/552673003/1

[commit-bot: I haz the power, 2014-09-17 12:53:40]

Committed patchset #1 (id:1) as c35ed28c6725bd2581e6e024d414d67ff5a28cb4

[commit-bot: I haz the power, 2014-09-17 12:54:17]

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

[chromium-reviews, 2014-09-17 14:02:17]

agable said:
The correct way to do this is to land this change
directly (running whatever tests the sqlite repo has configured for
itself), and
then upload a DEPS roll in src.git pointing to this new commit. That DEPS
roll
will be able to go through all the trybots just fine.I don't see what DEPS
entry is pointing to chromium/src/third_party/sqlite.  It seems to me that
this is checked out as part of chromium/src, since it is in that repo.
Other things in src/third_party are checkouts from
chromium/deps/third_party, controlled by DEPS, such as src/third_party/nss.

Is there something I am missing, or is sqlite not pinned, and therefore
changes to it take effect immediately?  If so, maybe I should not have
committed with NOTRY=true, but fixed the base to be chromium/src, and tried
again.


On Wed, Sep 17, 2014 at 1:51 PM, <agable@chromium.org> wrote:

> On 2014/09/17 06:52:52, I haz the power (commit-bot) wrote:
>
>> Try jobs failed on following builders:
>>    mac_gpu on tryserver.chromium.gpu
>>
>
> (http://build.chromium.org/p/tryserver.chromium.gpu/
> builders/mac_gpu/builds/56992)
>
>>    win_chromium_compile_dbg on tryserver.chromium.win
>>
>
> (http://build.chromium.org/p/tryserver.chromium.win/
> builders/win_chromium_compile_dbg/builds/16300)
>
>>    win_chromium_x64_rel_swarming on tryserver.chromium.win
>>
>
> (http://build.chromium.org/p/tryserver.chromium.win/
> builders/win_chromium_x64_rel_swarming/builds/10281)
>
> These tryjobs won't work. This is for a change to src/third_party/sqlite,
> not a
> change to src.git itself. The correct way to do this is to land this change
> directly (running whatever tests the sqlite repo has configured for
> itself), and
> then upload a DEPS roll in src.git pointing to this new commit. That DEPS
> roll
> will be able to go through all the trybots just fine.
>
> https://codereview.chromium.org/552673003/
>



-- 
William Hesse

To unsubscribe from this group and stop receiving emails from it, send an email
to chromium-reviews+unsubscribe@chromium.org.