Merge bk@192.168.21.1:mysql-5.1-new

into mysql.com:/home/hf/work/mysql-5.1.15910

sql/ha_partition.cc

@@ -5009,8 +5009,11 @@ void ha_partition::print_error(int error, myf errflag)
   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;

sql/share/errmsg.txt

@@ -5738,7 +5738,7 @@ ER_PLUGIN_IS_NOT_LOADED
 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