mirrors/sqlite
mirrors/sqlite
0
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2024-11-29 00:12:23 +01:00
Code Releases Activity

Merge the Makefile.msc fix and the compiler warning fix from trunk. Also

Browse Source 
fix another compiler warning in sqlite3session_diff().

FossilOrigin-Name: 7530e1bf557083ef91447a02f05b019dbe60fa70
This commit is contained in:
drh 2015-05-19 23:04:26 +00:00
commit dbbd816059
5 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile.msc
View File

@ -1014,7 +1014,9 @@ SRC4 = \
$(TOP)\ext\rtree\rtree.h \
$(TOP)\ext\rtree\rtree.c \
$(TOP)\ext\session\sqlite3session.h \
$(TOP)\ext\session\sqlite3session.c
$(TOP)\ext\session\sqlite3session.c \
$(TOP)\ext\ota\sqlite3ota.h \
$(TOP)\ext\ota\sqlite3ota.c
# Generated source code files
@ -1075,7 +1077,8 @@ TESTSRC = \
$(TOP)\src\test_wsd.c \
$(TOP)\ext\fts3\fts3_term.c \
$(TOP)\ext\fts3\fts3_test.c \
$(TOP)\ext\session\test_session.c
$(TOP)\ext\session\test_session.c \
$(TOP)\ext\ota\test_ota.c
# Statically linked extensions
#

2
ext/fts3/fts3_snippet.c
View File

@ -131,7 +131,7 @@ struct StrBuffer {
static MatchinfoBuffer *fts3MIBufferNew(int nElem, const char *zMatchinfo){
MatchinfoBuffer *pRet;
int nByte = sizeof(u32) * (2*nElem + 2) + sizeof(MatchinfoBuffer);
int nStr = strlen(zMatchinfo);
int nStr = (int)strlen(zMatchinfo);
pRet = sqlite3_malloc(nByte + nStr+1);
if( pRet ){

2
ext/session/sqlite3session.c
View File

@ -1492,7 +1492,7 @@ int sqlite3session_diff(
}
}
sqlite3_free(azCol);
sqlite3_free((char*)azCol);
if( bMismatch ){
*pzErrMsg = sqlite3_mprintf("table schemas do not match");
rc = SQLITE_SCHEMA;

16
manifest
View File

@ -1,9 +1,9 @@
C Merge\srecent\strunk\schanges,\sinclude\sthe\sR-Tree\senhancement\sthat\sallows\n8-byte\sBLOB\sarguments\sto\sgeometry\sfunctions,\sand\sthe\sfix\sfor\sthe\sTEXT\saffinity\nproblem\sthat\scould\scause\scorrupt\sindexes.
D 2015-05-19T22:42:23.384
C Merge\sthe\sMakefile.msc\sfix\sand\sthe\scompiler\swarning\sfix\sfrom\strunk.\s\sAlso\nfix\sanother\scompiler\swarning\sin\ssqlite3session_diff().
D 2015-05-19T23:04:26.372
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in 66db4ec2c6cd63d0f3e29d366aaaab769aba175b
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
F Makefile.msc 3a41532fcdbd3ebd78cf8727d93f84cf35117361
F Makefile.msc ea72907f6c4b92181dd6dfca665253025705d85f
F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
F README.md 0bfccb18927349653c09137a458b961fa8ab4cb9
F VERSION ce0ae95abd7121c534f6917c1c8f2b70d9acd4db
@ -87,7 +87,7 @@ F ext/fts3/fts3_hash.c 29b986e43f4e9dd40110eafa377dc0d63c422c60
F ext/fts3/fts3_hash.h 39cf6874dc239d6b4e30479b1975fe5b22a3caaf
F ext/fts3/fts3_icu.c e319e108661147bcca8dd511cd562f33a1ba81b5
F ext/fts3/fts3_porter.c 3565faf04b626cddf85f03825e86056a4562c009
F ext/fts3/fts3_snippet.c b7aaa8698096b26e1c6eb563e317409323398142
F ext/fts3/fts3_snippet.c 97a16ea233106b83b84a7a1e821318ea333688f7
F ext/fts3/fts3_term.c 88c55a6fa1a51ab494e33dced0401a6c28791fd7
F ext/fts3/fts3_test.c 8a3a78c4458b2d7c631fcf4b152a5cd656fa7038
F ext/fts3/fts3_tokenize_vtab.c a27593ab19657166f6fa5ec073b678cc29a75860
@ -180,7 +180,7 @@ F ext/session/sessionC.test 3982f8577b0744c5ce3aaef7cfeb5bd903f17fe4
F ext/session/sessionD.test d4744c78334162851d2a2f285c7e603e31b49aa2
F ext/session/session_common.tcl 9de0451b6a47218fc16b9ed8876b6238a0a3d88d
F ext/session/sessionfault.test bef044d0952c0d62c31c8d2400be72c8684545cc
F ext/session/sqlite3session.c d961bfc5f4f4c4390b1f3c190096899b167ee2db
F ext/session/sqlite3session.c 9ccf68d542f4afc5dc14295d984bf37a7db6b936
F ext/session/sqlite3session.h 8e86f9eec3ed71f1f30eefbe810cbe5bc10b5aa9
F ext/session/test_session.c 187bd344c5ae9d5be85e22ef7c3010f0c17307ce
F ext/userauth/sqlite3userauth.h 19cb6f0e31316d0ee4afdfb7a85ef9da3333a220
@ -1297,7 +1297,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 4f9229445c293b39c80b2a662901f608c85b36ef b271ed56532a78323accc8a7cb348d55f95c350e
R 8a8bf6521434fdcdf694b65ab11c8823
P 0a0de8b72ca24f287f9c84766a14e12ea4564b59 c7b16645307d6e46c4153693d6806269de64955f
R 4c94d0a5b34d5dffef0e5fc7fa5c812a
U drh
Z 32cff82852bbec32d5276c785011fff4
Z 5fb8b92e45ad4729c65ff31de37671dd

2
manifest.uuid
View File

@ -1 +1 @@
0a0de8b72ca24f287f9c84766a14e12ea4564b59
7530e1bf557083ef91447a02f05b019dbe60fa70