bk commit into 5.2 tree (sergefp:1.2589)

[Sergey Petrunia]

Below is the list of changes that have just been committed into a local
5.2 repository of psergey. When psergey does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-10-22 16:28:00+04:00, sergefp@stripped +1 -0
  WL#2771: Batched Key Access: batching semi-join FirstMatch strategy:
   - Fixes for the initial implementation

  sql/sql_select.cc@stripped, 2007-10-22 16:27:56+04:00, sergefp@stripped +6 -3
    WL#2771: Batched Key Access: batching semi-join FirstMatch strategy:
     - Fixes for the initial implementation

diff -Nrup a/sql/sql_select.cc b/sql/sql_select.cc
--- a/sql/sql_select.cc	2007-10-20 20:04:55 +04:00
+++ b/sql/sql_select.cc	2007-10-22 16:27:56 +04:00
@@ -16684,7 +16684,8 @@ JOIN_CACHE_BKA::join_records(bool skip_l
   if (!file->inited)
     file->ha_index_init(join_tab->ref.key, 1);
   uint mrr_mode= 0;
-  if (join_tab->emb_sj_nest->sj_inner_tables == join_tab->table->map &&
+  if (join_tab->emb_sj_nest && 
+      join_tab->emb_sj_nest->sj_inner_tables == join_tab->table->map &&
       join_tab->do_firstmatch == join_tab - 1)
     mrr_mode= HA_MRR_SEMI_JOIN;
   error= file->multi_range_read_init(&seq_funcs, (void*)this, records,
@@ -16707,8 +16708,10 @@ JOIN_CACHE_BKA::join_records(bool skip_l
     {
       get_record_by_pos(rec_ptr);
       if ((!join_tab->select || !join_tab->select->skip_record()) &&
-          (!(join_tab->emb_sj_nest->sj_inner_tables == join_tab->table->map &&
-               join_tab->do_firstmatch == join_tab - 1) || !get_match_flag()))
+          (!join_tab->emb_sj_nest || 
+           !(join_tab->emb_sj_nest->sj_inner_tables == join_tab->table->map &&
+               join_tab->do_firstmatch == join_tab - 1) ||
+           !get_match_flag()))
       {
         int res= 0;
         set_match_flag(1);