Remove a faulty ALWAYS() macro added by check-in [8fa254aa6329bdd0].

FossilOrigin-Name: fc47316e9b6b9f4c37cb7d3fe2af3f4dfb900fb5f07945dbf1239152a2d8f836

diff --git a/manifest b/manifest
index c0c0d8fa35abf209f822f7be9a29f2aed63338f2..65c8e5d2113daee4b85e830903c8bf3df33389ec 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sextra\stest\scase\sto\saltertab.test.
-D 2018-09-07T18:56:31.094
+C Remove\sa\sfaulty\sALWAYS()\smacro\sadded\sby\scheck-in\s[8fa254aa6329bdd0].
+D 2018-09-07T19:12:08.941
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 6b650013511fd9d8b094203ac268af9220d292cc7d4e1bc9fbca15aacd8c7995
@@ -435,7 +435,7 @@ F spec.template 86a4a43b99ebb3e75e6b9a735d5fd293a24e90ca
 F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
 F sqlite3.1 fc7ad8990fc8409983309bb80de8c811a7506786
 F sqlite3.pc.in 48fed132e7cb71ab676105d2a4dc77127d8c1f3a
-F src/alter.c eed847377bff46bc11af8b648a0c7197ca0975369a29938342e4feb5982d1db3
+F src/alter.c 54146be02c90ca8c29ecf2e072d48c799060c15acfae77aff562c0b42dfbd506
 F src/analyze.c 3dc6b98cf007b005af89df165c966baaa48e8124f38c87b4d2b276fe7f0b9eb9
 F src/attach.c 4bd5b92633671d3e8ce431153ebb1893b50335818423b5373f3f27969f79769a
 F src/auth.c 32a5bbe3b755169ab6c66311c5225a3cd4f75a46c041f7fb117e0cbb68055114
@@ -1764,7 +1764,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 8fa254aa6329bdd085b8e2c78d8e8a698b418eda8b2d48e0082dd9cd428cef29
-R 64dc45ed52ebaad7ddf657943c0fde7b
-U dan
-Z 4e7cd343e290d5ddec1d8e704624bad3
+P 64c3ee3c255e4630ccd5002116d66fd2af6b12dbdd4a3bee5ed413c3ef87d33a
+R 4e83b2bf06d92072eb37ddae910f0098
+U drh
+Z 1acddbf8bf46cc91a48e91ab1fd74796

diff --git a/manifest.uuid b/manifest.uuid
index e8da3e624adcd69b083830f65a0bdebcd7adea88..9bfffb61f01ead6fa4fb9ba81568971210d6719a 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-64c3ee3c255e4630ccd5002116d66fd2af6b12dbdd4a3bee5ed413c3ef87d33a
\ No newline at end of file
+fc47316e9b6b9f4c37cb7d3fe2af3f4dfb900fb5f07945dbf1239152a2d8f836
\ No newline at end of file

diff --git a/src/alter.c b/src/alter.c
index 5f8229fa1878209d030174ac6f5424616fee3dde..013257f905306702748330dafd4107ffa4232979 100644 (file)
--- a/src/alter.c
+++ b/src/alter.c
@@ -1539,7 +1539,7 @@ static void renameTableTest(
 
       else if( sParse.pNewTrigger ){
         rc = renameResolveTrigger(&sParse, bTemp ? 0 : zDb);
-        if( ALWAYS(rc==SQLITE_OK) ){
+        if( rc==SQLITE_OK ){
           int i1 = sqlite3SchemaToIndex(db, sParse.pNewTrigger->pTabSchema);
           int i2 = sqlite3FindDbName(db, zDb);
           if( i1==i2 ) sqlite3_result_int(context, 1);