Merge the fork that resulted from a check-in race.

FossilOrigin-Name: b7fe4f362bdf7b233a7b09eb9ce16d296165f82a
2013-08-16 14:51:32 +00:00
parent 0e1f0029c0 22d73b1cbe
commit cf9f83dca2
5 changed files with 41 additions and 20 deletions
@@ -496,7 +496,7 @@ static void test_extract(

    memset(&mem, 0, sizeof(mem));
    mem.db = db;
-    mem.enc = SQLITE_UTF8;
+    mem.enc = ENC(db);
    pHdr += sqlite3GetVarint(pHdr, &iSerialType);
    pBody += sqlite3VdbeSerialGet(pBody, (u32)iSerialType, &mem);
    sqlite3VdbeMemStoreType(&mem);
@@ -545,7 +545,7 @@ static void test_decode(

    memset(&mem, 0, sizeof(mem));
    mem.db = db;
-    mem.enc = SQLITE_UTF8;
+    mem.enc = ENC(db);
    pHdr += sqlite3GetVarint(pHdr, &iSerialType);
    pBody += sqlite3VdbeSerialGet(pBody, (u32)iSerialType, &mem);