/ Check-in [4d74fccf]

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

Comment:Fix a typo in a collating function inside the e_reindex.test script.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 4d74fccf02134a998a84097b021ba9d501e34ff0
User & Date: drh 2013-06-03 20:39:15
Up until now the fts4 "unicode61" tokenizer has treated all private use codepoints except the first and last of each of the three ranges as alphanumeric (eligible to be part of tokens). This commit fixes this so that all private use codepoints are considered alphanumeric. In other words, it fixes the handling of codepoints 0xE000, 0xF8FF, 0xF0000, 0xFFFFD, 0x100000 and 0x10FFFD. (check-in: 6cfd9af5 user: dan tags: trunk)
Pull in recent trunk changes. Fix the ORDER BY optimizer so that it is better able to deal with COLLATE clauses. Clean up ambiguities in the descidx1.test script. (check-in: 6bc71dfc user: drh tags: nextgen-query-plan-exp)
Fix a typo in a collating function inside the e_reindex.test script. (check-in: 4d74fccf user: drh tags: trunk)
Enhance the shell to provide more flexibility when entering numeric arguments on dot-commands. In particular, allow hexadecimal arguments to .wheretrace and .testctrl commands. Cherrypick from [b9578c371ee5]. (check-in: 3bd5ad09 user: drh tags: trunk)
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to test/e_reindex.test.

    94     94     set res [expr {[string length $lhs] - [string length $rhs]}]
    95     95     if {$res!=0} {return $res}
    96     96     return [string compare $lhs $rhs]
    97     97   }
    98     98   array set V {one 1 two 2 three 3 four 4 five 5 six 6 seven 7 eight 8}
    99     99   proc sort_by_value {lhs rhs} {
   100    100     global V
   101         -  set res [expr {$V($lhs) - $V(rhs)}]
          101  +  set res [expr {$V($lhs) - $V($rhs)}]
   102    102     if {$res!=0} {return $res}
   103    103     return [string compare $lhs $rhs]
   104    104   }
   105    105   
   106    106   db collate collA sort_by_length
   107    107   db collate collB sort_by_value
   108    108