SQLite: Check-in [b5cde571]

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

Overview

Comment:	In the command-line shell, if three or more interrupt signals (control-c) are received in a row without a response from sqlite3_interrupt() then call exit(1) immediately. This allows control-C to interrupt the shell even if it is stuck in a computation or loop that does not involve the VDBE.
Downloads:	Tarball \| ZIP archive \| SQL archive
Timelines:	family \| ancestors \| descendants \| both \| trunk
Files:	files \| file ages \| folders
SHA1:	b5cde57166fd874d00dec23d3a59bf3a23979fc5
User & Date:	drh 2014-05-23 12:03:47

Context

2014-05-23
17:17		Changes to the output of EXPLAIN QUERY PLAN to make it clearer when a query uses the PRIMARY KEY index of a WITHOUT ROWID table. check-in: 9268df30 user: dan tags: trunk
12:03		In the command-line shell, if three or more interrupt signals (control-c) are received in a row without a response from sqlite3_interrupt() then call exit(1) immediately. This allows control-C to interrupt the shell even if it is stuck in a computation or loop that does not involve the VDBE. check-in: b5cde571 user: drh tags: trunk
11:48		Make sure sufficient VDBE registers are allocated for an INSERT...SELECT when there is an idlist on the insert table that includes an explicit rowid. Ticket [e9654505cfda93610585fde5a9bbf2e730c8a8d5] check-in: 9a2dd187 user: drh tags: trunk

Changes

Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/shell.c.

   693    693   
   694    694   #ifdef SIGINT
   695    695   /*
   696    696   ** This routine runs when the user presses Ctrl-C
   697    697   */
   698    698   static void interrupt_handler(int NotUsed){
   699    699     UNUSED_PARAMETER(NotUsed);
   700         -  seenInterrupt = 1;
          700  +  seenInterrupt++;
          701  +  if( seenInterrupt>2 ) exit(1);
   701    702     if( db ) sqlite3_interrupt(db);
   702    703   }
   703    704   #endif
   704    705   
   705    706   /*
   706    707   ** This is the callback routine that the shell
   707    708   ** invokes for each row of a query result.