bk commit into 5.1 tree (jimw:1.2118) BUG#16782

[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.2118 06/02/01 11:28:38 jimw@stripped +3 -0
  Fix crash in handling REPLACE on a partitioned table. (Bug #16782)

  sql/ha_partition.cc
    1.27 06/02/01 11:28:34 jimw@stripped +3 -2
    Fix list of table flags that are not passed through for partitioned
    tables, and add HA_DUPP_POS to that list. Also, handle HA_EXTRA_FLUSH_CACHE
    in ha_partition::extra().

  mysql-test/t/partition.test
    1.12 06/02/01 11:28:34 jimw@stripped +10 -0
    Add regression test

  mysql-test/r/partition.result
    1.11 06/02/01 11:28:34 jimw@stripped +6 -0
    Add new results

# 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-16782

--- 1.10/mysql-test/r/partition.result	2006-01-18 02:56:17 -08:00
+++ 1.11/mysql-test/r/partition.result	2006-02-01 11:28:34 -08:00
@@ -278,3 +278,9 @@
 insert into t1 values (10,1);
 ERROR HY000: Table has no partition for value 11
 drop table t1;
+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.11/mysql-test/t/partition.test	2006-01-18 03:09:00 -08:00
+++ 1.12/mysql-test/t/partition.test	2006-02-01 11:28:34 -08:00
@@ -353,3 +353,13 @@
 
 drop table t1;
 
+#
+# 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.26/sql/ha_partition.cc	2006-01-28 16:22:28 -08:00
+++ 1.27/sql/ha_partition.cc	2006-02-01 11:28:34 -08:00
@@ -382,8 +382,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);
 }
@@ -4688,6 +4688,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));