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 bk-internal.mysql.com:/home/bk/mysql-5.1

Browse Source 
into  mysql.com:/home/my/mysql-5.1
This commit is contained in:
monty@narttu.mysql.fi
2007-08-14 00:22:34 +03:00
parent 3ecef8c0b9 e53a73e26c
commit 9d609a59fd
131 changed files with 1146 additions and 910 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_delete.cc
View File

@ -760,7 +760,7 @@ void multi_delete::send_error(uint errcode,const char *err)
int multi_delete::do_deletes()
{
int local_error= 0, counter= 0, error;
int local_error= 0, counter= 0, tmp_error;
bool will_batch;
DBUG_ENTER("do_deletes");
DBUG_ASSERT(do_delete);
@ -814,11 +814,11 @@ int multi_delete::do_deletes()
break;
}
}
if (will_batch && (error= table->file->end_bulk_delete()))
if (will_batch && (tmp_error= table->file->end_bulk_delete()))
{
if (!local_error)
{
local_error= error;
local_error= tmp_error;
table->file->print_error(local_error,MYF(0));
}
}