bk commit into 5.1 tree (tomas:1.2187) BUG#17763

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas 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.2187 06/02/28 12:27:53 tomas@stripped +3 -0
  Bug #17763 mysqld cores with list partitioning if update to missing partition
  - error string wrongly formatted

  sql/ha_ndbcluster.cc
    1.275 06/02/28 12:27:46 tomas@stripped +4 -1
    Bug #17763 mysqld cores with list partitioning if update to missing partition
    - error string wrongly formatted

  mysql-test/t/ndb_partition_error.test
    1.4 06/02/28 12:27:45 tomas@stripped +12 -0
    Bug #17763 mysqld cores with list partitioning if update to missing partition

  mysql-test/r/ndb_partition_error.result
    1.8 06/02/28 12:27:45 tomas@stripped +8 -0
    Bug #17763 mysqld cores with list partitioning if update to missing partition

# 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:	tomas
# Host:	poseidon.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1-new

--- 1.274/sql/ha_ndbcluster.cc	2006-02-26 15:03:40 +01:00
+++ 1.275/sql/ha_ndbcluster.cc	2006-02-28 12:27:46 +01:00
@@ -5988,8 +5988,11 @@
   DBUG_PRINT("enter", ("error = %d", error));
 
   if (error == HA_ERR_NO_PARTITION_FOUND)
+  {
+    char buf[100];
     my_error(ER_NO_PARTITION_FOR_GIVEN_VALUE, MYF(0),
-             (int)m_part_info->part_expr->val_int());
+             llstr(m_part_info->part_expr->val_int(), buf));
+  }
   else
     handler::print_error(error, errflag);
   DBUG_VOID_RETURN;

--- 1.7/mysql-test/r/ndb_partition_error.result	2005-11-23 21:44:53 +01:00
+++ 1.8/mysql-test/r/ndb_partition_error.result	2006-02-28 12:27:45 +01:00
@@ -28,3 +28,11 @@
 partition x2 values less than (10),
 partition x3 values less than (20));
 drop table t1;
+CREATE TABLE t1 (id INT) ENGINE=NDB
+PARTITION BY LIST(id)
+(PARTITION p0 VALUES IN (2, 4),
+PARTITION p1 VALUES IN (42, 142));
+INSERT INTO t1 VALUES (2);
+UPDATE t1 SET id=5 WHERE id=2;
+ERROR HY000: Table has no partition for value 5
+DROP TABLE t1;

--- 1.3/mysql-test/t/ndb_partition_error.test	2005-11-06 00:20:22 +01:00
+++ 1.4/mysql-test/t/ndb_partition_error.test	2006-02-28 12:27:45 +01:00
@@ -44,3 +44,15 @@
  partition x3 values less than (20));
 
 drop table t1;
+
+#
+# Bug #17763 mysqld cores with list partitioning if update to missing partition
+#
+CREATE TABLE t1 (id INT) ENGINE=NDB
+  PARTITION BY LIST(id)
+   (PARTITION p0 VALUES IN (2, 4),
+    PARTITION p1 VALUES IN (42, 142));
+INSERT INTO t1 VALUES (2);
+--error ER_NO_PARTITION_FOR_GIVEN_VALUE
+UPDATE t1 SET id=5 WHERE id=2;
+DROP TABLE t1;