From: Date: January 18 2006 4:27pm
Subject: bk commit into 5.1 tree (holyfoot:1.2072) BUG#15910
List-Archive: http://lists.mysql.com/commits/1268
X-Bug: 15910
Message-Id: <200601181527.k0IFRI1L027968@localhost.localdomain>

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
  1.2072 06/01/18 19:27:10 holyfoot@deer.(none) +2 -0
  bug #15910 (Wrong value on error message)

  sql/share/errmsg.txt
    1.73 06/01/18 19:25:48 holyfoot@stripped +1 -1
    %ld to %s

  sql/ha_partition.cc
    1.23 06/01/18 19:25:48 holyfoot@stripped +4 -1
    using llstr to covert lonlong to string

# 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:	holyfoot
# Host:	deer.(none)
# Root:	/home/hf/work/mysql-5.1.15910

--- 1.72/sql/share/errmsg.txt	Tue Jan 17 11:37:26 2006
+++ 1.73/sql/share/errmsg.txt	Wed Jan 18 19:25:48 2006
@@ -5738,7 +5738,7 @@
 ER_WRONG_VALUE
 	eng "Incorrect %-.32s value: '%-.128s'"
 ER_NO_PARTITION_FOR_GIVEN_VALUE
-	eng "Table has no partition for value %ld"
+	eng "Table has no partition for value %-.64s"
 ER_TABLESPACE_OPTION_ONLY_ONCE
         eng "It is not allowed to specify %s more than once"
 ER_CREATE_TABLESPACE_FAILED

--- 1.22/sql/ha_partition.cc	Tue Jan 17 12:24:49 2006
+++ 1.23/sql/ha_partition.cc	Wed Jan 18 19:25:48 2006
@@ -5009,8 +5009,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),
-             m_part_info->part_expr->val_int());
+             llstr(m_part_info->part_expr->val_int(), buf));
+  }
   else
     m_file[0]->print_error(error, errflag);
   DBUG_VOID_RETURN;