mirrors
/
sqlite
mirror of https://github.com/sqlite/sqlite
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Do not use deprecated interfaces internally when compiling with 

SQLITE_OMIT_DEPRECATED.  Ticket #3813. (CVS 6523)

FossilOrigin-Name: 7f17956dfbf3090fd5832378e77bd83a525fed9d
This commit is contained in:
drh 2009-04-20 12:07:37 +00:00
parent 59813953a3
commit d54a79118a
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
manifest
View File

@ -1,5 +1,5 @@
C Speed\simprovements\sby\savoiding\sunnecessary\scalls\sto\sfstat()\sand\sftruncate().\s(CVS\s6522)
D 2009-04-20T11:34:27
C Do\snot\suse\sdeprecated\sinterfaces\sinternally\swhen\scompiling\swith\nSQLITE_OMIT_DEPRECATED.\s\sTicket\s#3813.\s(CVS\s6523)
D 2009-04-20T12:07:37
F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
F Makefile.in 583e87706abc3026960ed759aff6371faf84c211
F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@ -113,7 +113,7 @@ F src/date.c d327ec7bb2f64b08d32b1035de82b9ba8675de91
F src/delete.c eb1066b2f35489fee46ad765d2b66386fc7d8adf
F src/expr.c ccc5b5fa3bac249a9ab6e5e10629d77ff293c9f8
F src/fault.c dc88c821842157460750d2d61a8a8b4197d047ff
F src/func.c ac12ea20d1087b99b8806d380914fd0cbb985c06
F src/func.c f667fe886309707c7178542073bb0ced00a9fae7
F src/global.c 448419c44ce0701104c2121b0e06919b44514c0c
F src/hash.c 5824e6ff7ba78cd34c8d6cd724367713583e5b55
F src/hash.h 28f38ebb1006a5beedcb013bcdfe31befe7437ae
@ -717,7 +717,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
P bd860184909b7a9cc32c59770ebcee0efdc491f0
R 54bee78449bd233f2681af75ee3baa1f
P 5b7e3a411a6f2fe296675de9467783f6625cff3f
R b93f23b1bc29eb1388ee55dd1eabaa8e
U drh
Z e4faa13a740c6f189e281ee604da4368
Z 02de5aee0f87b72f80cd324f38725634

2
manifest.uuid
View File

@ -1 +1 @@
5b7e3a411a6f2fe296675de9467783f6625cff3f
7f17956dfbf3090fd5832378e77bd83a525fed9d

10
src/func.c
View File

@ -16,7 +16,7 @@
** sqliteRegisterBuildinFunctions() found at the bottom of the file.
** All other code has file scope.
**
** $Id: func.c,v 1.233 2009/04/15 15:16:53 drh Exp $
** $Id: func.c,v 1.234 2009/04/20 12:07:37 drh Exp $
*/
#include "sqliteInt.h"
#include <stdlib.h>
@ -1260,9 +1260,15 @@ static void groupConcatStep(
if( pAccum ){
sqlite3 *db = sqlite3_context_db_handle(context);
int n;
pAccum->useMalloc = 1;
pAccum->mxAlloc = db->aLimit[SQLITE_LIMIT_LENGTH];
if( sqlite3_aggregate_count(context)>1 ){
#ifdef SQLITE_OMIT_DEPRECATED
n = context->pMem->n;
#else
n = sqlite3_aggregate_count(context);
#endif
if( n>1 ){
if( argc==2 ){
zSep = (char*)sqlite3_value_text(argv[1]);
nSep = sqlite3_value_bytes(argv[1]);