made MatchGeneric[2345]_fn stable (ie. added missing implicit id asc to 2..5-column ORDER BY clauses), rebuilt and verified affected tests

git-svn-id: http://sphinxsearch.googlecode.com/svn/trunk@3913 8b96e2b9-35c5-2c16-bc47-5122d61876d4
fixed test query picker vs mixed api/sql tests

git-svn-id: http://sphinxsearch.googlecode.com/svn/trunk@3914 8b96e2b9-35c5-2c16-bc47-5122d61876d4