bk commit into 5.1 tree (jimw:1.2114)

[Jim Winstead]

Below is the list of changes that have just been committed into a local
5.1 repository of jimw. When jimw 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
  1.2114 06/02/15 11:39:54 jimw@stripped +3 -0
  Merge mysql.com:/home/jimw/my/mysql-5.1-16782
  into  mysql.com:/home/jimw/my/mysql-5.1-clean

  mysql-test/t/partition.test
    1.14 06/02/15 11:39:51 jimw@stripped +8 -10
    Resolve conflicts

  mysql-test/r/partition.result
    1.13 06/02/15 11:39:51 jimw@stripped +4 -6
    Resolve conflicts

  sql/ha_partition.cc
    1.30 06/02/15 11:37:45 jimw@stripped +0 -0
    Auto merged

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jimw
# Host:	rama.(none)
# Root:	/home/jimw/my/mysql-5.1-clean/RESYNC

--- 1.12/mysql-test/r/partition.result	2006-02-15 11:36:41 -08:00
+++ 1.13/mysql-test/r/partition.result	2006-02-15 11:39:51 -08:00
@@ -306,5 +306,9 @@
 (partition part1 values less than (1000)
 (subpartition subpart11 engine = memory));
 set session storage_engine='myisam';
+create table t1 (f_int1 integer, f_int2 integer, primary key (f_int1))
+partition by hash(f_int1) partitions 2;
+insert into t1 values (1,1),(2,2);
+replace into t1 values (1,1),(2,2);
 drop table t1;
 End of 5.1 tests

--- 1.13/mysql-test/t/partition.test	2006-02-15 11:36:41 -08:00
+++ 1.14/mysql-test/t/partition.test	2006-02-15 11:39:51 -08:00
@@ -390,6 +390,14 @@
   (partition part1 values less than (1000)
    (subpartition subpart11 engine = memory));
 set session storage_engine='myisam';
+
+#
+# Bug #16782: Crash using REPLACE on table with primary key
+#
+create table t1 (f_int1 integer, f_int2 integer, primary key (f_int1))
+  partition by hash(f_int1) partitions 2;
+insert into t1 values (1,1),(2,2);
+replace into t1 values (1,1),(2,2);
 drop table t1;
 
 --echo End of 5.1 tests

--- 1.29/sql/ha_partition.cc	2006-02-15 11:33:23 -08:00
+++ 1.30/sql/ha_partition.cc	2006-02-15 11:37:45 -08:00
@@ -360,7 +360,7 @@
     other parameters are calculated on demand.
     HA_FILE_BASED is always set for partition handler since we use a
     special file for handling names of partitions, engine types.
-    HA_CAN_GEOMETRY, HA_CAN_FULLTEXT, HA_CAN_SQL_HANDLER,
+    HA_CAN_GEOMETRY, HA_CAN_FULLTEXT, HA_CAN_SQL_HANDLER, HA_DUPP_POS,
     HA_CAN_INSERT_DELAYED is disabled until further investigated.
   */
   m_table_flags= m_file[0]->table_flags();
@@ -383,8 +383,8 @@
       m_pkey_is_clustered= FALSE;
     m_table_flags&= file->table_flags();
   } while (*(++file_array));
-  m_table_flags&= ~(HA_CAN_GEOMETRY & HA_CAN_FULLTEXT &
-                    HA_CAN_SQL_HANDLER & HA_CAN_INSERT_DELAYED);
+  m_table_flags&= ~(HA_CAN_GEOMETRY | HA_CAN_FULLTEXT | HA_DUPP_POS |
+                    HA_CAN_SQL_HANDLER | HA_CAN_INSERT_DELAYED);
   m_table_flags|= HA_FILE_BASED | HA_REC_NOT_IN_SEQ;
   DBUG_RETURN(0);
 }
@@ -4684,6 +4684,7 @@
   case HA_EXTRA_PREPARE_FOR_UPDATE:
   case HA_EXTRA_PREPARE_FOR_DELETE:
   case HA_EXTRA_FORCE_REOPEN:
+  case HA_EXTRA_FLUSH_CACHE:
   {
     if (m_myisam)
       DBUG_RETURN(loop_extra(operation));