Fossil

Check-in [3f5defebeb]
Login

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

Overview
Comment:re-apply [963c950cd6ac8cc8b9503f20a90ffac8e383c1de|963c950cd6]: for pre-3.8.7 compatibility (needed with configure --disable-internal-sqlite)
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 3f5defebebdecedea6d1848d81d418cb7f55a0ab
User & Date: jan.nijtmans 2014-11-12 14:16:48.638
Context
2014-11-12
14:37
Fix [5a0a33f31a]: Chinese commit message File in code UTF-8 when using commit -M under WINDOWS Garbled. When the file is already detected to be valid UTF-8, don't try to do any conversion. check-in: 5960016a3d user: jan.nijtmans tags: trunk
14:16
re-apply [963c950cd6ac8cc8b9503f20a90ffac8e383c1de|963c950cd6]: for pre-3.8.7 compatibility (needed with configure --disable-internal-sqlite) check-in: 3f5defebeb user: jan.nijtmans tags: trunk
2014-11-11
20:25
Update to the 3.8.8 alpha of SQLite for testing (of SQLite). check-in: 6b2f0b209f user: drh tags: trunk
2014-10-30
15:26
Revert to SQLite trunk's version of shell.c (3.8.7.1 missed a bug-fix already there). Re-add some lines needed for pre-3.8.7 compatibility (needed with configure --disable-internal-sqlite). check-in: 963c950cd6 user: jan.nijtmans tags: trunk
Changes
Unified Diff Ignore Whitespace Patch
Changes to src/shell.c.
1426
1427
1428
1429
1430
1431
1432











1433
1434
1435
1436
1437
1438
1439
            fprintf(pArg->out,"%d,", sqlite3_column_int(pExplain, 2));
            fprintf(pArg->out,"%s\n", sqlite3_column_text(pExplain, 3));
          }
        }
        sqlite3_finalize(pExplain);
        sqlite3_free(zEQP);
      }












      /* If the shell is currently in ".explain" mode, gather the extra
      ** data required to add indents to the output.*/
      if( pArg && pArg->mode==MODE_Explain ){
        explain_data_prepare(pArg, pStmt);
      }








>
>
>
>
>
>
>
>
>
>
>







1426
1427
1428
1429
1430
1431
1432
1433
1434
1435
1436
1437
1438
1439
1440
1441
1442
1443
1444
1445
1446
1447
1448
1449
1450
            fprintf(pArg->out,"%d,", sqlite3_column_int(pExplain, 2));
            fprintf(pArg->out,"%s\n", sqlite3_column_text(pExplain, 3));
          }
        }
        sqlite3_finalize(pExplain);
        sqlite3_free(zEQP);
      }

#if USE_SYSTEM_SQLITE+0==1
      /* Output TESTCTRL_EXPLAIN text of requested */
      if( pArg && pArg->mode==MODE_Explain && sqlite3_libversion_number()<3008007 ){
        const char *zExplain = 0;
        sqlite3_test_control(SQLITE_TESTCTRL_EXPLAIN_STMT, pStmt, &zExplain);
        if( zExplain && zExplain[0] ){
          fprintf(pArg->out, "%s", zExplain);
        }
      }
#endif

      /* If the shell is currently in ".explain" mode, gather the extra
      ** data required to add indents to the output.*/
      if( pArg && pArg->mode==MODE_Explain ){
        explain_data_prepare(pArg, pStmt);
      }