database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-07 02:42:48 +03:00
Code Activity

Merge updates from trunk. Make OSTRACE changes work on Linux.

Browse Source 
FossilOrigin-Name: cd1542664eb3eb46d486664ded49cd9c4bef3948
This commit is contained in:
mistachkin
2015-04-16 03:24:38 +00:00
parent 00eb70d89c 22ecef5c20
commit fb383e9229
73 changed files with 2477 additions and 428 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main.c
View File

@@ -60,8 +60,7 @@ int sqlite3_threadsafe(void){ return SQLITE_THREADSAFE; }
** this variable being set to non-zero will cause OSTRACE macros to emit
** extra diagnostic information.
*/
#if (defined(SQLITE_DEBUG) && SQLITE_OS_WIN) || \
(defined(SQLITE_TEST) || defined(SQLITE_FORCE_OS_TRACE))
#ifdef SQLITE_HAVE_OS_TRACE
# ifndef SQLITE_DEBUG_OS_TRACE
# define SQLITE_DEBUG_OS_TRACE 0
# endif
@@ -1207,8 +1206,7 @@ void sqlite3RollbackAll(sqlite3 *db, int tripCode){
** Return a static string containing the name corresponding to the error code
** specified in the argument.
*/
#if (defined(SQLITE_DEBUG) && SQLITE_OS_WIN) || \
(defined(SQLITE_TEST) || defined(SQLITE_FORCE_OS_TRACE))
#ifdef SQLITE_HAVE_OS_TRACE
const char *sqlite3ErrName(int rc){
const char *zName = 0;
int i, origRc = rc;