mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 03:51:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge bk@192.168.21.1:mysql-5.1-new

Browse source 
into mysql.com:/home/hf/work/mysql-5.1.15910
This commit is contained in:
unknown 2006-01-18 21:53:03 +04:00
commit 4475baa253
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
sql/ha_partition.cc
View file

@ -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;

2
sql/share/errmsg.txt
View file

@ -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