Fix a 8-byte alignment problem in the query planner that might cause

problems on sparc when compiled with -m32.

FossilOrigin-Name: 5dcffa671f592ae9355628afa439ae9a2d26f0cd

diff --git a/manifest b/manifest
index e3da8a2f42fac8186fc8a23a88ea564f088a9d1d..7bd39ba9a8a6ed08a1954f729997121abf1b049e 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Documentation\schanges\sto\swarn\sthat\ssqlite3_set_auxdata()\smight\scall\sthe\ndestructor\seven\sbefore\sit\sreturns.\s\sAlso\sfix\sthe\sregexp\sextension\sto\sdeal\nwith\sthat\scase.\s\sTicket\s[406d3b2ef91c].
-D 2013-07-18T14:16:48.544
+C Fix\sa\s8-byte\salignment\sproblem\sin\sthe\squery\splanner\sthat\smight\scause\nproblems\son\ssparc\swhen\scompiled\swith\s-m32.
+D 2013-07-18T14:50:56.888
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -290,7 +290,7 @@ F src/vtab.c 2e8b489db47e20ae36cd247932dc671c9ded0624
 F src/wal.c 7dc3966ef98b74422267e7e6e46e07ff6c6eb1b4
 F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
 F src/walker.c 4fa43583d0a84b48f93b1e88f11adf2065be4e73
-F src/where.c 927acb798c66af64b5d640e50f0edfe07d6b4085
+F src/where.c 1a26c37b7b54d198e2ec9aa127d22c3dcfe89de8
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
 F test/aggnested.test 45c0201e28045ad38a530b5a144b73cd4aa2cfd6
@@ -1103,7 +1103,7 @@ F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/wherecosttest.c f407dc4c79786982a475261866a161cd007947ae
 F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
-P b1b0de29fdf7de83722bb85b748f058b9901e77a
-R 1373096ae79cc1001233efb4a308bce9
+P 7acc8cd32d593a473c9e9adaf323220a7a46480a
+R 17b8abd2c5b717cffa3f1d157b1c3142
 U drh
-Z 4c86c705c11f63416d538424aa7f228b
+Z 8aedb025f873aeef3a714ef3251c3e91

diff --git a/manifest.uuid b/manifest.uuid
index c3cee86f445c865c74024c260da2cd71ecfe9c86..fc61fbc2f7bd9c745663c4095b36ddf8a8efa875 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7acc8cd32d593a473c9e9adaf323220a7a46480a
\ No newline at end of file
+5dcffa671f592ae9355628afa439ae9a2d26f0cd
\ No newline at end of file

diff --git a/src/where.c b/src/where.c
index 75804782c2e1e44549069dcaab8dc9b8a679c8f5..d3182f80940ff2c7cb2cb59c77d6e282b7fe424d 100644 (file)
--- a/src/where.c
+++ b/src/where.c
@@ -5728,7 +5728,8 @@ WhereInfo *sqlite3WhereBegin(
   pMaskSet = &pWInfo->sMaskSet;
   sWLB.pWInfo = pWInfo;
   sWLB.pWC = &pWInfo->sWC;
-  sWLB.pNew = (WhereLoop*)&pWInfo->a[nTabList];
+  sWLB.pNew = (WhereLoop*)(((char*)pWInfo)+nByteWInfo);
+  assert( EIGHT_BYTE_ALIGNMENT(sWLB.pNew) );
   whereLoopInit(sWLB.pNew);
 #ifdef SQLITE_DEBUG
   sWLB.pNew->cId = '*';