database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Bug #21072 Duplicate key error in NDB references wrong key: use MAX_KEY to signal unknown key

Browse Source
This commit is contained in:
mskold/marty@mysql.com/linux.site
2006-09-21 16:49:07 +02:00
parent 9411472695
commit 42d64e4275
5 changed files with 31 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
sql/handler.cc
View File

@@ -1102,12 +1102,22 @@ void handler::print_error(int error, myf errflag)
/* Write the dupplicated key in the error message */
char key[MAX_KEY_LENGTH];
String str(key,sizeof(key),system_charset_info);
key_unpack(&str,table,(uint) key_nr);
uint max_length=MYSQL_ERRMSG_SIZE-(uint) strlen(ER(ER_DUP_ENTRY));
if (str.length() >= max_length)
if (key_nr == MAX_KEY)
{
str.length(max_length-4);
str.append("...");
/* Key is unknown */
str.length(0);
key_nr= -1;
}
else
{
key_unpack(&str,table,(uint) key_nr);
uint max_length=MYSQL_ERRMSG_SIZE-(uint) strlen(ER(ER_DUP_ENTRY));
if (str.length() >= max_length)
{
str.length(max_length-4);
str.append("...");
}
}
my_error(ER_DUP_ENTRY,MYF(0),str.c_ptr(),key_nr+1);
DBUG_VOID_RETURN;