database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-06 15:49:35 +03:00
Code Activity

In the shell tool, avoid testing if (sqlite3_vfs.xGetCurrentInt64) is NULL for a version 1 VFS. This field is only defined for version 2 and greater.

Browse Source 
FossilOrigin-Name: ad5fcaa583ef743d143b6c030e0d78019709fe71
This commit is contained in:
dan
2015-11-16 08:54:10 +00:00
parent f7ee8965a5
commit 3fd415b2bf
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
manifest
View File

@@ -1,5 +1,5 @@
C Fix\sthe\scolumn\sname\suniquifier\sso\sthat\sit\sworks\swith\szero-length\scolumn\snames. C In\sthe\sshell\stool,\savoid\stesting\sif\s(sqlite3_vfs.xGetCurrentInt64)\sis\sNULL\sfor\sa\sversion\s1\sVFS.\sThis\sfield\sis\sonly\sdefined\sfor\sversion\s2\sand\sgreater.
D 2015-11-15T11:13:49.647 D 2015-11-16T08:54:10.841
F Makefile.in d828db6afa6c1fa060d01e33e4674408df1942a1 F Makefile.in d828db6afa6c1fa060d01e33e4674408df1942a1
F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
F Makefile.msc e928e68168df69b353300ac87c10105206653a03 F Makefile.msc e928e68168df69b353300ac87c10105206653a03
@@ -340,7 +340,7 @@ F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
F src/resolve.c 1954a0f01bf65d78d7d559aea3d5c67f33376d91 F src/resolve.c 1954a0f01bf65d78d7d559aea3d5c67f33376d91
F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
F src/select.c 4c58ae319df6862e5ea237e757b5d317c4491798 F src/select.c 4c58ae319df6862e5ea237e757b5d317c4491798
F src/shell.c acefb4593a9bf0338a757c968f1f1bb05690d830 F src/shell.c 0092cd4e1da5322b7bc35bedbec1f0dea627451e
F src/sqlite.h.in fa62718f73553f06b2f2e362fd09ccb4e1cbb626 F src/sqlite.h.in fa62718f73553f06b2f2e362fd09ccb4e1cbb626
F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
F src/sqlite3ext.h 4b66e3e3435da4b4c8c83696d0349f0c503b3924 F src/sqlite3ext.h 4b66e3e3435da4b4c8c83696d0349f0c503b3924
@@ -1403,7 +1403,7 @@ F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f
F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
P 9272426057b6cb2d913519ff4c97aa6e211f7d51 P 791761ebac26c82ab67bdf867117ec5b5d8b20b0
R a974c67769be53d36ddc37d671cc0607 R a635725b446415a63ce3c96185f06f0a
U drh U dan
Z f40155003991429935f69f917db4e724 Z ecc9df21b64c8edc0682f60d01379dbf

2
manifest.uuid
View File

@@ -1 +1 @@
791761ebac26c82ab67bdf867117ec5b5d8b20b0 ad5fcaa583ef743d143b6c030e0d78019709fe71

2
src/shell.c
View File

@@ -165,7 +165,7 @@ static sqlite3_int64 timeOfDay(void){
static sqlite3_vfs *clockVfs = 0; static sqlite3_vfs *clockVfs = 0;
sqlite3_int64 t; sqlite3_int64 t;
if( clockVfs==0 ) clockVfs = sqlite3_vfs_find(0); if( clockVfs==0 ) clockVfs = sqlite3_vfs_find(0);
if( clockVfs->iVersion>=1 && clockVfs->xCurrentTimeInt64!=0 ){ if( clockVfs->iVersion>=2 && clockVfs->xCurrentTimeInt64!=0 ){
clockVfs->xCurrentTimeInt64(clockVfs, &t); clockVfs->xCurrentTimeInt64(clockVfs, &t);
}else{ }else{
double r; double r;