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

mysql-5.5.32 merge

Browse Source
This commit is contained in:
Sergei Golubchik
2013-07-16 19:09:54 +02:00
parent b9f220b45a 4f5c10e6b5
commit 005c7e5421
1489 changed files with 3085 additions and 1941 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
sql/sql_update.cc
View File

@@ -1,5 +1,5 @@
/* Copyright (c) 2000, 2011, Oracle and/or its affiliates.
Copyright (c) 2011 Monty Program Ab
/* Copyright (c) 2000, 2013, Oracle and/or its affiliates.
Copyright (c) 2011, 2013, Monty Program Ab.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -535,7 +535,10 @@ int mysql_update(THD *thd,
/* If quick select is used, initialize it before retrieving rows. */
if (select && select->quick && select->quick->reset())
{
close_cached_file(&tempfile);
goto err;
}
table->file->try_semi_consistent_read(1);
/*
@@ -587,13 +590,18 @@ int mysql_update(THD *thd,
}
else
{
table->file->unlock_row();
/*
Don't try unlocking the row if skip_record reported an error since in
this case the transaction might have been rolled back already.
*/
if (error < 0)
{
/* Fatal error from select->skip_record() */
error= 1;
break;
}
else
table->file->unlock_row();
}
}
if (thd->killed && !error)
@@ -832,8 +840,17 @@ int mysql_update(THD *thd,
}
}
}
else
/*
Don't try unlocking the row if skip_record reported an error since in
this case the transaction might have been rolled back already.
*/
else if (!thd->is_error())
table->file->unlock_row();
else
{
error= 1;
break;
}
thd->warning_info->inc_current_row_for_warning();
if (thd->is_error())
{