From: drh <drh@noemail.net>
Date: Thu, 16 Jan 2020 12:25:14 +0000 (+0000)
Subject: Fix an SQL syntax error in the comment on the omit-left-join optimization.
X-Git-Tag: version-3.31.0~27
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7db212a70b6520832a22e98f5f506c6cc7826f3e;p=thirdparty%2Fsqlite.git

Fix an SQL syntax error in the comment on the omit-left-join optimization.
No changes to code.

FossilOrigin-Name: 86b5e5a20e967af7ac444ff0a40c2e8b93b7e5c505eebf6d3753a341b05503a8
---

diff --git a/manifest b/manifest
index 22100ee7ab..ceb2dae77e 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Clean\sup\sthe\sdefinitions\sof\sthe\sTERM_\sconstants\sin\sthe\scode\sgenerator.\nFormatting\sonly\s-\sno\slogic\schanges.
-D 2020-01-16T11:51:09.331
+C Fix\san\sSQL\ssyntax\serror\sin\sthe\scomment\son\sthe\somit-left-join\soptimization.\nNo\schanges\sto\scode.
+D 2020-01-16T12:25:14.066
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -617,7 +617,7 @@ F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 F src/wal.c 15a2845769f51ba132f9cf0b2c7a6887a91fc8437892dbcce9fcdc68b66d60a1
 F src/wal.h 606292549f5a7be50b6227bd685fa76e3a4affad71bb8ac5ce4cb5c79f6a176a
 F src/walker.c a137468bf36c92e64d2275caa80c83902e3a0fc59273591b96c6416d3253d05d
-F src/where.c df2bea0e0122e853d9f1a8ec68920744166d2a524e338eba92e5470538ecd1f9
+F src/where.c 2005d0511e05e5f7b6fb3be514b44f264f23d45f3b0cc5e150c63e3006a003e5
 F src/whereInt.h 9157228db086f436a574589f8cc5749bd971e94017c552305ad9ec472ed2e098
 F src/wherecode.c ec8870d6fe79668dd12d7edc65ae9771828d6cdfe478348c8abd872a89fdbadd
 F src/whereexpr.c 4b34be1434183e7bb8a05d4bf42bd53ea53021b0b060936fbd12062b4ff6b396
@@ -1857,7 +1857,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 03b003c988d27f3aa1b1e44972ee5a3c7e44ad667ec7f2b8a31d0411c66583d3
-R d7ffc973c7d36b1e5540da71f4b7e63a
+P af06f80a590e20f64fa2f630e85fa728c266ea4696b975cc5f2ab72a3b914379
+R 9a8c9df7f9259d9aaa9715d05b9ca046
 U drh
-Z 2da9b3045dcf43023df4f4ed55be732d
+Z c83be37898e2cd5899ddcac01ce6852d
diff --git a/manifest.uuid b/manifest.uuid
index e32d827dd7..aa609bb64a 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-af06f80a590e20f64fa2f630e85fa728c266ea4696b975cc5f2ab72a3b914379
\ No newline at end of file
+86b5e5a20e967af7ac444ff0a40c2e8b93b7e5c505eebf6d3753a341b05503a8
\ No newline at end of file
diff --git a/src/where.c b/src/where.c
index 7fb27191a3..e7447deec2 100644
--- a/src/where.c
+++ b/src/where.c
@@ -4908,14 +4908,14 @@ WhereInfo *sqlite3WhereBegin(
   ** then table t2 can be omitted from the following:
   **
   **     SELECT v1, v3 FROM t1 
-  **       LEFT JOIN t2 USING (t1.ipk=t2.ipk)
-  **       LEFT JOIN t3 USING (t1.ipk=t3.ipk)
+  **       LEFT JOIN t2 ON (t1.ipk=t2.ipk)
+  **       LEFT JOIN t3 ON (t1.ipk=t3.ipk)
   **
   ** or from:
   **
   **     SELECT DISTINCT v1, v3 FROM t1 
   **       LEFT JOIN t2
-  **       LEFT JOIN t3 USING (t1.ipk=t3.ipk)
+  **       LEFT JOIN t3 ON (t1.ipk=t3.ipk)
   */
   notReady = ~(Bitmask)0;
   if( pWInfo->nLevel>=2