Fix an 8-byte alignment problem on the "crash test" harness (test code,

not in the core) that causes problems on Sparc.

FossilOrigin-Name: bcbc65030fa7c61f94100142e94ba2a5774f85b0

diff --git a/manifest b/manifest
index 506d3c8ea6d8e45434f7cd091d359567705f8477..eb635e795a6361b458e9f7b9f9f4b3f3bbae8f21 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sharmless\smacro\sredefinition\swarnings\sin\sthe\stotype\sextension.
-D 2013-10-15T11:58:34.089
+C Fix\san\s8-byte\salignment\sproblem\son\sthe\s"crash\stest"\sharness\s(test\scode,\nnot\sin\sthe\score)\sthat\scauses\sproblems\son\sSparc.
+D 2013-10-15T14:29:32.229
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 0522b53cdc1fcfc18f3a98e0246add129136c654
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -233,7 +233,7 @@ F src/test2.c 7355101c085304b90024f2261e056cdff13c6c35
 F src/test3.c 1c0e5d6f080b8e33c1ce8b3078e7013fdbcd560c
 F src/test4.c 9b32d22f5f150abe23c1830e2057c4037c45b3df
 F src/test5.c a6d1ac55ac054d0b2b8f37b5e655b6c92645a013
-F src/test6.c a437f76f9874d2563352a7e6cd0d43217663c220
+F src/test6.c 00af0fe1947305222b8ed488a69c76c5a2b632e2
 F src/test7.c 126b886b53f0358b92aba9b81d3fcbfbe9a93cd6
 F src/test8.c c7aab1d9fbbf54fc33d43b73aa24aa55f9eaf534
 F src/test9.c bea1e8cf52aa93695487badedd6e1886c321ea60
@@ -1125,8 +1125,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
-P 73238f655a58c810876f46cc04eab1ac2d5b8ef7 a38adeb7ffd77474754b66877d60717cdb3cb865
-R 0fe1cba58471de6f4ef89edb477677c8
-T +closed a38adeb7ffd77474754b66877d60717cdb3cb865
+P c9c1f8d6701b0a1bc939a7e35e565d4160dbf8d3
+R 3bb2d5b093a82403e2bfb9d1fae23d90
 U drh
-Z b0e8951483d507d3c988ee6a91bfa255
+Z 4d64bb39b57c14de71d5cefa2c9bba0a

diff --git a/manifest.uuid b/manifest.uuid
index 558845bd83d67d18b5ce483b923892abf813571d..cff4731dc5f09d5235b27596f8e8350a1c88b9b0 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c9c1f8d6701b0a1bc939a7e35e565d4160dbf8d3
\ No newline at end of file
+bcbc65030fa7c61f94100142e94ba2a5774f85b0
\ No newline at end of file

diff --git a/src/test6.c b/src/test6.c
index c151ea42989b0be24ee4b9a4be378b4f636db641..2020885c461eb774bf52c2a5a25989afc2143788 100644 (file)
--- a/src/test6.c
+++ b/src/test6.c
@@ -133,9 +133,9 @@ struct CrashFile {
   ** OsFileSize() calls. Although both could be done by traversing the
   ** write-list, in practice this is impractically slow.
   */
-  int iSize;                           /* Size of file in bytes */
-  int nData;                           /* Size of buffer allocated at zData */
   u8 *zData;                           /* Buffer containing file contents */
+  int nData;                           /* Size of buffer allocated at zData */
+  i64 iSize;                           /* Size of file in bytes */
 };
 
 struct CrashGlobal {