From: drh <drh@noemail.net>
Date: Tue, 28 Jan 2020 15:02:23 +0000 (+0000)
Subject: Minor change for compatibility with the s390 architecture.
X-Git-Tag: version-3.32.0~194
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b9f2e5f7774cee2282c2b0980bc29233e643200f;p=thirdparty%2Fsqlite.git

Minor change for compatibility with the s390 architecture.

FossilOrigin-Name: 04885763c4cd00cbca26d048f2b19316bfc93e8edebeceaa171ebfc6c563d53e
---

diff --git a/manifest b/manifest
index cab43f3b0f..b4f40aaa47 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Version\s3.31.1
-D 2020-01-27T19:55:54.490
+C Minor\schange\sfor\scompatibility\swith\sthe\ss390\sarchitecture.
+D 2020-01-28T15:02:23.155
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -492,7 +492,7 @@ F src/hash.c 8d7dda241d0ebdafb6ffdeda3149a412d7df75102cecfc1021c98d6219823b19
 F src/hash.h 9d56a9079d523b648774c1784b74b89bd93fac7b365210157482e4319a468f38
 F src/hwtime.h cb1d7e3e1ed94b7aa6fde95ae2c2daccc3df826be26fc9ed7fd90d1750ae6144
 F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
-F src/insert.c 2fe4d7f67078a68650f16e4efe73207899e21702e6b9d2e8ad1894c76dcad352
+F src/insert.c 2d130e0480cff4c20946c932fcf0cbf97e52b200c22c7f4f51b47b739994ffe5
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c 8cd803f1747c03a50b32fe87ebfb5851998d0cdafefe02737daa95e0616b42bb
 F src/main.c ffaa1308ee8ad7cf70bddc9a9fe2d2d66799e534b12ec876562d26a33a30d745
@@ -1857,10 +1857,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 6fb9a8fb85486a8fccc462856316ef523450c23a7a7a81c8dfb323fbe809f8f5
-R bf075f6bcc1758c5c1ecd13052997456
-T +bgcolor * #d0c0ff
-T +sym-release *
-T +sym-version-3.31.1 *
+P 3bfa9cc97da10598521b342961df8f5f68c7388fa117345eeb516eaa837bb4d6
+R a9668429122bc65557ad9003c632d2ea
 U drh
-Z 7c50801eed3eaef969e028ef5a0a641a
+Z 4ecf0af80de5faa351ede71e45a4f9b0
diff --git a/manifest.uuid b/manifest.uuid
index e7395de79b..bb3cc48fe4 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-3bfa9cc97da10598521b342961df8f5f68c7388fa117345eeb516eaa837bb4d6
\ No newline at end of file
+04885763c4cd00cbca26d048f2b19316bfc93e8edebeceaa171ebfc6c563d53e
\ No newline at end of file
diff --git a/src/insert.c b/src/insert.c
index 93f22a8cbf..7a04b98d8d 100644
--- a/src/insert.c
+++ b/src/insert.c
@@ -2170,12 +2170,14 @@ void sqlite3GenerateConstraintChecks(
             x = *sqlite3VdbeGetOp(v, addrConflictCk);
             if( x.opcode!=OP_IdxRowid ){
               int p2;      /* New P2 value for copied conflict check opcode */
+              const char *zP4;
               if( sqlite3OpcodeProperty[x.opcode]&OPFLG_JUMP ){
                 p2 = lblRecheckOk;
               }else{
                 p2 = x.p2;
               }
-              sqlite3VdbeAddOp4(v, x.opcode, x.p1, p2, x.p3, x.p4.z, x.p4type);
+              zP4 = x.p4type==P4_INT32 ? SQLITE_INT_TO_PTR(x.p4.i) : x.p4.z;
+              sqlite3VdbeAddOp4(v, x.opcode, x.p1, p2, x.p3, zP4, x.p4type);
               sqlite3VdbeChangeP5(v, x.p5);
               VdbeCoverageIf(v, p2!=x.p2);
             }