Retain the error string if an error is generated by SSE during a VACUUM. (CVS 2476)

FossilOrigin-Name: f7b76d02e003faf0310b87949d3cb0f38062853f

diff --git a/manifest b/manifest
index d67e946d949825306eb61fdaa01571dd8b7fe84f..a553b39c66b4f49e2ce305310a30adb392bcc127 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\spFetch\svariable\s(used\sby\sSSE)\sto\ssqlite3\sstructure.\s(CVS\s2475)
-D 2005-05-23T04:51:02
+C Retain\sthe\serror\sstring\sif\san\serror\sis\sgenerated\sby\sSSE\sduring\sa\sVACUUM.\s(CVS\s2476)
+D 2005-05-23T13:00:58
 F Makefile.in 5c00d0037104de2a50ac7647a5f12769795957a3
 F Makefile.linux-gcc 06be33b2a9ad4f005a5f42b22c4a19dab3cbb5c7
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -73,8 +73,8 @@ F src/tokenize.c fbe48ad208263b7c493fe16e29a293e6d47b451a
 F src/trigger.c 1a6d0c7c51b70bdc58d5068be72034071eff23ad
 F src/update.c 04ea9dd784ccfeaf38a681b3edfe3b1c4edfdda7
 F src/utf.c bda5eb85039ef16f2d17004c1e18c96e1ab0a80c
-F src/util.c 1e1402e7115d0a81f92f43be50a2198c85fced5f
-F src/vacuum.c bc1b36a56d0b4d86e1ed783cbdb24c5a54702e58
+F src/util.c ae41deda8b026e141a00938fcab8e4431578d6ea
+F src/vacuum.c f14521a8033350ce3dbe11ff9a25674b1d6298df
 F src/vdbe.c d2574042c44baf6b1016c61e8072dec529ac748a
 F src/vdbe.h 75e466d84d362b0c4498978a9d6b1e6bd32ecf3b
 F src/vdbeInt.h 4afaae2f4adcab54ad2a40dabb2e689fba7b1561
@@ -279,7 +279,7 @@ F www/tclsqlite.tcl 425be741b8ae664f55cb1ef2371aab0a75109cf9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl a99cf5f6d8bd4d5537584a2b342f0fb9fa601d8b
 F www/whentouse.tcl 528299b8316726dbcc5548e9aa0648c8b1bd055b
-P 2db2b32f269062b006ae5c4a302d116cdab8f9ec
-R b34012627a1af73a718b9fa796417bb8
+P 2a8ac869671b627d4d01655bbce7a781bc74af44
+R b1031030db9f7c66e26c25de4a342f36
 U danielk1977
-Z 3b1cdef05a4a8be2cb9ce27d87d92fd2
+Z ceb8d3cc11da91ad4514aeaf74501d5d

diff --git a/manifest.uuid b/manifest.uuid
index 58d35f6391fb72fd392a4f2b63b43515efc3b715..ad7b209bae08427b817dc6cdb5316d04c1e9f6a2 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2a8ac869671b627d4d01655bbce7a781bc74af44
\ No newline at end of file
+f7b76d02e003faf0310b87949d3cb0f38062853f
\ No newline at end of file

diff --git a/src/util.c b/src/util.c
index 23409c4ad8f3341de7581e8d2cbf691a1a387c6b..57ac13994f914deebadb89be8f260709f40bd11c 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -14,7 +14,7 @@
 ** This file contains functions for allocating memory, comparing
 ** strings, and stuff like that.
 **
-** $Id: util.c,v 1.134 2005/05/22 20:12:37 drh Exp $
+** $Id: util.c,v 1.135 2005/05/23 13:00:58 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 #include <stdarg.h>
@@ -397,7 +397,7 @@ void sqlite3SetString(char **pz, const char *zFirst, ...){
 ** zFormat and any string tokens that follow it are assumed to be
 ** encoded in UTF-8.
 **
-** To clear the most recent error for slqite handle "db", sqlite3Error
+** To clear the most recent error for sqlite handle "db", sqlite3Error
 ** should be called with err_code set to SQLITE_OK and zFormat set
 ** to NULL.
 */

diff --git a/src/vacuum.c b/src/vacuum.c
index 57a747b55179bbc03744456cc5cf5e76f8dcfd22..eeb635eb6b6652a844615e34bb224e1fac7425a8 100644 (file)
--- a/src/vacuum.c
+++ b/src/vacuum.c
@@ -14,7 +14,7 @@
 ** Most of the code in this file may be omitted by defining the
 ** SQLITE_OMIT_VACUUM macro.
 **
-** $Id: vacuum.c,v 1.42 2005/05/22 06:49:57 danielk1977 Exp $
+** $Id: vacuum.c,v 1.43 2005/05/23 13:00:58 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 #include "os.h"
@@ -313,6 +313,9 @@ end_of_vacuum:
   if( rc==SQLITE_OK ){
     extern int sqlite3RecompileStatements(sqlite3*);
     rc = sqlite3RecompileStatements(db);
+    if( rc!=SQLITE_OK ){
+      sqlite3SetString(pzErrMsg, sqlite3_errmsg(db), (char *)0);
+    }
   }
 #endif /* SQLITE_SSE */