From 08529dccfa825714dd8fa8fa01f09edbd9068395 Mon Sep 17 00:00:00 2001 From: drh Date: Tue, 7 Sep 2010 19:10:01 +0000 Subject: [PATCH] Update the sqlite3_limit() documentation to explain that SQLITE_LIMIT_VDBE_OP is not enforced. FossilOrigin-Name: 17be9beeab273a0fa84e107c674aee4cd83e6f79 --- manifest | 24 +++++++++++++++++------- manifest.uuid | 2 +- src/sqlite.h.in | 4 +++- 3 files changed, 21 insertions(+), 9 deletions(-) diff --git a/manifest b/manifest index c7365ade55..14c140f612 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,8 @@ -C Add\stests\sto\se_select.test. -D 2010-09-07T19:05:28 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +C Update\sthe\ssqlite3_limit()\sdocumentation\sto\sexplain\sthat\sSQLITE_LIMIT_VDBE_OP\nis\snot\senforced. +D 2010-09-07T19:10:02 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in c599a15d268b1db2aeadea19df2adc3bf2eb6bee F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -174,7 +177,7 @@ F src/resolve.c 1c0f32b64f8e3f555fe1f732f9d6f501a7f05706 F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697 F src/select.c b0b124781474e4e0c8f64022875e5e2009e13443 F src/shell.c 8517fc1f9c59ae4007e6cc8b9af91ab231ea2056 -F src/sqlite.h.in 0c8362d432a4317a334bb6aab5ee92253f706fb5 +F src/sqlite.h.in 8f18e4931c32e971b850fd6a469ecb56affdcbb1 F src/sqlite3ext.h 69dfb8116af51b84a029cddb3b35062354270c89 F src/sqliteInt.h 4e31d3b58720d6251e08ba394641b9a63725eb8a F src/sqliteLimit.h a17dcd3fb775d63b64a43a55c54cb282f9726f44 @@ -857,7 +860,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f -P 883b9b7441593200def05d8a482bc92d3dc0e96b -R 8b30d0d15d657e8276f598400d6535e3 -U dan -Z 9e885c5619cc6ac3f51310d78881d4f0 +P 282dae7edf7209197fffb6c58b038b3aae1a0367 +R d5359eb53181b1e8d4a88b8067d6c633 +U drh +Z 6fe2ed5bc268add10683709bc6f1360a +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.6 (GNU/Linux) + +iD8DBQFMho4RoxKgR168RlERAmLsAJ4nh+tVMrB57mfGUM44EFWhzYbCBQCfXrrZ +ryEkrW0HwLG1pjJCuj103C0= +=jx6O +-----END PGP SIGNATURE----- diff --git a/manifest.uuid b/manifest.uuid index ad23fae2ae..7bedcf1c6e 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -282dae7edf7209197fffb6c58b038b3aae1a0367 \ No newline at end of file +17be9beeab273a0fa84e107c674aee4cd83e6f79 \ No newline at end of file diff --git a/src/sqlite.h.in b/src/sqlite.h.in index 3cbf47c6ab..7210501b0c 100644 --- a/src/sqlite.h.in +++ b/src/sqlite.h.in @@ -2457,7 +2457,9 @@ int sqlite3_limit(sqlite3*, int id, int newVal); ** ** ^(
SQLITE_LIMIT_VDBE_OP
**
The maximum number of instructions in a virtual machine program -** used to implement an SQL statement.
)^ +** used to implement an SQL statement. This limit is not currently +** enforced, though that might be added in some future release of +** SQLite.)^ ** ** ^(
SQLITE_LIMIT_FUNCTION_ARG
**
The maximum number of arguments on a function.
)^ -- 2.47.2