From 8f69764b756335587e9ae36c55c09d43cf93b754 Mon Sep 17 00:00:00 2001
From: Sergey Petrunya <psergey@askmonty.org>
Date: Sun, 17 Jan 2010 18:01:59 +0300
Subject: [PATCH] Fix incorrect merge

---
 sql/sql_select.cc | 40 +---------------------------------------
 1 file changed, 1 insertion(+), 39 deletions(-)

diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 5b15f80494c..f9e77779204 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -14587,6 +14587,7 @@ TABLE *create_duplicate_weedout_tmp_table(THD *thd,
                         &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)
@@ -16088,45 +16089,6 @@ sub_select(JOIN *join,JOIN_TAB *join_tab,bool end_of_records)
 }
 
 
-/*
-  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);
-    }
-  }
-
-
 /*
   SemiJoinDuplicateElimination: Weed out duplicate row combinations