From: dan <dan@noemail.net>
Date: Sat, 1 Sep 2018 16:13:41 +0000 (+0000)
Subject: Merge alter-table-rename-table back into this branch.
X-Git-Tag: version-3.25.0~39^2~12
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ffc7e91f4f38658564618588f17435f46241f155;p=thirdparty%2Fsqlite.git

Merge alter-table-rename-table back into this branch.

FossilOrigin-Name: ad704a7c86c9ee51c1eb696007660cb9044bba6a8c588a33a8bd66613c231421
---

ffc7e91f4f38658564618588f17435f46241f155
diff --cc manifest
index d12fdc6e98,24953bad43..6d179d615f
--- a/manifest
+++ b/manifest
@@@ -1,11 -1,11 +1,11 @@@
- C Fix\sa\sminor\sissue\sin\sthe\saltercol.test\sscript\sso\sthat\sit\sruns\son\sWindows.
- D 2018-08-25T16:22:33.294
 -C Have\s"ALTER\sTABLE\sADD\sCOLUMN"\sreload\sthe\sentire\sdb\sschema,\sas\s"RENAME\sCOLUMN"\nand\s"RENAME\sTABLE"\sdo.
 -D 2018-09-01T16:05:50.207
++C Merge\salter-table-rename-table\sback\sinto\sthis\sbranch.
++D 2018-09-01T16:13:41.035
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
- F Makefile.in 2729786d5d188974913f07ea63cc84cd42cb9cac5f4aac823c40105e68e22f63
+ F Makefile.in 6b650013511fd9d8b094203ac268af9220d292cc7d4e1bc9fbca15aacd8c7995
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc 2e6eec0444dd80730b678b009cbe7fb9382dc3c5e8f45f554730203678cdd782
- F README.md 7764d56778d567913ef11c82da9ab94aefa0826f7c243351e4e2d7adaef6f373
+ F Makefile.msc d37bb24f0910744b555d77bea3d2f31e412caaf0c8ac6ec76a3d312cb3cf52ce
+ F README.md 377233394b905d3b2e2b33741289e093bc93f2e7adbe00923b2c5958c9a9edee
  F VERSION d3e3afdec1165a5e593dcdfffd8e0f33a2b0186067eb51a073ef6c4aec34923d
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
@@@ -1758,7 -1762,7 +1762,8 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P fc293bcb3402f049fb9e22aacfb4fdcd13f8609edf29c97d6cb95ce351363873
- R 64ddfe692b05307d9b72b37e625688a1
- U drh
- Z 7ccfe8689358cb4f8c05a477c50e8895
 -P 22e785aa2bbce4ae0852bc3d127d4b12222a192eb6e3ee874bf8e5c8582d05f3
++P 62089c6daf9ea51be769c077c23d6fa881ba797255fa22d71baaac191a9c1ba7 8d89ddc1a628e983b0fbd929c9c9daac86ee23d18f8dd2709c971012389395c6
+ R 42f4b64c172a70e76760a08e4b49df2d
++T +closed 8d89ddc1a628e983b0fbd929c9c9daac86ee23d18f8dd2709c971012389395c6
+ U dan
 -Z ba4dbce73bee530c5bae5beba6a96209
++Z c4c5a271b15dcfdf4ff4a8b2fd0b81e3
diff --cc manifest.uuid
index b3366e12eb,f403436ba1..e74227c174
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 62089c6daf9ea51be769c077c23d6fa881ba797255fa22d71baaac191a9c1ba7
 -8d89ddc1a628e983b0fbd929c9c9daac86ee23d18f8dd2709c971012389395c6
++ad704a7c86c9ee51c1eb696007660cb9044bba6a8c588a33a8bd66613c231421