From: drh Date: Mon, 14 Nov 2011 03:00:28 +0000 (+0000) Subject: Forward port the 8-byte alignment fix from branch-3.7.9. X-Git-Tag: mountain-lion~9^2~24 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3f5b98df177b795ecb46325e3cdea420c2da1f59;p=thirdparty%2Fsqlite.git Forward port the 8-byte alignment fix from branch-3.7.9. FossilOrigin-Name: ebf6eb6ed756c0a3158b4cb5fb4b460c79d93c29 --- 3f5b98df177b795ecb46325e3cdea420c2da1f59 diff --cc manifest index 61a9274c37,0127e99098..e602249bda --- a/manifest +++ b/manifest @@@ -1,7 -1,7 +1,7 @@@ - C Remove\sa\scouple\sof\sincorrect\sassert\sstatements\sso\sthat\sthe\stest\ssuite\swill\nrun\swith\s-DSQLITE_DEFAULT_CACHE_SIZE=0. - D 2011-11-12T16:46:55.610 -C Fix\sa\s8-byte\salignment\sproblem\sthat\scauses\sa\sSIGBUS\son\sSparc. -D 2011-11-14T02:53:54.950 ++C Forward\sport\sthe\s8-byte\salignment\sfix\sfrom\sbranch-3.7.9. ++D 2011-11-14T03:00:28.076 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f -F Makefile.in a162fe39e249b8ed4a65ee947c30152786cfe897 +F Makefile.in 5b4a3e12a850b021547e43daf886b25133b44c07 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 F Makefile.msc dcad80fa69f17d46fe6778ba873fc108ca16298d F Makefile.vxworks 1deb39c8bb047296c30161ffa10c1b5423e632f9 @@@ -125,10 -125,10 +125,10 @@@ F src/auth.c 523da7fb4979469955d822ff92 F src/backup.c 4368158da74d4711888e03264105c5c527d76caf F src/bitvec.c af50f1c8c0ff54d6bdb7a80e2fceca5a93670bef F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7 -F src/btree.c 32199e2d939233ade25340eaba450f818b37c079 +F src/btree.c 80ea65224512884bb72976c93810d2dcaecc1353 F src/btree.h f5d775cd6cfc7ac32a2535b70e8d2af48ef5f2ce -F src/btreeInt.h 67978c014fa4f7cc874032dd3aacadd8db656bc3 +F src/btreeInt.h ea863a819224d3e6845ad1e39954d41558b8cd8b - F src/build.c 8af67a08a852ff4c63701963cb1ab7166f577814 + F src/build.c 8915bb6d72ead998f94c2756ea8d143c77709b70 F src/callback.c 0425c6320730e6d3981acfb9202c1bed9016ad1a F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac F src/ctime.c a9c26822515f81ec21588cbb482ca6724be02e33 @@@ -974,7 -974,10 +974,7 @@@ F tool/tostr.awk e75472c2f98dd76e06b8c9 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381 - P c1fab9aca1fe1dda2b4c7e4fdc0a406998847bdb - R 9f74f7e0555602e5901be80ed362f860 -P c7c6050ef060877ebe77b41d959e9df13f8c9b5e -R ff6342b74061a33cbd4fa1292ca6bba4 -T *branch * branch-3.7.9 -T *sym-branch-3.7.9 * -T -sym-trunk * ++P 87614b62ace530761e0e1170ec5840b212735ec6 54cc11981127b52145e39f551d958580b1d45169 ++R d0f4fbb7a87678b75d0d31293b56ed61 U drh - Z 60452ea200640726cdeacf2996a4fa41 -Z d03af58daca88e6314e5ea39548757b9 ++Z 9316f0b6f55795050abf35dbc6e7bbba diff --cc manifest.uuid index d0c247ea6f,2723e4eb4e..c1553fe64a --- a/manifest.uuid +++ b/manifest.uuid @@@ -1,1 -1,1 +1,1 @@@ - 87614b62ace530761e0e1170ec5840b212735ec6 -54cc11981127b52145e39f551d958580b1d45169 ++ebf6eb6ed756c0a3158b4cb5fb4b460c79d93c29