diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/auth.c | 1 | ||||
| -rw-r--r-- | src/ctime.c | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/auth.c b/src/auth.c index 9768fc2fc..8a3f8e7d0 100644 --- a/src/auth.c +++ b/src/auth.c @@ -111,6 +111,7 @@ int sqlite3AuthReadCol( char *zDb = db->aDb[iDb].zName; /* Name of attached database */ int rc; /* Auth callback return code */ + if( db->init.busy ) return SQLITE_OK; rc = db->xAuth(db->pAuthArg, SQLITE_READ, zTab,zCol,zDb,pParse->zAuthContext #ifdef SQLITE_USER_AUTHENTICATION ,db->auth.zAuthUser diff --git a/src/ctime.c b/src/ctime.c index 1a7c69f3b..09587ea88 100644 --- a/src/ctime.c +++ b/src/ctime.c @@ -45,8 +45,10 @@ static const char * const azCompileOpt[] = { #if SQLITE_CHECK_PAGES "CHECK_PAGES", #endif -#if defined(__clang__) && defined(__clang_version__) - "COMPILER=clang-" __clang_version__, +#if defined(__clang__) && defined(__clang_major__) + "COMPILER=clang-" CTIMEOPT_VAL(__clang_major__) "." + CTIMEOPT_VAL(__clang_minor__) "." + CTIMEOPT_VAL(__clang_patchlevel__), #elif defined(_MSC_VER) "COMPILER=msvc-" CTIMEOPT_VAL(_MSC_VER), #elif defined(__GNUC__) && defined(__VERSION__) |