database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge with 4.0.18

Browse Source
This commit is contained in:
monty@mysql.com
2004-02-11 00:06:46 +01:00
parent 0c6a0b9a31 efb134f3a8
commit ce14578909
229 changed files with 7032 additions and 3765 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sql/sql_insert.cc
View File

@ -534,7 +534,14 @@ int write_record(TABLE *table,COPY_INFO *info)
}
else /* DUP_REPLACE */
{
if (last_uniq_key(table,key_nr))
/*
The manual defines the REPLACE semantics that it is either
an INSERT or DELETE(s) + INSERT; FOREIGN KEY checks in
InnoDB do not function in the defined way if we allow MySQL
to convert the latter operation internally to an UPDATE.
*/
if (last_uniq_key(table,key_nr) &&
!table->file->referenced_by_foreign_key())
{
if ((error=table->file->update_row(table->record[1],
table->record[0])))
@ -1552,8 +1559,8 @@ select_create::prepare(List<Item> &values, SELECT_LEX_UNIT *u)
DBUG_ENTER("select_create::prepare");
unit= u;
table=create_table_from_items(thd, create_info, db, name,
extra_fields, keys, &values, &lock);
table= create_table_from_items(thd, create_info, db, name,
extra_fields, keys, &values, &lock);
if (!table)
DBUG_RETURN(-1); // abort() deletes table