mirrors/sqlite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make the sqlite3_result_double() interface work the same as

Browse Source 
sqlite3_result_int64() when SQLITE_OMIT_FLOATING_POINT is defined.

FossilOrigin-Name: 61df5986600b6c9e6d5c42efc0067a27fe54251f
This commit is contained in:
drh 2010-01-13 00:04:13 +00:00
parent 6a9c64b363
commit 7ec5ea942e
4 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
manifest
View File

@ -1,8 +1,8 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
C Make\ssure\sinternal\squeries\sare\swell\sordered,\seven\swhen\sthe\s\nreverse_unordered_selects\spragma\sis\sin\seffect.\nTicket\s[eb942c64a157].
D 2010-01-12T23:54:15
C Make\sthe\ssqlite3_result_double()\sinterface\swork\sthe\ssame\sas\nsqlite3_result_int64()\swhen\sSQLITE_OMIT_FLOATING_POINT\sis\sdefined.
D 2010-01-13T00:04:14
F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
F Makefile.in c5827ead754ab32b9585487177c93bb00b9497b3
F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@ -214,11 +214,11 @@ F src/util.c ad4f03079ba0fe83590d1cc9197e8e4844e38592
F src/vacuum.c 28ee5a4963d16cf2477075d85966c0f461cd79de
F src/vdbe.c 1e2c66f2612275a26e156889ec123e8e13c4821d
F src/vdbe.h bea1f0cd530775bdb58a340265f3cf3ee920e9b2
F src/vdbeInt.h d7ea821ac7813c9bea0fe87558c35e07b2c7c44d
F src/vdbeInt.h e276691b6835da5c0008cc5beaaecedcd7bdba8e
F src/vdbeapi.c fc3787eb2f5487d4cc3444de42d56f2e39d311f5
F src/vdbeaux.c 2e4a421bd3771ecd3b6c9a1c7abc7270a787a01b
F src/vdbeblob.c 84f924700a7a889152aeebef77ca5f4e3875ffb4
F src/vdbemem.c 1e16e3a16e55f4c3452834f0e041726021aa66e0
F src/vdbemem.c a0fa68734dfc2692f5dee4968def1981e34f3549
F src/vdbetrace.c 864cef96919323482ebd9986f2132435115e9cc2
F src/vtab.c 7c7713d66cda699f16bf1cc601d8d4f5070ab935
F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f
@ -788,14 +788,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
P eb98265b59db59965b468a7070739921da55efc4
R ed4967f5e7e47f15b9f1daec9413d761
P 0209f17180065d9c213b6c437be1c3c40660665f
R cf91a5f9af46740c8cb7efa5ec1af48a
U drh
Z 07b5603b06b78d336c9358d46fc99880
Z 97e81790c76e29bd9114b4c586f71151
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
iD8DBQFLTQuqoxKgR168RlERAkKNAJ4qC7gYLFTHRR/AwFe8MLPwRiJ4+gCfSKF2
WfQSwlim3QhCopfECpNmEtA=
=Ri4P
iD8DBQFLTQ4CoxKgR168RlERAjaGAJ9a3rhtgM5CkbPdrrYtI7H7xDIdgQCcD1xr
TRvM1K3kFoXXPzKKn3+X1RM=
=KiNC
-----END PGP SIGNATURE-----

2
manifest.uuid
View File

@ -1 +1 @@
0209f17180065d9c213b6c437be1c3c40660665f
61df5986600b6c9e6d5c42efc0067a27fe54251f

6
src/vdbeInt.h
View File

@ -362,7 +362,11 @@ void sqlite3VdbeMemMove(Mem*, Mem*);
int sqlite3VdbeMemNulTerminate(Mem*);
int sqlite3VdbeMemSetStr(Mem*, const char*, int, u8, void(*)(void*));
void sqlite3VdbeMemSetInt64(Mem*, i64);
void sqlite3VdbeMemSetDouble(Mem*, double);
#ifdef SQLITE_OMIT_FLOATING_POINT
# define sqlite3VdbeMemSetDouble sqlite3VdbeMemSetInt64
#else
void sqlite3VdbeMemSetDouble(Mem*, double);
#endif
void sqlite3VdbeMemSetNull(Mem*);
void sqlite3VdbeMemSetZeroBlob(Mem*,int);
void sqlite3VdbeMemSetRowSet(Mem*);

2
src/vdbemem.c
View File

@ -529,6 +529,7 @@ void sqlite3VdbeMemSetInt64(Mem *pMem, i64 val){
pMem->type = SQLITE_INTEGER;
}
#ifndef SQLITE_OMIT_FLOATING_POINT
/*
** Delete any previous value and set the value stored in *pMem to val,
** manifest type REAL.
@ -543,6 +544,7 @@ void sqlite3VdbeMemSetDouble(Mem *pMem, double val){
pMem->type = SQLITE_FLOAT;
}
}
#endif
/*
** Delete any previous value and set the value of pMem to be an