diff --git a/manifest b/manifest
index 8e2bfc803b..8a21045b64 100644
--- a/manifest
+++ b/manifest
@@ -1,8 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-C Remove\sunnecessary\scalls\sto\smemAboutToChange()\sin\svdbe.c.\s\sAn\saffinity\nchange\sno\slonger\sinvalidates\sshallow\scopies.
-D 2010-09-30T18:12:02
+C Additional\sencoding\stests.
+D 2010-09-30T18:19:44
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in c599a15d268b1db2aeadea19df2adc3bf2eb6bee
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -365,6 +362,7 @@ F test/e_vacuum.test 057cc29445746fc1d2542984ff0253d511a234bd
 F test/enc.test e54531cd6bf941ee6760be041dff19a104c7acea
 F test/enc2.test 6d91a5286f59add0cfcbb2d0da913b76f2242398
 F test/enc3.test 5c550d59ff31dccdba5d1a02ae11c7047d77c041
+F test/enc4.test f77a8172fc789f346f8cfaa201969d9251855ab2
 F test/eval.test bc269c365ba877554948441e91ad5373f9f91be3
 F test/exclusive.test 0ba00fb15aeec1eba3d4b03a271b5081e21c35be
 F test/exclusive2.test 76e63c05349cb70d09d60b99d2ae625525ff5155
@@ -874,14 +872,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P ca154f97a590745539b2cbfd77eb319fd7392a40
-R 748449bce6ae506eaa073ea594abdada
-U drh
-Z 093ac075ab4b1886bb1eccb584418581
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-iD8DBQFMpNL1oxKgR168RlERAjjtAJ4+t7sulYFx05+58t1+K8swwMqAWQCfbEoM
-G6/RegdDSppspf4YTh1aD/Y=
-=7FrQ
------END PGP SIGNATURE-----
+P afb0fd0b0421c42630c5e6e5e8811aca634bc9d0
+R cd06bfdd4d6b826a69cbc7d431c4e132
+U shaneh
+Z 43d49001f03bba36add05ffc6539647c
diff --git a/manifest.uuid b/manifest.uuid
index e03860e931..af001fec10 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-afb0fd0b0421c42630c5e6e5e8811aca634bc9d0
\ No newline at end of file
+c7f9363617a66ee43a87816ad42aaf2b75f13ea2
\ No newline at end of file
diff --git a/test/enc4.test b/test/enc4.test
new file mode 100644
index 0000000000..f8403c30fc
--- /dev/null
+++ b/test/enc4.test
@@ -0,0 +1,124 @@
+# 2010 Sept 29
+#
+# The author disclaims copyright to this source code.  In place of
+# a legal notice, here is a blessing:
+#
+#    May you do good and not evil.
+#    May you find forgiveness for yourself and forgive others.
+#    May you share freely, never taking more than you give.
+#
+#***********************************************************************
+# This file implements regression tests for SQLite library.  The focus of
+# this file is testing the SQLite routines used for converting between the
+# various suported unicode encodings (UTF-8, UTF-16, UTF-16le and
+# UTF-16be).
+#
+# $Id: enc4.test,v 1.0 2010/09/29 08:29:32 shaneh Exp $
+
+set testdir [file dirname $argv0]
+source $testdir/tester.tcl
+
+# If UTF16 support is disabled, ignore the tests in this file
+#
+ifcapable {!utf16} {
+  finish_test
+  return
+}
+
+db close
+
+# The three unicode encodings understood by SQLite.
+set encodings [list UTF-8 UTF-16le UTF-16be]
+
+# initial value to use in SELECT
+set inits [list 1 1.0]
+
+# vals
+set vals [list\
+"922337203685477580792233720368547758079223372036854775807"\
+"100000000000000000000000000000000000000000000000000000000"\
+"1.0000000000000000000000000000000000000000000000000000000"\
+]
+
+set i 1
+foreach enc $encodings {
+
+  file delete -force test.db
+  sqlite3 db test.db
+  db eval "PRAGMA encoding = \"$enc\""
+
+  do_test enc4-$i.1 {
+    db eval {PRAGMA encoding}
+  } $enc
+
+  set j 1
+  foreach init $inits {
+
+    do_test enc4-$i.$j.2 {
+      set S [sqlite3_prepare_v2 db "SELECT $init+?" -1 dummy]
+      sqlite3_expired $S
+    } {0}
+      
+    set k 1
+    foreach val $vals {
+      for {set x 1} {$x<18} {incr x} {
+        set part [expr $init + [string range $val 0 [expr $x-1]]]
+
+        do_test enc4-$i.$j.$k.3.$x {
+          sqlite3_reset $S
+          sqlite3_bind_text $S 1 $val $x
+          sqlite3_step $S
+          sqlite3_column_text $S 0
+        } [list $part]
+        
+        do_test enc4-$i.$j.$k.4.$x {
+          sqlite3_reset $S
+          sqlite3_bind_text16 $S 1 [encoding convertto unicode $val] [expr $x*2]
+          sqlite3_step $S
+          sqlite3_column_text $S 0
+        } [list $part]
+      }
+      
+      incr k
+    }
+
+    do_test enc4-$i.$j.5 {
+      sqlite3_finalize $S
+    } {SQLITE_OK}
+
+    incr j
+  }
+
+  db close
+  incr i
+}
+
+file delete -force test.db
+sqlite3 db test.db
+
+do_test enc4-4.1 {
+  db eval "select 1+1."
+} {2.0}
+
+do_test enc4-4.2 {
+  set S [sqlite3_prepare_v2 db "SELECT 1+1." -1 dummy]
+  sqlite3_step $S
+  sqlite3_column_text $S 0
+} {2.0}
+
+do_test enc4-4.3 {
+  set S [sqlite3_prepare_v2 db "SELECT 1+?" -1 dummy]
+  sqlite3_bind_text $S 1 "1." 2
+  sqlite3_step $S
+  sqlite3_column_text $S 0
+} {2.0}
+
+do_test enc4-4.4 {
+  set S [sqlite3_prepare_v2 db "SELECT 1+?" -1 dummy]
+  sqlite3_bind_text $S 1 "1.0" 2
+  sqlite3_step $S
+  sqlite3_column_text $S 0
+} {2.0}
+
+
+finish_test