maria-developers team mailing list archive

[Sergey Petrunya <psergey@xxxxxxxxxxxx>]

At file:///home/psergey/dev/maria-5.3-subqueries-r2/

------------------------------------------------------------
revno: 2746
revision-id: psergey@xxxxxxxxxxxx-20100117150159-8twf2i8rdek9kexq
parent: psergey@xxxxxxxxxxxx-20100117145508-8xclgicfyqr82i78
committer: Sergey Petrunya <psergey@xxxxxxxxxxxx>
branch nick: maria-5.3-subqueries-r2
timestamp: Sun 2010-01-17 18:01:59 +0300
message:
  Fix incorrect merge
=== modified file 'sql/sql_select.cc'
--- a/sql/sql_select.cc	2010-01-17 14:55:08 +0000
+++ b/sql/sql_select.cc	2010-01-17 15:01:59 +0000
@@ -14587,6 +14587,7 @@
                         &tmpname, (uint) strlen(path)+1,
                         &group_buff, (!using_unique_constraint ?
                                       uniq_tuple_length_arg : 0),
+                        &bitmaps, bitmap_buffer_size(1)*3,
                         NullS))
   {
     if (temp_pool_slot != MY_BIT_NONE)
@@ -16126,45 +16127,6 @@
     }
   }
 
-
-/*
-  SemiJoinDuplicateElimination: Weed out duplicate row combinations
-
-  SYNPOSIS
-    do_sj_dups_weedout()
-      thd    Thread handle
-      sjtbl  Duplicate weedout table
-
-  DESCRIPTION
-    Try storing current record combination of outer tables (i.e. their
-    rowids) in the temporary table. This records the fact that we've seen 
-    this record combination and also tells us if we've seen it before.
-
-  RETURN
-    -1  Error
-    1   The row combination is a duplicate (discard it)
-    0   The row combination is not a duplicate (continue)
-*/
-
-int do_sj_dups_weedout(THD *thd, SJ_TMP_TABLE *sjtbl) 
-{
-  int error;
-  SJ_TMP_TABLE::TAB *tab= sjtbl->tabs;
-  SJ_TMP_TABLE::TAB *tab_end= sjtbl->tabs_end;
-
-  DBUG_ENTER("do_sj_dups_weedout");
-
-  if (sjtbl->is_confluent)
-  {
-    if (sjtbl->have_confluent_row) 
-      DBUG_RETURN(1);
-    else
-    {
-      sjtbl->have_confluent_row= TRUE;
-      DBUG_RETURN(0);
-    }
-  }
-
   uchar *ptr= sjtbl->tmp_table->record[0] + 1;
   uchar *nulls_ptr= ptr;