mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
Fixed a lot of compiler warnings and errors detected by Forte C++ on Solaris
Faster thr_alarm() Added 'Opened_files' status variable to track calls to my_open() Don't give warnings when running mysql_install_db Added option --source-install to mysql_install_db I had to do the following renames() as used polymorphism didn't work with Forte compiler on 64 bit systems index_read() -> index_read_map() index_read_idx() -> index_read_idx_map() index_read_last() -> index_read_last_map()
This commit is contained in:
@ -753,7 +753,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);
|
||||
@ -806,11 +806,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));
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user