bzr push into mysql-trunk branch (tor.didriksen:3534 to 3535) WL#5957

[Tor Didriksen]

 3535 Tor Didriksen	2012-01-27
      WL#5957 post-push fix: always initialize RANGE_OPT_PARAM.use_index_statistics, since check_quick_select() may not always do it

    modified:
      sql/opt_range.cc
 3534 Roy Lyseng	2012-01-27 [merge]
      Bug#13596176: Missing row on select with nested in clause when matr=on
                    and bnl=off + MyISAM
      
      Minor post-push fixes:
      
      Added EXPLAIN to test cases.
      
      Fixed two comment typos.
      
      Additional commit comment to update_depend_map() in sql_optimizer.cc
      
      The loop in this function that shifts depend_map had to mask out
      all pseudo bits, not only OUTER_REF_TABLE_BIT, because otherwise
      the process might crash.

    modified:
      mysql-test/include/subquery_sj.inc
      mysql-test/r/subquery_sj_all.result
      mysql-test/r/subquery_sj_all_bka.result
      mysql-test/r/subquery_sj_all_bka_nixbnl.result
      mysql-test/r/subquery_sj_all_bkaunique.result
      mysql-test/r/subquery_sj_dupsweed.result
      mysql-test/r/subquery_sj_dupsweed_bka.result
      mysql-test/r/subquery_sj_dupsweed_bka_nixbnl.result
      mysql-test/r/subquery_sj_dupsweed_bkaunique.result
      mysql-test/r/subquery_sj_firstmatch.result
      mysql-test/r/subquery_sj_firstmatch_bka.result
      mysql-test/r/subquery_sj_firstmatch_bka_nixbnl.result
      mysql-test/r/subquery_sj_firstmatch_bkaunique.result
      mysql-test/r/subquery_sj_loosescan.result
      mysql-test/r/subquery_sj_loosescan_bka.result
      mysql-test/r/subquery_sj_loosescan_bka_nixbnl.result
      mysql-test/r/subquery_sj_loosescan_bkaunique.result
      mysql-test/r/subquery_sj_mat.result
      mysql-test/r/subquery_sj_mat_bka.result
      mysql-test/r/subquery_sj_mat_bka_nixbnl.result
      mysql-test/r/subquery_sj_mat_bkaunique.result
      mysql-test/r/subquery_sj_mat_nosj.result
      mysql-test/r/subquery_sj_none.result
      mysql-test/r/subquery_sj_none_bka.result
      mysql-test/r/subquery_sj_none_bka_nixbnl.result
      mysql-test/r/subquery_sj_none_bkaunique.result
      sql/sql_select.cc
=== modified file 'sql/opt_range.cc'
--- a/sql/opt_range.cc	2012-01-26 13:09:59 +0000
+++ b/sql/opt_range.cc	2012-01-27 13:38:26 +0000
@@ -2579,6 +2579,7 @@ int SQL_SELECT::test_quick_select(THD *t
     param.remove_jump_scans= TRUE;
     param.force_default_mrr= (interesting_order != ORDER::ORDER_NOT_RELEVANT);
     param.order_direction= interesting_order;
+    param.use_index_statistics= false;
 
     thd->no_errors=1;				// Don't warn about NULL
     init_sql_alloc(&alloc, thd->variables.range_alloc_block_size, 0);

No bundle (reason: useless for push emails).