Remove a surplus "return" statement accidentaly left in check-in (1032). (CVS 1033)

FossilOrigin-Name: c697410af4a61d2037e7e319efe8dd78d7b83365

diff --git a/manifest b/manifest
index 39b3d98225c60441eb0e13a58f3c8c975a17abb6..50be52170dc19d15e94dddc65aa487f7f0832203 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sall\sreferences\sto\sSQLITE_OMIT_TRACE.\s\sTracing\sis\salways\senabled.\nTicket\s#361.\s(CVS\s1032)
-D 2003-06-23T11:06:02
+C Remove\sa\ssurplus\s"return"\sstatement\saccidentaly\sleft\sin\scheck-in\s(1032).\s(CVS\s1033)
+D 2003-06-23T15:15:03
 F Makefile.in 9ad23ed4ca97f9670c4496432e3fbd4b3760ebde
 F Makefile.linux-gcc b86a99c493a5bfb402d1d9178dcdc4bd4b32f906
 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@@ -33,7 +33,7 @@ F src/func.c 33bbce6acaf9578ac99aa1f689968ccaf2ce43a2
 F src/hash.c 058f077c1f36f266581aa16f907a3903abf64aa3
 F src/hash.h cd0433998bc1a3759d244e1637fe5a3c13b53bf8
 F src/insert.c fc4c26a0bb505fb802babfb9a7b7a1d4be2e3061
-F src/main.c 284e19c72a3f17eac5b9245501183e7f72dc5950
+F src/main.c 1bfd1bfed2d8d242579ec9bd0425a9e8e3bef64d
 F src/md5.c fe4f9c9c6f71dfc26af8da63e4d04489b1430565
 F src/os.c 4f540b4e5208c8b59e81cdbb8267c8705288b56e
 F src/os.h 9e5bbddff123187295e3d00d49af06192cd1cd49
@@ -166,7 +166,7 @@ F www/speed.tcl 296cc5632d069b56d3ef5409ca0df90f486c10fb
 F www/sqlite.tcl 4bd1729e320f5fa9125f0022b281fbe839192125
 F www/tclsqlite.tcl 1db15abeb446aad0caf0b95b8b9579720e4ea331
 F www/vdbe.tcl 14fdcc7fe8a60a6ba8584903636db8dc37eef26a
-P cb70ee67ea9f5a47d58820e0e8b28c8f945217ed
-R e0cff5def32c5fab5b9a3aa8fede7dc3
+P ec31a5292cbc5d2fb68449838b929638f48e31a7
+R 735fa44a8f7121b39944a932c2c63313
 U drh
-Z 9eefae39003ac7e2ee24176d93c421d3
+Z 198968a4bbf5ffca6cdcfc3ecf44d637

diff --git a/manifest.uuid b/manifest.uuid
index 300fdfdb00c60a27e6d7a384bf4183d971aabd5f..3f07070dcc22852a6a8fe7c1fc39298c8c1d77f5 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ec31a5292cbc5d2fb68449838b929638f48e31a7
\ No newline at end of file
+c697410af4a61d2037e7e319efe8dd78d7b83365
\ No newline at end of file

diff --git a/src/main.c b/src/main.c
index 56062b69b32bc5910ac676b940ef69d3f6a0efe6..1c3b120215791bf12cecc27037112a776c75a37a 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -14,7 +14,7 @@
 ** other files are for internal use by SQLite and should not be
 ** accessed by users of the library.
 **
-** $Id: main.c,v 1.136 2003/06/23 11:06:02 drh Exp $
+** $Id: main.c,v 1.137 2003/06/23 15:15:03 drh Exp $
 */
 #include "sqliteInt.h"
 #include "os.h"
@@ -928,7 +928,6 @@ void *sqlite_trace(sqlite *db, void (*xTrace)(void*,const char*), void *pArg){
   db->xTrace = xTrace;
   db->pTraceArg = pArg;
   return pOld;
-  return 0;
 }
 
 /*