Commit 65367cfc authored by unknown's avatar unknown

Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new

into debian.(none):/M51/mysql-5.1

parents 202b1559 4475baa2
...@@ -5009,8 +5009,11 @@ void ha_partition::print_error(int error, myf errflag) ...@@ -5009,8 +5009,11 @@ void ha_partition::print_error(int error, myf errflag)
DBUG_PRINT("enter", ("error = %d", error)); DBUG_PRINT("enter", ("error = %d", error));
if (error == HA_ERR_NO_PARTITION_FOUND) if (error == HA_ERR_NO_PARTITION_FOUND)
{
char buf[100];
my_error(ER_NO_PARTITION_FOR_GIVEN_VALUE, MYF(0), 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 else
m_file[0]->print_error(error, errflag); m_file[0]->print_error(error, errflag);
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
......
...@@ -5738,7 +5738,7 @@ ER_PLUGIN_IS_NOT_LOADED ...@@ -5738,7 +5738,7 @@ ER_PLUGIN_IS_NOT_LOADED
ER_WRONG_VALUE ER_WRONG_VALUE
eng "Incorrect %-.32s value: '%-.128s'" eng "Incorrect %-.32s value: '%-.128s'"
ER_NO_PARTITION_FOR_GIVEN_VALUE 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 ER_TABLESPACE_OPTION_ONLY_ONCE
eng "It is not allowed to specify %s more than once" eng "It is not allowed to specify %s more than once"
ER_CREATE_TABLESPACE_FAILED ER_CREATE_TABLESPACE_FAILED
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment