Index: src/shell.c
==================================================================
--- src/shell.c
+++ src/shell.c
@@ -3530,11 +3530,10 @@
   data->showHeader = 0;
   sqlite3_config(SQLITE_CONFIG_URI, 1);
   sqlite3_config(SQLITE_CONFIG_LOG, shellLog, data);
   sqlite3_snprintf(sizeof(mainPrompt), mainPrompt,"sqlite> ");
   sqlite3_snprintf(sizeof(continuePrompt), continuePrompt,"   ...> ");
-  sqlite3_config(SQLITE_CONFIG_SINGLETHREAD);
 }
 
 /*
 ** Output text to the console in a font that attracts extra attention.
 */

Index: src/threads.c
==================================================================
--- src/threads.c
+++ src/threads.c
@@ -26,11 +26,11 @@
 ** single-threaded if desired.
 */
 #include "sqliteInt.h"
 
 /********************************* Unix Pthreads ****************************/
-#if SQLITE_OS_UNIX && defined(SQLITE_MUTEX_PTHREADS)
+#if SQLITE_OS_UNIX && defined(SQLITE_MUTEX_PTHREADS) && SQLITE_THREADSAFE>0
 
 #define SQLITE_THREADS_IMPLEMENTED 1  /* Prevent the single-thread code below */
 #include <pthread.h>
 
 /* A running thread */
@@ -83,11 +83,11 @@
 #endif /* SQLITE_OS_UNIX && defined(SQLITE_MUTEX_PTHREADS) */
 /******************************** End Unix Pthreads *************************/
 
 
 /********************************* Win32 Threads ****************************/
-#if SQLITE_OS_WIN && !SQLITE_OS_WINRT
+#if SQLITE_OS_WIN && !SQLITE_OS_WINRT && SQLITE_THREADSAFE>0
 
 #define SQLITE_THREADS_IMPLEMENTED 1  /* Prevent the single-thread code below */
 #include <process.h>
 
 /* A running thread */

Index: src/vdbesort.c
==================================================================
--- src/vdbesort.c
+++ src/vdbesort.c
@@ -29,11 +29,11 @@
 /*
 ** Maximum number of threads to use. Setting this value to 1 forces all
 ** operations to be single-threaded.
 */
 #ifndef SQLITE_MAX_SORTER_THREAD
-# define SQLITE_MAX_SORTER_THREAD 1
+# define SQLITE_MAX_SORTER_THREAD 4
 #endif
 
 /*
 ** Candidate values for SorterThread.eWork
 */