Merge mysql.com:/home/jimw/my/mysql-5.1-14673

into  mysql.com:/home/jimw/my/mysql-5.1-clean


mysql-test/r/partition.result:
  SCCS merged
mysql-test/t/partition.test:
  SCCS merged

1 files changed, 16 insertions, 0 deletions

diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc
index 14fa9f0393c..60a31d97649 100644
--- a/sql/ha_partition.cc
+++ b/sql/ha_partition.cc
@@ -5115,6 +5115,22 @@ const char *ha_partition::index_type(uint inx)
 }
 
 
+enum row_type ha_partition::get_row_type() const
+{
+  handler **file;
+  enum row_type type= (*m_file)->get_row_type();
+
+  for (file= m_file, file++; *file; file++)
+  {
+    enum row_type part_type= (*file)->get_row_type();
+    if (part_type != type)
+      return ROW_TYPE_NOT_USED;
+  }
+
+  return type;
+}
+
+
 void ha_partition::print_error(int error, myf errflag)
 {
   DBUG_ENTER("ha_partition::print_error");