From: mistachkin <mistachkin@noemail.net>
Date: Mon, 24 Feb 2014 21:23:07 +0000 (+0000)
Subject: Merge updates from trunk.
X-Git-Tag: version-3.8.4~10^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=edb4ece65e140844be9f94d54ac6492d55614288;p=thirdparty%2Fsqlite.git

Merge updates from trunk.

FossilOrigin-Name: 854d410ad3a2bb3af5465d933ac9535fe3f22bfe
---

edb4ece65e140844be9f94d54ac6492d55614288
diff --cc manifest
index 4ed19202d6,7b0e38f502..fc4f0247aa
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Better\sloadable\sextension\shandling\sin\sthe\sWin32\sVFS\swhen\scompiled\sfor\sCygwin.
- D 2014-02-21T05:44:18.393
 -C Enhance\stesting\ssupport\sfor\sthe\sWin32\sVFS\sdynamic\sextension\sloading\sfacilities.
 -D 2014-02-24T21:20:25.412
++C Merge\supdates\sfrom\strunk.
++D 2014-02-24T21:23:07.956
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -203,7 -203,7 +203,7 @@@ F src/os.c 1b147e4cf7cc39e618115c14a086
  F src/os.h 4a46270a64e9193af4a0aaa3bc2c66dc07c29b3f
  F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
  F src/os_unix.c 18f7f95dc6bcb9cf4d4a238d8e2de96611bc2ae5
- F src/os_win.c 23bd567f897b8934096ee7ce51b21ba43aa94ec7
 -F src/os_win.c 166d2f195ea0b7b4ea948229f727f0a293dd3c65
++F src/os_win.c 9ce043722f5d959c52c9a751e5c960602de0927b
  F src/pager.c 0ffa313a30ed6d061d9c6601b7b175cc50a1cab7
  F src/pager.h ffd5607f7b3e4590b415b007a4382f693334d428
  F src/parse.y 2613ca5d609c2f3d71dd297351f010bcec16e1e0
@@@ -1151,10 -1151,7 +1151,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
  F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
- P b46d4e8923e6e367412bba7aeac07039bbcbabd1
- R a7d693d1ea11a2ee85a54f6ea757a9d1
- T *branch * cygDlOpen
- T *sym-cygDlOpen *
- T -sym-trunk *
 -P d6746cabaa22429644c956a4b5fd91896376de2d
 -R 92acab9fb5e448fe2bef6b9a7d9bb046
++P 6676475c47558a52cb2632e92a541e13d143b2dc 53081e7202fb55f792a78e73627466eb0200f11c
++R 18f77ade6087ed733fbdb268f6f34961
  U mistachkin
- Z 4b80816c39a01dfdffbdf857b2bcb9b9
 -Z 2600b243b92aaa5b75c087148e5db2b4
++Z 803bfaab7aa1ae283bf7c1240bdf5b59
diff --cc manifest.uuid
index b559183c43,8331b56d75..edfc0c8182
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 6676475c47558a52cb2632e92a541e13d143b2dc
 -53081e7202fb55f792a78e73627466eb0200f11c
++854d410ad3a2bb3af5465d933ac9535fe3f22bfe
diff --cc src/os_win.c
index 27f2337287,ac5eb886e3..e8b702a6d7
--- a/src/os_win.c
+++ b/src/os_win.c
@@@ -5135,30 -5135,12 +5135,29 @@@ static int winFullPathname
  ** Interfaces for opening a shared library, finding entry points
  ** within the shared library, and closing the shared library.
  */
- /*
- ** Interfaces for opening a shared library, finding entry points
- ** within the shared library, and closing the shared library.
- */
  static void *winDlOpen(sqlite3_vfs *pVfs, const char *zFilename){
    HANDLE h;
 +#if defined(__CYGWIN__)
 +  int nFull = pVfs->mxPathname+1;
 +  char *zFull = sqlite3MallocZero( nFull );
 +  void *zConverted = 0;
 +  if( zFull==0 ){
++    OSTRACE(("DLOPEN name=%s, handle=%p\n", zFilename, (void*)0));
 +    return 0;
 +  }
 +  if( winFullPathname(pVfs, zFilename, nFull, zFull)!=SQLITE_OK ){
 +    sqlite3_free(zFull);
++    OSTRACE(("DLOPEN name=%s, handle=%p\n", zFilename, (void*)0));
 +    return 0;
 +  }
 +  zConverted = winConvertFromUtf8Filename(zFull);
 +  sqlite3_free(zFull);
 +#else
    void *zConverted = winConvertFromUtf8Filename(zFilename);
    UNUSED_PARAMETER(pVfs);
 +#endif
    if( zConverted==0 ){
+     OSTRACE(("DLOPEN name=%s, handle=%p\n", zFilename, (void*)0));
      return 0;
    }
    if( osIsNT() ){