diff options
author | drh <> | 2024-09-25 09:43:05 +0000 |
---|---|---|
committer | drh <> | 2024-09-25 09:43:05 +0000 |
commit | 8f1f9ef09f20fbdb00a2ffac4c807cbce817b83d (patch) | |
tree | da7a6ff8f40f74f209fd274f7cf974aa8c6c0fb4 /src/resolve.c | |
parent | 18e2ace4681c6b1d4950811a6123c014ba0fbab0 (diff) | |
parent | 8cd30e3f5b6306b8d657e3dd7376763ab10f0279 (diff) | |
download | sqlite-8f1f9ef09f20fbdb00a2ffac4c807cbce817b83d.tar.gz sqlite-8f1f9ef09f20fbdb00a2ffac4c807cbce817b83d.zip |
Merge trunk enhancements, and especially the zero- and double-width character
processing for columnar outputs into the cli-stdlib branch.
FossilOrigin-Name: d6262a4bcd7b0334b23ae4d194ca2bce7c6554ee6c678666b24c830e4c14a467
Diffstat (limited to 'src/resolve.c')
-rw-r--r-- | src/resolve.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/resolve.c b/src/resolve.c index 2e4462ac0..8e8da6691 100644 --- a/src/resolve.c +++ b/src/resolve.c @@ -486,7 +486,7 @@ static int lookupName( */ if( cntTab==0 || (cntTab==1 - && ALWAYS(pMatch!=0) + && pMatch!=0 && ALWAYS(pMatch->pSTab!=0) && (pMatch->pSTab->tabFlags & TF_Ephemeral)!=0 && (pTab->tabFlags & TF_Ephemeral)==0) |