SQLite: Check-in [987a2b55]

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 \| trunk
Files:	files \| file ages \| folders
SHA3-256:	987a2b5537254b1fe843eb798d7eb7f04dbe1e32fb827cfb9e1e1ef6c2096759
User & Date:	drh 2017-05-23 00:32:56

Context

2017-05-23
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:21		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: 92c17850 user: drh tags: trunk
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
2017-05-22
18:09		Fix incompatibilities between the "sqldiff --changeset" command and the sessions module. Specifically, allow sessions to process changesets containing tables with zero operations on them and have sqldiff output the expected output for tables with multi-column primary keys. check-in: 0bb23c48 user: dan tags: trunk

Changes

Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/main.c.

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