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

Merge

Browse Source 
BitKeeper/etc/logging_ok:
  auto-union
mysql-test/r/create.result:
  Auto merged
mysql-test/r/insert_update.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_yacc.yy:
  SCCS merged
This commit is contained in:
unknown
2005-05-07 16:50:22 +01:00
parent 6d89aa730e 0de8a53ff2
commit 4989274681
7 changed files with 55 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_insert.cc
View File

@@ -897,7 +897,11 @@ int write_record(THD *thd, TABLE *table,COPY_INFO *info)
goto err;
if ((error=table->file->update_row(table->record[1],table->record[0])))
{
if ((error == HA_ERR_FOUND_DUPP_KEY) && info->ignore)
break;
goto err;
}
info->updated++;
break;
}