/ Check-in [4510d55d]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Remove a surplus semicolon, which was harmless on gcc and clang but caused compile-time errors on msvc. This only comes up using the encryption extension.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | branch-3.19
Files: files | file ages | folders
SHA3-256: 4510d55d1e2e23d4a4470dbd414161beec2ceefb7537fd66ea3c347e11624dfc
User & Date: drh 2017-05-23 01:30:26
Context
2017-05-23
01:35
Change the version number to 3.19.1. check-in: 16656b8f user: drh tags: branch-3.19
01:30
Remove a surplus semicolon, which was harmless on gcc and clang but caused compile-time errors on msvc. This only comes up using the encryption extension. check-in: 4510d55d user: drh tags: branch-3.19
01:29
When flattening a query, make sure iTable attribute of TK_IF_NULL_ROW operators (that result from a prior flattening of a LEFT JOIN) are updated correctly. Fix for ticket [cad1ab4cb7b0fc344]. check-in: 919d36e6 user: drh tags: branch-3.19
00:32
Remove a surplus semicolon, which was harmless on gcc and clang but caused compile-time errors on msvc. This only comes up using the encryption extension. check-in: 987a2b55 user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/main.c.

  3092   3092       void *pArg = sqlite3GlobalConfig.pSqllogArg;
  3093   3093       sqlite3GlobalConfig.xSqllog(pArg, db, zFilename, 0);
  3094   3094     }
  3095   3095   #endif
  3096   3096   #if defined(SQLITE_HAS_CODEC)
  3097   3097     if( rc==SQLITE_OK ){
  3098   3098       const char *zKey;
  3099         -    if( (zKey = sqlite3_uri_parameter(zOpen, "hexkey"))!=0 && zKey[0] ){;
         3099  +    if( (zKey = sqlite3_uri_parameter(zOpen, "hexkey"))!=0 && zKey[0] ){
  3100   3100         u8 iByte;
  3101   3101         int i;
  3102   3102         char zDecoded[40];
  3103   3103         for(i=0, iByte=0; i<sizeof(zDecoded)*2 && sqlite3Isxdigit(zKey[i]); i++){
  3104   3104           iByte = (iByte<<4) + sqlite3HexToInt(zKey[i]);
  3105   3105           if( (i&1)!=0 ) zDecoded[i/2] = iByte;
  3106   3106         }