finally make temporary and journal files hidden in release builds on OS/2 (CVS 5497)

FossilOrigin-Name: c449a95c4f7abd2bfb92bed0e3a9ae874350ce79

diff --git a/manifest b/manifest
index 1a19c0232afb389c75099ef12582b95b5f6735b2..8bc73b11d365f258dda88e2c22bd84377a3734d4 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C recursively\scall\sos2Open()\swith\sthe\sincoming\sVFS\spointer,\sin\scase\sit\sgets\sused\sin\sthe\sfuture\s(CVS\s5496)
-D 2008-07-29T18:38:47
+C finally\smake\stemporary\sand\sjournal\sfiles\shidden\sin\srelease\sbuilds\son\sOS/2\s(CVS\s5497)
+D 2008-07-29T18:49:29
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in bbb62eecc851379aef5a48a1bf8787eb13e6ec06
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -132,7 +132,7 @@ F src/mutex_w32.c f0d21ff1f6981e5aedc56796adf3a347423ef736
 F src/os.c 939ae7690a01d9401685ba124b4ba45fd4a7a2ad
 F src/os.h ef8abeb9afc694b82dbd169a91c9b7e26db3c892
 F src/os_common.h 24525d8b7bce66c374dfc1810a6c9043f3359b60
-F src/os_os2.c a0dcdd2da3295bd09a07a1acdab86afb6ffa56a8
+F src/os_os2.c 676ed273b17bd260f905df81375c9f9950d85517
 F src/os_unix.c 1df6108efdb7957a9f28b9700600e58647c9c12d
 F src/os_win.c 50ec783403b418ddc9e6e05d541c6027dfd41070
 F src/pager.c a6ecad26297469a8a3d1fd7a7c3dc2d603955044
@@ -612,7 +612,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 2455e45484eff85bf9fd78dadd1e934f2bbe210a
-R c08a709d928946a5c84f642f0aef5c64
+P 6eac49f046d089dac90c0bf72e8c3fc583694dcd
+R 37db558a63fbbe7b21086d8a66873964
 U pweilbacher
-Z 269fe583177ea18da037cf06626e384d
+Z 8f64b0555e1ee664441fa92b59a45394

diff --git a/manifest.uuid b/manifest.uuid
index 0cda9df6b75b3de8c5508197727e73c872a1483e..b16b20bbf72b0e4f92fae11b5ea68e4b90c300a2 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6eac49f046d089dac90c0bf72e8c3fc583694dcd
\ No newline at end of file
+c449a95c4f7abd2bfb92bed0e3a9ae874350ce79
\ No newline at end of file

diff --git a/src/os_os2.c b/src/os_os2.c
index 8c534455abe0b048f9ea08a45380bd5cd91d66e8..f1af91db38be83a2d287f136c9acfa29e3b72ecd 100644 (file)
--- a/src/os_os2.c
+++ b/src/os_os2.c
@@ -12,7 +12,7 @@
 **
 ** This file contains code that is specific to OS/2.
 **
-** $Id: os_os2.c,v 1.54 2008/07/29 18:38:47 pweilbacher Exp $
+** $Id: os_os2.c,v 1.55 2008/07/29 18:49:29 pweilbacher Exp $
 */
 
 #include "sqliteInt.h"
@@ -801,7 +801,9 @@ static int os2Open(
   if( flags & (SQLITE_OPEN_TEMP_DB | SQLITE_OPEN_TEMP_JOURNAL
                | SQLITE_OPEN_SUBJOURNAL) ){
     char pathUtf8[CCHMAXPATH];
-    /*ulFileAttribute = FILE_HIDDEN;  //for debugging, we want to make sure it is deleted*/
+#ifdef NDEBUG /* when debugging we want to make sure it is deleted */
+    ulFileAttribute = FILE_HIDDEN;
+#endif
     ulFileAttribute = FILE_NORMAL;
     os2FullPathname( pVfs, zName, CCHMAXPATH, pathUtf8 );
     pFile->pathToDel = convertUtf8PathToCp( pathUtf8 );