Merge the skip-scan enhancement into trunk.

FossilOrigin-Name: b0bb975c0986fe01f1184c1d4888fe397174ad0f

1 files changed, 5 insertions, 4 deletions

diff --git a/src/shell.c b/src/shell.c
index 676175081..61df7d6d5 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -1173,9 +1173,10 @@ static int str_in_array(const char *zStr, const char **azArray){
 **       all opcodes that occur between the p2 jump destination and the opcode
 **       itself by 2 spaces.
 **
-**     * For each "Goto", if the jump destination is a "Yield" instruction
-**       that occurs earlier in the program than the Goto itself, indent
-**       all opcodes between the "Yield" and "Goto" by 2 spaces.
+**     * For each "Goto", if the jump destination is a "Yield", "SeekGt",
+**       or "SeekLt" instruction that occurs earlier in the program than
+**       the Goto itself, indent all opcodes between the earlier instruction
+**       and "Goto" by 2 spaces.
 */
 static void explain_data_prepare(struct callback_data *p, sqlite3_stmt *pSql){
   const char *zSql;               /* The text of the SQL statement */
@@ -1185,7 +1186,7 @@ static void explain_data_prepare(struct callback_data *p, sqlite3_stmt *pSql){
   int iOp;
 
   const char *azNext[] = { "Next", "Prev", "VPrev", "VNext", 0 };
-  const char *azYield[] = { "Yield", 0 };
+  const char *azYield[] = { "Yield", "SeekLt", "SeekGt", 0 };
   const char *azGoto[] = { "Goto", 0 };
 
   /* Try to figure out if this is really an EXPLAIN statement. If this