Allow SQLITE_MAX_COLUMN to be set to zero at compile-time in order to

disable the checks.  Also SQLITE_MAX_EXPR_DEPTH.  Ticket #3069. (CVS 5065)

FossilOrigin-Name: e6f71abb22fb74e5910d817caec98fa44070fc5f

diff --git a/manifest b/manifest
index 0729198c6325dffe227fd9fd9e8000186eae3c8e..058de80da67ec862517062064d84fb69c89d2c64 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\stest\scases\sto\sverify\sthat\smultiple\svirtual\stables\scan\sbe\supdated\nwithin\sa\strigger\sand\sthat\sxSync,\sxCommit,\sand\sxRollback\sare\snever\scalled\nexcept\sfollowing\sxBegin\sor\sxCreate.\s\sTicket\s#3083.\s(CVS\s5064)
-D 2008-04-28T20:27:54
+C Allow\sSQLITE_MAX_COLUMN\sto\sbe\sset\sto\szero\sat\scompile-time\sin\sorder\sto\ndisable\sthe\schecks.\s\sAlso\sSQLITE_MAX_EXPR_DEPTH.\s\sTicket\s#3069.\s(CVS\s5065)
+D 2008-04-28T20:35:49
 F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7
 F Makefile.in 25b3282a4ac39388632c2fb0e044ff494d490952
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -103,7 +103,7 @@ F src/insert.c 77f0829b3e2edd19e9238195c56b0d56ab000f17
 F src/journal.c 807bed7a158979ac8d63953e1774e8d85bff65e2
 F src/legacy.c 8267890e6a0a71f13b680794520999c642299081
 F src/loadext.c 5c20a5afeb154e68d62ed6d9c634add1b21387fd
-F src/main.c 367b5806a04e0014101fa70e2e5265e12f6a7030
+F src/main.c 94c8bf6ad592aec60dae1c34d30c089fc9be1137
 F src/malloc.c 12c1ae98ef1eff34b13c9eb526e0b7b479e1e820
 F src/md5.c c5fdfa5c2593eaee2e32a5ce6c6927c986eaf217
 F src/mem1.c fc716ff521b6dd3e43eaa211967383308800e70a
@@ -632,7 +632,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P 133b7ee50ea6012739ebe0e334374c5d9b1fcc7f
-R d24a295d23f75ea44f2833f350b9f9f0
+P 76175199ac2fda57e616eb386ba0bad6aa9f74b4
+R dc8adbd3002ee68e412cd270901158fa
 U drh
-Z 635c743fe71c1f4dbacd2725b4d43e66
+Z 1669d55a9b3e668684a817ba98300199

diff --git a/manifest.uuid b/manifest.uuid
index 11e09317813cbe0854a987858aa348bb3df4e06c..8ca0edb939a0dd3801f0e62d3e37dacb83bc50a8 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-76175199ac2fda57e616eb386ba0bad6aa9f74b4
\ No newline at end of file
+e6f71abb22fb74e5910d817caec98fa44070fc5f
\ No newline at end of file

diff --git a/src/main.c b/src/main.c
index 06fc5c1b9a63a9bb307624797d94fe19950797be..25c794768fe513332f63a88a225229069efcb420 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.435 2008/04/28 16:19:35 danielk1977 Exp $
+** $Id: main.c,v 1.436 2008/04/28 20:35:49 drh Exp $
 */
 #include "sqliteInt.h"
 #include <ctype.h>
@@ -968,12 +968,6 @@ static const int aHardLimit[] = {
 #if SQLITE_MAX_SQL_LENGTH>SQLITE_MAX_LENGTH
 # error SQLITE_MAX_SQL_LENGTH must not be greater than SQLITE_MAX_LENGTH
 #endif
-#if SQLITE_MAX_COLUMN<1
-# error SQLITE_MAX_COLUMN must be at least 1
-#endif
-#if SQLITE_MAX_EXPR_DEPTH<1
-# error SQLITE_MAX_EXPR_DEPTH must be at least 1
-#endif
 #if SQLITE_MAX_COMPOUND_SELECT<2
 # error SQLITE_MAX_COMPOUND_SELECT must be at least 2
 #endif