diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/os_win.c | 2 | ||||
| -rw-r--r-- | src/select.c | 9 | ||||
| -rw-r--r-- | src/shell.c | 1 |
3 files changed, 7 insertions, 5 deletions
diff --git a/src/os_win.c b/src/os_win.c index faa60569c..4fb4f0270 100644 --- a/src/os_win.c +++ b/src/os_win.c @@ -3224,7 +3224,7 @@ static void winShmEnterMutex(void){ static void winShmLeaveMutex(void){ sqlite3_mutex_leave(sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_MASTER)); } -#ifdef SQLITE_DEBUG +#ifndef NDEBUG static int winShmMutexHeld(void) { return sqlite3_mutex_held(sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_MASTER)); } diff --git a/src/select.c b/src/select.c index b4ce7be9e..96eae3ff6 100644 --- a/src/select.c +++ b/src/select.c @@ -1378,8 +1378,9 @@ static void generateColumnNames( sqlite3VdbeSetColName(v, i, COLNAME_NAME, zCol, SQLITE_TRANSIENT); } }else{ - sqlite3VdbeSetColName(v, i, COLNAME_NAME, - sqlite3DbStrDup(db, pEList->a[i].zSpan), SQLITE_DYNAMIC); + const char *z = pEList->a[i].zSpan; + z = z==0 ? sqlite3MPrintf(db, "column%d", i+1) : sqlite3DbStrDup(db, z); + sqlite3VdbeSetColName(v, i, COLNAME_NAME, z, SQLITE_DYNAMIC); } } generateColumnTypes(pParse, pTabList, pEList); @@ -3491,8 +3492,8 @@ static int convertCompoundSelectToSubquery(Walker *pWalker, Select *p){ ** return NULL. */ static struct Cte *searchWith(With *pWith, struct SrcList_item *pItem){ - if( pItem->zDatabase==0 ){ - const char *zName = pItem->zName; + const char *zName; + if( pItem->zDatabase==0 && (zName = pItem->zName)!=0 ){ With *p; for(p=pWith; p; p=p->pOuter){ int i; diff --git a/src/shell.c b/src/shell.c index 00cff6a8e..b5ce90208 100644 --- a/src/shell.c +++ b/src/shell.c @@ -597,6 +597,7 @@ static void output_c_string(FILE *out, const char *z){ */ static void output_html_string(FILE *out, const char *z){ int i; + if( z==0 ) z = ""; while( *z ){ for(i=0; z[i] && z[i]!='<' |