List:Commits« Previous MessageNext Message »
From:holyfoot Date:January 13 2006 1:37pm
Subject:bk commit into 5.1 tree (holyfoot:1.2052) BUG#15910
View as plain text  
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.2052 06/01/13 17:37:02 holyfoot@deer.(none) +2 -0
  bug #15910 (Wrong value in error message)

  sql/share/errmsg.txt
    1.72 06/01/13 17:35:29 holyfoot@stripped +1 -1
    string parameter instead of %ld

  sql/ha_partition.cc
    1.21 06/01/13 17:35:29 holyfoot@stripped +7 -2
    now we convert lonlong to string using our String class

# 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.71/sql/share/errmsg.txt	Thu Jan 12 13:04:54 2006
+++ 1.72/sql/share/errmsg.txt	Fri Jan 13 17:35:29 2006
@@ -5726,7 +5726,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.20/sql/ha_partition.cc	Wed Jan 11 12:26:01 2006
+++ 1.21/sql/ha_partition.cc	Fri Jan 13 17:35:29 2006
@@ -3005,8 +3005,13 @@
   /* Should probably look for my own errors first */
   /* monty: needs to be called for the last used partition ! */
   if (error == HA_ERR_NO_PARTITION_FOUND)
-    my_error(ER_NO_PARTITION_FOR_GIVEN_VALUE, MYF(0),
-             m_part_info->part_expr->val_int());
+  {
+    char buf[100];
+    String tmp(buf, sizeof(buf), &my_charset_latin1);
+    tmp.set(m_part_info->part_expr->val_int(), &my_charset_latin1);
+    tmp.chop();
+    my_error(ER_NO_PARTITION_FOR_GIVEN_VALUE, MYF(0), tmp.ptr());
+  }
   else
     m_file[0]->print_error(error, errflag);
   DBUG_VOID_RETURN;
Thread
bk commit into 5.1 tree (holyfoot:1.2052) BUG#15910holyfoot13 Jan