bk commit into 5.1 tree (holyfoot:1.2574)

[holyfoot]

Below is the list of changes that have just been committed into a local
5.1 repository of hf. When hf 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-08-24 21:36:51+05:00, holyfoot@stripped +3 -0
  ha_partition.cc, ha_partition.h:
    bug fixed
  partition_pruning.result:
    test fixed

  mysql-test/r/partition_pruning.result@stripped, 2007-08-24 21:23:27+05:00,
holyfoot@stripped +2 -2
    test fixed

  sql/ha_partition.cc@stripped, 2007-08-24 21:23:50+05:00, holyfoot@stripped +14 -1
    bug fixed

  sql/ha_partition.h@stripped, 2007-08-24 21:24:15+05:00, holyfoot@stripped +1 -0
    bug fixed

diff -Nrup a/mysql-test/r/partition_pruning.result b/mysql-test/r/partition_pruning.result
--- a/mysql-test/r/partition_pruning.result	2007-06-13 20:28:57 +05:00
+++ b/mysql-test/r/partition_pruning.result	2007-08-24 21:23:27 +05:00
@@ -631,7 +631,7 @@ flush status;
 delete from t2 where b > 5;
 show status like 'Handler_read_rnd_next';
 Variable_name	Value
-Handler_read_rnd_next	1215
+Handler_read_rnd_next	1115
 show status like 'Handler_read_key';
 Variable_name	Value
 Handler_read_key	0
@@ -645,7 +645,7 @@ flush status;
 delete from t2 where b < 5 or b > 3;
 show status like 'Handler_read_rnd_next';
 Variable_name	Value
-Handler_read_rnd_next	1215
+Handler_read_rnd_next	1115
 show status like 'Handler_read_key';
 Variable_name	Value
 Handler_read_key	0
diff -Nrup a/sql/ha_partition.cc b/sql/ha_partition.cc
--- a/sql/ha_partition.cc	2007-08-13 18:11:10 +05:00
+++ b/sql/ha_partition.cc	2007-08-24 21:23:50 +05:00
@@ -3216,9 +3216,14 @@ end_dont_reset_start_part:
 
 void ha_partition::position(const uchar *record)
 {
-  handler *file= m_file[m_last_part];
+  handler *file;
   DBUG_ENTER("ha_partition::position");
 
+  if (unlikely(get_part_for_delete(record, m_rec0, m_part_info, &m_last_part)))
+    m_last_part= 0;
+
+  file= m_file[m_last_part];
+
   file->position(record);
   int2store(ref, m_last_part);
   memcpy((ref + PARTITION_BYTES_IN_POS), file->ref,
@@ -3232,6 +3237,14 @@ void ha_partition::position(const uchar 
 #endif
   DBUG_VOID_RETURN;
 }
+
+
+void ha_partition::column_bitmaps_signal()
+{
+    handler::column_bitmaps_signal();
+    bitmap_union(table->read_set, &m_part_info->full_part_field_set);
+}
+ 
 
 /*
   Read row using position
diff -Nrup a/sql/ha_partition.h b/sql/ha_partition.h
--- a/sql/ha_partition.h	2007-08-13 18:11:10 +05:00
+++ b/sql/ha_partition.h	2007-08-24 21:24:15 +05:00
@@ -449,6 +449,7 @@ private:
   int handle_ordered_next(uchar * buf, bool next_same);
   int handle_ordered_prev(uchar * buf);
   void return_top_record(uchar * buf);
+  void column_bitmaps_signal();
 public:
   /*
     -------------------------------------------------------------------------