Instead of calling sqlite3_exec() to evaluate "PRAGMA encoding = UTF16" in sqlite3_op...

FossilOrigin-Name: 33a12e737c343dbc452a25321a63456c1a8f7548

diff --git a/manifest b/manifest
index e1398c43196907f5bac8f5c3e94dffeab4b80625..1af5369640ff4d0c5be5968d639d65a88324e84c 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sthe\sspeedtest8.c\sand\sspeedtest16.c\sfiles\sto\sthe\stools\ssubdirectory.\s(CVS\s4958)
-D 2008-04-03T16:01:28
+C Instead\sof\scalling\ssqlite3_exec()\sto\sevaluate\s"PRAGMA\sencoding\s=\sUTF16"\sin\ssqlite3_open16(),\sset\sthe\sconnection\sencoding\sflag\sdirectly.\s(CVS\s4959)
+D 2008-04-03T16:28:25
 F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7
 F Makefile.in b861627d91df5ee422c54237aa38296954dc0151
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -104,7 +104,7 @@ F src/insert.c 6974a1d02f2dcd616d00eef4996d4872495fad0f
 F src/journal.c 807bed7a158979ac8d63953e1774e8d85bff65e2
 F src/legacy.c 8267890e6a0a71f13b680794520999c642299081
 F src/loadext.c f26b22f7c84153c9d5dbd7c240848823c6e6b6dc
-F src/main.c b499fa9fa2551d0963404e1b582747ef92754dd0
+F src/main.c afcd42ba14d144034ed0e285bee100594f00b8fa
 F src/malloc.c 12c1ae98ef1eff34b13c9eb526e0b7b479e1e820
 F src/md5.c c5fdfa5c2593eaee2e32a5ce6c6927c986eaf217
 F src/mem1.c fc716ff521b6dd3e43eaa211967383308800e70a
@@ -625,7 +625,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P c287a7b29410be12cf88f886e8e2525a42aa9c03
-R 9d9b96d2bd32dc055499d78c524c19f5
-U drh
-Z 1c72cd047a86a988a7649faaab8ab44b
+P b8d211a76fa56d812fc1758b58d65eef832494cb
+R 8c44dce20057b42a443a4b9f7f4dfd9c
+U danielk1977
+Z 259f442ab55cd26c4a285d05c392d693

diff --git a/manifest.uuid b/manifest.uuid
index 8b8bc8812232d5736563116e5c63a8f5d416054d..e7fd2808f51f87107d76c6738c4b4b9e24e650ec 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b8d211a76fa56d812fc1758b58d65eef832494cb
\ No newline at end of file
+33a12e737c343dbc452a25321a63456c1a8f7548
\ No newline at end of file

diff --git a/src/main.c b/src/main.c
index 68eb1c05057b4de86ce961c173c2db89aa256397..2a63dfcae6b64b683a3ceb9a97f02ea637457030 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -14,7 +14,7 @@
 ** other files are for internal use by SQLite and should not be
 ** accessed by users of the library.
 **
-** $Id: main.c,v 1.430 2008/04/01 15:06:34 drh Exp $
+** $Id: main.c,v 1.431 2008/04/03 16:28:25 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 #include <ctype.h>
@@ -1249,7 +1249,7 @@ int sqlite3_open16(
                       SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, 0);
     assert( *ppDb || rc==SQLITE_NOMEM );
     if( rc==SQLITE_OK ){
-      rc = sqlite3_exec(*ppDb, "PRAGMA encoding = 'UTF-16'", 0, 0, 0);
+      ENC(*ppDb) = SQLITE_UTF16NATIVE;
       if( rc!=SQLITE_OK ){
         sqlite3_close(*ppDb);
         *ppDb = 0;