From: drh <drh@noemail.net>
Date: Wed, 9 Dec 2015 16:04:06 +0000 (+0000)
Subject: Merge unrelated fixes from trunk.
X-Git-Tag: version-3.10.0~44^2~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ee3b7a27673d744f4cd954ff992f53c4c7f157ee;p=thirdparty%2Fsqlite.git

Merge unrelated fixes from trunk.

FossilOrigin-Name: 362615b4df94358d0264b0991c3090a0878f054c
---

ee3b7a27673d744f4cd954ff992f53c4c7f157ee
diff --cc manifest
index 1e9eafc39e,4be65dcffd..f06c0af37a
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Add\stests\sfor\ssnapshot_get(),\s_open()\sand\s_free().
- D 2015-12-07T14:33:07.393
 -C Changes\sto\savoid\sundefined\sbehavior\sin\smemset()\sand\smemcpy()\sand\sin\sthe\ncomparisons\sof\spointers\sfrom\sdifferent\sallocations.\s\sAll\sproblems\sare\sfound\nby\sanalysis\stools\s-\snone\shave\sbeen\sseen\sin\sthe\swild.
 -D 2015-12-08T16:58:45.426
++C Merge\sunrelated\sfixes\sfrom\strunk.
++D 2015-12-09T16:04:06.348
  F Makefile.in 28bcd6149e050dff35d4dcfd97e890cd387a499d
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc e8fdca1cb89a1b58b5f4d3a130ea9a3d28cb314d
@@@ -323,11 -323,11 +323,11 @@@ F src/os.c 8fd25588eeba74068d41102d2681
  F src/os.h 3e57a24e2794a94d3cf2342c6d9a884888cd96bf
  F src/os_common.h abdb9a191a367793268fe553d25bab894e986a0e
  F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
- F src/os_unix.c 2563734669b06432cea640cbb4f7e9d543f227b9
+ F src/os_unix.c 0ca6d8710366fbb01a275160f018334cd347cbda
  F src/os_win.c 386fba30419e8458b13209781c2af5590eab2811
  F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca
 -F src/pager.c f92aacd5216d8815136c9e0190041783c602641a
 -F src/pager.h 9153c71a89dc82a5a77e485f3929792116c70aae
 +F src/pager.c 58d2593612acb6b542de6715b4af397ea1fa0a35
 +F src/pager.h bf25005b4656cd805af43487c3139fca9678d0cc
  F src/parse.y 23737e649c26ce327603799e57f5c2ff50e5e6ba
  F src/pcache.c 73895411fa6b7bd6f0091212feabbe833b358d23
  F src/pcache.h 1ff11adce609ba7de139b6abfabaf9a2bac947b5
@@@ -340,16 -340,16 +340,16 @@@ F src/random.c ba2679f80ec82c4190062d75
  F src/resolve.c a83b41104e6ff69855d03cd0aaa09e93927ec39f
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
  F src/select.c f8fded11fc443a9f5a73cc5db069d06b34460e2f
- F src/shell.c 2796237990d42e6a5a7beafee65ef70cc8767d21
+ F src/shell.c abbc74ea43dbf2f306ea18282d666683fb5efab2
 -F src/sqlite.h.in 1248a78548024bdc8ef5893faa0ff9552b4cceb4
 +F src/sqlite.h.in fc8a2875a318df1b9dabd82cb00b1ac98081423a
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h dfbe62ffd95b99afe2140d8c35b180d11924072d
- F src/sqliteInt.h 64256d193a16a147d9f6317cc4e095fdd3e0a2e9
+ F src/sqliteInt.h 5caacf37a776f9d6178e519cb0b5248ca22a3828
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c 70912d7be68e9e2dbc4010c93d344af61d4c59ba
  F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
  F src/tclsqlite.c d9439b6a910985b7fff43ba6756bcef00de22649
- F src/test1.c de18fc36e0830039058e9829ac201bb203d31718
 -F src/test1.c 90c4e80c7f4b0ad82c6dbe699c8f430b641769f5
++F src/test1.c 4f1b42699068b7806af3111786f5ad760c2c1ff7
  F src/test2.c 5586f43fcd9a1be0830793cf9d354082c261b25b
  F src/test3.c a8887dabbbee3059af338f20d290084a63ed1b0f
  F src/test4.c d168f83cc78d02e8d35567bb5630e40dcd85ac1e
@@@ -1409,7 -1408,7 +1409,7 @@@ F tool/vdbe_profile.tcl 246d0da094856d7
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 0715eb00aa8891400cd50a15509d3d7b13789626
- R e71fd4e8a4bba215d14ff5f093a4f95d
- U dan
- Z b314e37499d3a0450136f5ece5d06812
 -P f20396adb2cff12a17a3fc90b36241ae3fdfd62a
 -R 70bc46af51bec4fcd5f5ac34f7fbc9eb
++P 502cc6f353358946080d9bcd335aed526825b88a 901d0b8f3b72e96ffa8e9436993a12980f5ebd51
++R 9b1d7228446872f8d72f41cfd12e515e
+ U drh
 -Z 9b6f69f2c38f1825e156d39e6c72b0a2
++Z 3ae5744205bfcf5cc63a2630633fbd47
diff --cc manifest.uuid
index d3b0195b25,a26e28b825..44bc42da2d
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 502cc6f353358946080d9bcd335aed526825b88a
 -901d0b8f3b72e96ffa8e9436993a12980f5ebd51
++362615b4df94358d0264b0991c3090a0878f054c
diff --cc src/test1.c
index 31f506ea4f,b8154a64fe..c5e71582bc
--- a/src/test1.c
+++ b/src/test1.c
@@@ -2269,88 -2269,6 +2269,94 @@@ static int vfsCurrentTimeInt64
    return TCL_OK;
  }
  
++#ifdef SQLITE_ENABLE_SNAPSHOT
 +/*
 +** Usage: sqlite3_snapshot_get DB DBNAME
 +*/
 +static int test_snapshot_get(
 +  void * clientData,
 +  Tcl_Interp *interp,
 +  int objc,
 +  Tcl_Obj *CONST objv[]
 +){
 +  int rc;
 +  sqlite3 *db;
 +  char *zName;
 +  sqlite3_snapshot *pSnapshot = 0;
 +
 +  if( objc!=3 ){
 +    Tcl_WrongNumArgs(interp, 1, objv, "DB DBNAME");
 +    return TCL_ERROR;
 +  }
 +  if( getDbPointer(interp, Tcl_GetString(objv[1]), &db) ) return TCL_ERROR;
 +  zName = Tcl_GetString(objv[2]);
 +
 +  rc = sqlite3_snapshot_get(db, zName, &pSnapshot);
 +  if( rc!=SQLITE_OK ){
 +    Tcl_SetObjResult(interp, Tcl_NewStringObj(sqlite3ErrName(rc), -1));
 +    return TCL_ERROR;
 +  }else{
 +    char zBuf[100];
 +    if( sqlite3TestMakePointerStr(interp, zBuf, pSnapshot) ) return TCL_ERROR;
 +    Tcl_SetObjResult(interp, Tcl_NewStringObj(zBuf, -1));
 +  }
 +  return TCL_OK;
 +}
++#endif /* SQLITE_ENABLE_SNAPSHOT */
 +
++#ifdef SQLITE_ENABLE_SNAPSHOT
 +/*
 +** Usage: sqlite3_snapshot_open DB DBNAME SNAPSHOT
 +*/
 +static int test_snapshot_open(
 +  void * clientData,
 +  Tcl_Interp *interp,
 +  int objc,
 +  Tcl_Obj *CONST objv[]
 +){
 +  int rc;
 +  sqlite3 *db;
 +  char *zName;
 +  sqlite3_snapshot *pSnapshot;
 +
 +  if( objc!=4 ){
 +    Tcl_WrongNumArgs(interp, 1, objv, "DB DBNAME SNAPSHOT");
 +    return TCL_ERROR;
 +  }
 +  if( getDbPointer(interp, Tcl_GetString(objv[1]), &db) ) return TCL_ERROR;
 +  zName = Tcl_GetString(objv[2]);
 +  pSnapshot = (sqlite3_snapshot*)sqlite3TestTextToPtr(Tcl_GetString(objv[3]));
 +
 +  rc = sqlite3_snapshot_open(db, zName, pSnapshot);
 +  if( rc!=SQLITE_OK ){
 +    Tcl_SetObjResult(interp, Tcl_NewStringObj(sqlite3ErrName(rc), -1));
 +    return TCL_ERROR;
 +  }
 +  return TCL_OK;
 +}
++#endif /* SQLITE_ENABLE_SNAPSHOT */
 +
++#ifdef SQLITE_ENABLE_SNAPSHOT
 +/*
 +** Usage: sqlite3_snapshot_free SNAPSHOT
 +*/
 +static int test_snapshot_free(
 +  void * clientData,
 +  Tcl_Interp *interp,
 +  int objc,
 +  Tcl_Obj *CONST objv[]
 +){
 +  sqlite3_snapshot *pSnapshot;
 +  if( objc!=2 ){
 +    Tcl_WrongNumArgs(interp, 1, objv, "SNAPSHOT");
 +    return TCL_ERROR;
 +  }
 +  pSnapshot = (sqlite3_snapshot*)sqlite3TestTextToPtr(Tcl_GetString(objv[1]));
 +  sqlite3_snapshot_free(pSnapshot);
 +  return TCL_OK;
 +}
++#endif /* SQLITE_ENABLE_SNAPSHOT */
 +
  /*
  ** Usage:  sqlite3_next_stmt  DB  STMT
  **