database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge bk@192.168.21.1:mysql-5.1-new

Browse Source 
into mysql.com:/home/hf/work/mysql-5.1.14573
This commit is contained in:
holyfoot@mysql.com
2006-05-14 20:56:22 +05:00
parent a70bfd6c69 0eb13967b5
commit 250e07b652
6 changed files with 54 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sql/sql_table.cc
View File

@ -6332,6 +6332,20 @@ copy_data_between_tables(TABLE *from,TABLE *to,
(error != HA_ERR_FOUND_DUPP_KEY &&
error != HA_ERR_FOUND_DUPP_UNIQUE))
{
if (error == HA_ERR_FOUND_DUPP_KEY)
{
uint key_nr= to->file->get_dup_key(error);
if ((int) key_nr >= 0)
{
const char *err_msg= ER(ER_DUP_ENTRY);
if (key_nr == 0 &&
(to->key_info[0].key_part[0].field->flags & AUTO_INCREMENT_FLAG))
err_msg= ER(ER_DUP_ENTRY_AUTOINCREMENT_CASE);
to->file->print_keydupp_error(key_nr, err_msg);
break;
}
}
to->file->print_error(error,MYF(0));
break;
}