From: drh <drh@noemail.net>
Date: Mon, 2 Apr 2007 17:54:56 +0000 (+0000)
Subject: Fix a union initializer so that it works with the Borland compiler. (CVS 3803)
X-Git-Tag: version-3.6.10~2367
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c94d9c776cfaadc96136ce5b0ac39f70b53c02fa;p=thirdparty%2Fsqlite.git

Fix a union initializer so that it works with the Borland compiler. (CVS 3803)

FossilOrigin-Name: a067f78bf6a45d68ee1337115704cda2041919f4
---

diff --git a/manifest b/manifest
index 0f42306dac..2c6b60ee97 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sa\sdifferent\sform\sof\sI/O\stests.\sSo\sfar\shas\sfailed\sto\sexpose\snew\sbugs.\s(CVS\s3802)
-D 2007-04-02T16:46:23
+C Fix\sa\sunion\sinitializer\sso\sthat\sit\sworks\swith\sthe\sBorland\scompiler.\s(CVS\s3803)
+D 2007-04-02T17:54:57
 F Makefile.in 2f2c3bf69faf0ae7b8e8af4f94f1986849034530
 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -126,7 +126,7 @@ F src/vacuum.c 8bd895d29e7074e78d4e80f948e35ddc9cf2beef
 F src/vdbe.c 87e31f0790ac8a5aad7b7fcd5b97948943fccba3
 F src/vdbe.h 0025259af1939fb264a545816c69e4b5b8d52691
 F src/vdbeInt.h 4b19fd8febad3fd14c4c97adaefc06754d323132
-F src/vdbeapi.c 7ac14f2e3b2283dcd35f5edefd31a8342cff783c
+F src/vdbeapi.c 1fca7ff056d03f131caa6b1296bb221da65ed7f4
 F src/vdbeaux.c 464df6616ea25b2f750b714f9bc2df45aa5e9f6e
 F src/vdbefifo.c 3ca8049c561d5d67cbcb94dc909ae9bb68c0bf8f
 F src/vdbemem.c 981a113405bd9b80aeb71fe246a2f01708e8a8f7
@@ -449,7 +449,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P 4fdafd3f583b1ec4aa7fb6a9b5de2f52a375832b
-R 6309f43590fc7c56f04de013101b9327
-U danielk1977
-Z d779504ae78400a04fd1f5a591901d17
+P 9e1295428f476dba21c28149c7983f66a9134559
+R b5effd492556f66636d18aa8bdef059b
+U drh
+Z 5fefb8398ce1181ab15da3c2a59e2ca2
diff --git a/manifest.uuid b/manifest.uuid
index 59a2cacb1a..13e3b89058 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9e1295428f476dba21c28149c7983f66a9134559
\ No newline at end of file
+a067f78bf6a45d68ee1337115704cda2041919f4
\ No newline at end of file
diff --git a/src/vdbeapi.c b/src/vdbeapi.c
index 594ebc0736..3d3d815c7f 100644
--- a/src/vdbeapi.c
+++ b/src/vdbeapi.c
@@ -443,7 +443,7 @@ static Mem *columnMem(sqlite3_stmt *pStmt, int i){
   Vdbe *pVm = (Vdbe *)pStmt;
   int vals = sqlite3_data_count(pStmt);
   if( i>=vals || i<0 ){
-    static const Mem nullMem = {{0,}, 0.0, "", 0, MEM_Null, MEM_Null };
+    static const Mem nullMem = {{0}, 0.0, "", 0, MEM_Null, MEM_Null };
     sqlite3Error(pVm->db, SQLITE_RANGE, 0);
     return (Mem*)&nullMem;
   }