From: drh <>
Date: Fri, 22 Jan 2021 20:28:30 +0000 (+0000)
Subject: Merge fixes from trunk.  Omit a conditional in
X-Git-Tag: version-3.35.0~126^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fheads%2Fisnotnull-opt;p=thirdparty%2Fsqlite.git

Merge fixes from trunk.  Omit a conditional in
sqlite3IsLikeFunction() that was made unreachable by this enhancement.

FossilOrigin-Name: 0b42f9eb5dd710991af3cf4b16464b22db9539361d618e50eaa4d43c811577b4
---

17988aae5bda59cf029849c24987133f2ed7b640
diff --cc manifest
index a19e4809b7,0cc6359996..8eeac2760f
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Performance\soptimizations\sin\sexprAnalyze()
- D 2021-01-21T20:42:36.445
 -C Do\snot\sallow\sVACUUM\sto\sresize\sthe\spage_size\sto\s512\sif\sthe\sreserve_byte\svalue\nis\s31\sor\sgreater.\s[forum:/forumpost/e807885dc5|forum\spost\se807885dc5].
 -D 2021-01-21T21:36:25.588
++C Merge\sfixes\sfrom\strunk.\s\sOmit\sa\sconditional\sin\s\nsqlite3IsLikeFunction()\sthat\swas\smade\sunreachable\sby\sthis\senhancement.
++D 2021-01-22T20:28:30.345
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -496,7 -496,7 +496,7 @@@ F src/delete.c 927cf8f900583e79aca8f1a3
  F src/expr.c 47c85263e6d179424e6b09e2c79db5704ab5b8cbc2fae2ee3285faa2566f2e74
  F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
  F src/fkey.c 83372403298e6a7dd989a47aaacdbaa5b4307b5199dbd56e07d4896066b3de72
--F src/func.c 251b5953cecd0ce3e282213c5e623134415793d3569d7804d13460559d7e45ff
++F src/func.c 796a7a4a0ff5eee82a04ee3c8265c5ebf9c6a9f5625621c5f97ed94f6224d7d9
  F src/global.c ed55af196a9b66e198aaeda3f5454c3aa7d7d050c6c938181fd044b70d180a81
  F src/hash.c 8d7dda241d0ebdafb6ffdeda3149a412d7df75102cecfc1021c98d6219823b19
  F src/hash.h 9d56a9079d523b648774c1784b74b89bd93fac7b365210157482e4319a468f38
@@@ -1898,7 -1898,7 +1898,7 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P fc98218cf69e63bdb9e5f154521a341508502cd8cfe04cb870cabee2d99e0cb3
- R f46bf0fe436bc977a841647e6a3e3ebc
 -P 02264ab6a02d6cc95cf865920bcbaf4307d034640e6e4f3371b009ae9818540e
 -R 48ee8ca426c1edea6b9f06bdf29c3bdc
++P 6d60cf540b8cc231448175f1e16e1f4f7a0aee26898570a5b8a09c89fae53c02 d5ea75a09d4bf61262cead2604e35d8331b727c504807592d09f5d9e01ce794a
++R dd365517921749a64a3732b6a8560730
  U drh
- Z 4d2704e467917a55449d9cd09c1bd5e8
 -Z cbe3ac807720d5b866771e6277e15b90
++Z 57540375938636005cdf9e0125af5478
diff --cc manifest.uuid
index 3639833e1d,949cc47910..35bccac4da
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 6d60cf540b8cc231448175f1e16e1f4f7a0aee26898570a5b8a09c89fae53c02
 -d5ea75a09d4bf61262cead2604e35d8331b727c504807592d09f5d9e01ce794a
++0b42f9eb5dd710991af3cf4b16464b22db9539361d618e50eaa4d43c811577b4
diff --cc src/func.c
index dcf5e6cf2d,dcf5e6cf2d..e6f293ef06
--- a/src/func.c
+++ b/src/func.c
@@@ -1865,7 -1865,7 +1865,9 @@@ void sqlite3RegisterLikeFunctions(sqlit
  int sqlite3IsLikeFunction(sqlite3 *db, Expr *pExpr, int *pIsNocase, char *aWc){
    FuncDef *pDef;
    int nExpr;
--  if( pExpr->op!=TK_FUNCTION || !pExpr->x.pList ){
++  assert( pExpr!=0 );
++  assert( pExpr->op==TK_FUNCTION );
++  if( !pExpr->x.pList ){
      return 0;
    }
    assert( !ExprHasProperty(pExpr, EP_xIsSelect) );