bk commit into 6.0 tree (cmiller:1.2499)

[Chad MILLER]

Below is the list of changes that have just been committed into a local
6.0 repository of cmiller. When cmiller 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-12-19 08:20:37-05:00, cmiller@stripped +3 -0
  sql_select.h, sql_select.cc, ha_ndbcluster.cc:
    Fix merge problem.

  sql/ha_ndbcluster.cc@stripped, 2007-12-18 12:34:29-05:00, cmiller@stripped +2 -1
    Fix merge problem.

  sql/sql_select.cc@stripped, 2007-12-18 12:34:29-05:00, cmiller@stripped +1 -1
    Fix merge problem.

  sql/sql_select.h@stripped, 2007-12-18 12:34:29-05:00, cmiller@stripped +0 -1
    Fix merge problem.

diff -Nrup a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc
--- a/sql/ha_ndbcluster.cc	2007-12-18 11:49:09 -05:00
+++ b/sql/ha_ndbcluster.cc	2007-12-18 12:34:29 -05:00
@@ -699,7 +699,8 @@ ha_ndbcluster::request_hidden_key(uchar 
 }
 
 /**
-  Instruct NDB to set the value of the hidden primary key.
+  Check if MySQL field type forces var part in ndb storage.
+*/
 static bool field_type_forces_var_part(enum_field_types type)
 {
   switch (type) {
diff -Nrup a/sql/sql_select.cc b/sql/sql_select.cc
--- a/sql/sql_select.cc	2007-12-18 11:49:10 -05:00
+++ b/sql/sql_select.cc	2007-12-18 12:34:29 -05:00
@@ -5238,6 +5238,7 @@ set_position(JOIN *join,uint idx,JOIN_TA
 }
 
 
+/*
   Given a semi-join nest, find out which of the IN-equalities are bound
 
   SYNOPSIS
@@ -5278,7 +5279,6 @@ ulonglong get_bound_sj_equalities(TABLE_
 }
 
 
-/*
 /**
   Find the best access path for an extension of a partial execution
   plan and add this path to the plan.
diff -Nrup a/sql/sql_select.h b/sql/sql_select.h
--- a/sql/sql_select.h	2007-12-18 11:49:10 -05:00
+++ b/sql/sql_select.h	2007-12-18 12:34:29 -05:00
@@ -414,7 +414,6 @@ public:
   JOIN_TAB *join_tab,**best_ref;
   JOIN_TAB **map2table;    ///< mapping between table indexes and JOIN_TABs
   JOIN_TAB *join_tab_save; ///< saved join_tab for subquery reexecution
-  JOIN_TAB *join_tab_save; ///< saved join_tab for subquery reexecution
   TABLE    **table,**all_tables;
   /**
     The table which has an index that allows to produce the requried ordering.