Merge updates from trunk.

FossilOrigin-Name: 22827542a5c7aeac4385ba647f45bd500e787fe6

diff --cc manifest
index 1d2d4915ddc8b3712cd94c9ec9889abb224053b5,5e32fe4ffc5c80cbc3860ca4aeced934d3ac1448..fe9abf5f42b90118573d5d577fa860d3186d4f06
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,12 -1,12 +1,12 @@@
 -C When\sparsing\sthe\sschema,\signore\sany\sSQL\sthat\sdoes\snot\sbegin\swith\s"CREATE".
 -D 2015-04-16T00:26:03.247
 +C Merge\supdates\sfrom\strunk.
- D 2015-04-07T21:18:18.000
++D 2015-04-16T04:20:10.533
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in 00d12636df7a5b08af09116bcd6c7bfd49b8b3b4
+ F Makefile.in 5f78b1ab81b64e7c57a75d170832443e66c0880a
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc a8d817fa486d8c88dfbd19ae6a6567d9d350de39
+ F Makefile.msc 11cb5361e34b80e9c5b417ed6a6deee099c5b5f3
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
  F README.md d58e3bebc0a4145e0f2a87994015fdb575a8e866
- F VERSION 319eb1ced4b4d17a67730f2b7b85f15c1346cb60
+ F VERSION 2e244662b71e6e68a5c29b014ebc5b7564f4cc5a
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F addopcodes.awk 9eb448a552d5c0185cf62c463f9c173cedae3811
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
@@@ -223,19 -223,19 +223,19 @@@ F src/parse.y 1299c66e7b1707322ccd8af43
  F src/pcache.c 10539fb959849ad6efff80050541cab3d25089d4
  F src/pcache.h b44658c9c932d203510279439d891a2a83e12ba8
  F src/pcache1.c 69d137620a305f814398bd29a0c998038c0695e9
- F src/pragma.c ac4f3f856b4234e85f55b0f069698a4766011100
+ F src/pragma.c 3965ae4e82bed39fb97ce04c5fe18c9bc3ee6a88
  F src/pragma.h 09c89bca58e9a44de2116cc8272b8d454657129f
- F src/prepare.c 173a5a499138451b2561614ecb87d78f9f4644b9
- F src/printf.c 8ae1fa9d30c1200a9268a390ba9e9cea9197b27a
+ F src/prepare.c 1fffbdcd6f8a0173a8f70d71f22528f4c0e1e3d3
+ F src/printf.c 08fa675c200aac29e561c6153f91f909ed17612f
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
- F src/resolve.c 41aa91af56d960e9414ce1d7c17cfb68e0d1c6cb
+ F src/resolve.c 66cfe49a9c3b449ef13b89a8c47036a4ed167eab
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
- F src/select.c c28c52e353287434fac8473e56ee4be848d12c9d
- F src/shell.c 6d509d555b7115886e5d55b69ef2b8944ae56114
- F src/sqlite.h.in 278602140d49575e8708e643161f4263e428a02a
+ F src/select.c 93260bc9e7e0e6dfe1b7cb8815b0ed4cad8be9e3
 -F src/shell.c 72b61a9d41ba12b67ea06fe9267abcc012c6c5bb
++F src/shell.c 04706b14b737229cfba359cc1f46dd03b53a59be
+ F src/sqlite.h.in ca27603a36fcacdaac5a19d8ee35aaff8ce8516f
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
- F src/sqliteInt.h 107b02ed6c64162b653acc2368e982de529e14f6
+ F src/sqliteInt.h 90b7bfd89d7307cd0750663da419ba4bb81e7379
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c f266ad8a2892d659b74f0f50cb6a88b6e7c12179
  F src/table.c e7a09215315a978057fb42c640f890160dbcc45e
@@@ -1249,7 -1250,7 +1250,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P d176c9fa4c65ff2f3952dd3dee46da149dfa442f 8e4ac2ce24415926247961b00a62425ae85d6ffb
- R c57274a6c5462ea7b326b2f6ceaa1f1c
 -P e018f4bf1f27f7838342940ad89a12d7f1536e8e
 -R 9772cd879deb52a3e48d7b6cb0b29092
 -U drh
 -Z 089490261a72224f9edd48b4acf9b866
++P c458db41bbb6bd13d47531685e25a09f512c7f5f d3c00d61581c8ba6dce5618391432d3af8d324d4
++R 2c042385d701fe541a26946cba425218
 +U mistachkin
- Z 40ec821f482de26e176671e7dd444d41
++Z e84ee44408bcf2cec5bcea635dbd30f2

diff --cc manifest.uuid
index 2e31d0fc1ec527d0fb4b090b7f59876a0343bf61,e0b027b22a6a6eacec92e87a01a3c0e7b3e6190f..b5747496b30d866dd9a4b04a629655498108c295
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- c458db41bbb6bd13d47531685e25a09f512c7f5f
 -d3c00d61581c8ba6dce5618391432d3af8d324d4
++22827542a5c7aeac4385ba647f45bd500e787fe6

diff --cc src/shell.c
index 005d4eb5b66c7d0699e2b54e84b4afd2cd6cce1b,0f7234c47f6aec4f24aacbe59e695b8464794c14..4860a02eebc21e77841d2b9b828d37eeae63041c
--- 1/src/shell.c
--- 2/src/shell.c
+++ b/src/shell.c
@@@ -1960,26 -1944,14 +1960,26 @@@ static void resolve_backslashes(char *z
    char c;
    while( *z && *z!='\\' ) z++;
    for(i=j=0; (c = z[i])!=0; i++, j++){
-     if( c=='\\' ){
+     if( c=='\\' && z[i+1]!=0 ){
        c = z[++i];
 -      if( c=='n' ){
 -        c = '\n';
 +      if( c=='a' ){
 +        c = '\a';
 +      }else if( c=='b' ){
 +        c = '\b';
        }else if( c=='t' ){
          c = '\t';
 +      }else if( c=='n' ){
 +        c = '\n';
 +      }else if( c=='v' ){
 +        c = '\v';
 +      }else if( c=='f' ){
 +        c = '\f';
        }else if( c=='r' ){
          c = '\r';
 +      }else if( c=='"' ){
 +        c = '"';
 +      }else if( c=='\'' ){
 +        c = '\'';
        }else if( c=='\\' ){
          c = '\\';
        }else if( c>='0' && c<='7' ){