/ Check-in [eaa34626]
Login

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

Overview
Comment:Fix a minor error in a test script, and harmless compiler warnings in the CLI code.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: eaa34626e497d3af132dd8f13eddbbda89365d369ed43212a5f788175b3d6198
User & Date: drh 2019-06-13 13:52:46
Context
2019-06-13
14:07
Do not use the %lld printf conversion in the platform printf() as some legacy platforms do not support it. check-in: f8696b60 user: drh tags: trunk
13:52
Fix a minor error in a test script, and harmless compiler warnings in the CLI code. check-in: eaa34626 user: drh tags: trunk
2019-06-12
22:46
Adjust requirements marks and add new requirements tests. check-in: ebb81dad user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/shell.c.in.

  6558   6558     RecoverTable *pOrphan = 0;
  6559   6559   
  6560   6560     int bFreelist = 1;              /* 0 if --freelist-corrupt is specified */
  6561   6561     for(i=1; i<nArg; i++){
  6562   6562       char *z = azArg[i];
  6563   6563       int n;
  6564   6564       if( z[0]=='-' && z[1]=='-' ) z++;
  6565         -    n = strlen(z);
         6565  +    n = strlen30(z);
  6566   6566       if( n<=17 && memcmp("-freelist-corrupt", z, n)==0 ){
  6567   6567         bFreelist = 0;
  6568   6568       }else
  6569   6569       if( n<=12 && memcmp("-recovery-db", z, n)==0 && i<(nArg-1) ){
  6570   6570         i++;
  6571   6571         zRecoveryDb = azArg[i];
  6572   6572       }else
................................................................................
  7295   7295      /* { "pragma",         SQLITE_FCNTL_PRAGMA,          "NAME ARG"       },*/
  7296   7296         { "tempfilename",   SQLITE_FCNTL_TEMPFILENAME,    ""               },
  7297   7297         { "has_moved",      SQLITE_FCNTL_HAS_MOVED,       ""               },  
  7298   7298         { "lock_timeout",   SQLITE_FCNTL_LOCK_TIMEOUT,    "MILLISEC"       },
  7299   7299       };
  7300   7300       int filectrl = -1;
  7301   7301       int iCtrl = -1;
  7302         -    sqlite3_int64 iRes;  /* Integer result to display if rc2==1 */
  7303         -    int isOk = 0;        /* 0: usage  1: %lld  2: no-result */
         7302  +    sqlite3_int64 iRes = 0;  /* Integer result to display if rc2==1 */
         7303  +    int isOk = 0;            /* 0: usage  1: %lld  2: no-result */
  7304   7304       int n2, i;
  7305   7305       const char *zCmd = 0;
  7306   7306   
  7307   7307       open_db(p, 0);
  7308   7308       zCmd = nArg>=2 ? azArg[1] : "help";
  7309   7309   
  7310   7310       /* The argument can optionally begin with "-" or "--" */

Changes to test/altertab3.test.

   200    200     {CREATE INDEX i2 ON t2((LIKELIHOOD(c0, 100) IN ()))}
   201    201   }
   202    202   do_test 8.2.3 {
   203    203     sqlite3 db2 test.db
   204    204     db2 eval { INSERT INTO t2 VALUES (1), (2), (3) }
   205    205     db close
   206    206   } {}
          207  +db2 close
   207    208   
   208    209   #-------------------------------------------------------------------------
   209    210   reset_db
   210    211   do_execsql_test 9.1 {
   211    212     CREATE TABLE t1(a,b,c);
   212    213     CREATE TRIGGER AFTER INSERT ON t1 WHEN new.a NOT NULL BEGIN
   213    214       SELECT true WHERE (SELECT a, b FROM (t1)) IN ();
................................................................................
   216    217   
   217    218   do_execsql_test 9.2 {
   218    219     ALTER TABLE t1 RENAME TO t1x;
   219    220   }
   220    221   
   221    222   
   222    223   finish_test
   223         -
   224         -