SOURCES: mysql-bug-34945.patch - adjust for 5.1.23

[arekm]

Author: arekm                        Date: Wed Apr  9 17:08:54 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- adjust for 5.1.23

---- Files affected:
SOURCES:
   mysql-bug-34945.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/mysql-bug-34945.patch
diff -u SOURCES/mysql-bug-34945.patch:1.1 SOURCES/mysql-bug-34945.patch:1.2
--- SOURCES/mysql-bug-34945.patch:1.1	Wed Apr  9 19:03:42 2008
+++ SOURCES/mysql-bug-34945.patch	Wed Apr  9 19:08:48 2008
@@ -86,10 +86,10 @@
 diff -Nrup a/sql/sql_select.cc b/sql/sql_select.cc
 --- a/sql/sql_select.cc	2008-02-29 14:02:47 +03:00
 +++ b/sql/sql_select.cc	2008-03-03 20:35:38 +03:00
-@@ -11173,19 +11173,42 @@ join_read_key(JOIN_TAB *tab)
+@@ -11491,6 +11491,24 @@
+   return table->status ? -1 : 0;
  }
  
- 
 +/*
 +  ref access method implementation: "read_first" function
 +
@@ -99,19 +99,19 @@
 +
 +  DESCRIPTION
 +    This is "read_fist" function for the "ref" access method.
-+   
++
 +    The functon must leave the index initialized when it returns.
 +    ref_or_null access implementation depends on that.
 +
 +  RETURN
 +    0  - Ok
-+   -1  - Row not found 
++   -1  - Row not found
 +    1  - Error
 +*/
-+
+ 
  static int
  join_read_always_key(JOIN_TAB *tab)
- {
+@@ -11498,14 +11516,15 @@
    int error;
    TABLE *table= tab->table;
  
@@ -126,9 +126,8 @@
          return -1;
 -  } 
 -  if (!table->file->inited)
--    table->file->ha_index_init(tab->ref.key);
-+  }
-+
-   if (cp_buffer_from_ref(tab->join->thd, &tab->ref))
+-  {
+-    table->file->ha_index_init(tab->ref.key, tab->sorted);
+   }
+   if (cp_buffer_from_ref(tab->join->thd, table, &tab->ref))
      return -1;
-   if ((error=table->file->index_read(table->record[0],
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/mysql-bug-34945.patch?r1=1.1&r2=1.2&f=u