Fix the encoding of some integers to use the minimum amount of space:

-128, -32768, -8388608, -217483648, and -140737488355328.

FossilOrigin-Name: 2d7c8da5f16e64eaa7b0c2d66898682ea3d102a0

diff --git a/manifest b/manifest
index 065eb19989499c6fcc05dafbdf2cc5ad923ef0d8..fe5a6d1bb4bc140bcdb2349a61afd10ec91e3736 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\ssome\srequirements\smarks\sto\sthe\srecord\sformatting\slogic.\s\sComment\schanges\nonly\s-\sthe\scode\sis\sunaltered.
-D 2014-11-20T02:18:14.206
+C Fix\sthe\sencoding\sof\ssome\sintegers\sto\suse\sthe\sminimum\samount\sof\sspace:\n-128,\s-32768,\s-8388608,\s-217483648,\sand\s-140737488355328.
+D 2014-11-20T02:58:10.344
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in a226317fdf3f4c895fb3cfedc355b4d0868ce1fb
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -295,7 +295,7 @@ F src/vdbe.c ec1f55acef4864520ca2017b9f0d60c2ac1b8b78
 F src/vdbe.h 6fc69d9c5e146302c56e163cb4b31d1ee64a18c3
 F src/vdbeInt.h 9bb69ff2447c34b6ccc58b34ec35b615f86ead78
 F src/vdbeapi.c 07acb615d1e4170e71fc1b0d087f3c53a1ad8e83
-F src/vdbeaux.c e3ae27459a4eb986d2892de2d7f309d18c9971ef
+F src/vdbeaux.c 5ce4f414147a3bc3cbcf00ec57f2606c25791629
 F src/vdbeblob.c 4af4bfb71f6df7778397b4a0ebc1879793276778
 F src/vdbemem.c 31d8eabb0cd78bfeab4e5124c7363c3e9e54db9f
 F src/vdbesort.c 87f3923483113d1c95d84640becb4e4946f27d9a
@@ -1221,7 +1221,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 6d00bcca6ed1903fb17275752cab71c14392355b
-R b487443c841a5e8e1bfed86b80cd7f65
+P 9a9627e178a67bbfc85366aaea900e674d22fb53
+R acb3727f628d804856a9646910d389b3
 U drh
-Z bbc37d068b0ef41277590cc500b3cc54
+Z ae13a50368fe7d7b53b7e4276c8588bd

diff --git a/manifest.uuid b/manifest.uuid
index a704e79b380d91f36418d3651aafcb7243d15ff0..1ae875991f0e8d3e96780088e4e41f070687a7d7 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9a9627e178a67bbfc85366aaea900e674d22fb53
\ No newline at end of file
+2d7c8da5f16e64eaa7b0c2d66898682ea3d102a0
\ No newline at end of file

diff --git a/src/vdbeaux.c b/src/vdbeaux.c
index 145bf453ad1383901958f640961ea46f78c59bd1..b8f5bca2c30689cbc4497f7591f68ca57b0f5384 100644 (file)
--- a/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@ -2883,9 +2883,7 @@ u32 sqlite3VdbeSerialType(Mem *pMem, int file_format){
     i64 i = pMem->u.i;
     u64 u;
     if( i<0 ){
-      if( i<(-MAX_6BYTE) ) return 6;
-      /* Previous test prevents:  u = -(-9223372036854775808) */
-      u = -i;
+      u = ~i;
     }else{
       u = i;
     }