diff options
| author | unknown <monty@narttu.mysql.fi> | 2007-01-24 19:53:51 +0200 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2007-01-24 19:53:51 +0200 |
| commit | a6d1d8ca54e82b9a84414c6cdcb6ce9df700eaea (patch) | |
| tree | 1fffcb8ab2b0f92e34d57ea11f25b47b092772ac /sql/sql_table.cc | |
| parent | b0ff1cd2ca8a6449cdbcf5cce89898409f69d609 (diff) | |
| parent | c871b72e21ace779772ea429f6417048f4a78c87 (diff) | |
| download | mariadb-git-a6d1d8ca54e82b9a84414c6cdcb6ce9df700eaea.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into mysql.com:/home/my/mysql-5.1
mysql-test/t/myisam.test:
Auto merged
mysql-test/t/ndb_basic.test:
Auto merged
Diffstat (limited to 'sql/sql_table.cc')
| -rw-r--r-- | sql/sql_table.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 35a5547a730..c2be1b55b7f 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -6820,7 +6820,7 @@ copy_data_between_tables(TABLE *from,TABLE *to, uint key_nr= to->file->get_dup_key(error); if ((int) key_nr >= 0) { - const char *err_msg= ER(ER_DUP_ENTRY); + const char *err_msg= ER(ER_DUP_ENTRY_WITH_KEY_NAME); if (key_nr == 0 && (to->key_info[0].key_part[0].field->flags & AUTO_INCREMENT_FLAG)) |