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

Remove not needed calls to print_error

Browse Source
This commit is contained in:
Michael Widenius
2018-04-11 03:18:03 +03:00
parent ddc5764303
commit 3bae6a2b98
3 changed files with 5 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/rpl_rli.cc
View File

@ -1537,11 +1537,9 @@ scan_one_gtid_slave_pos_table(THD *thd, HASH *hash, DYNAMIC_ARRAY *array,
goto end; goto end;
bitmap_set_all(table->read_set); bitmap_set_all(table->read_set);
if ((err= table->file->ha_rnd_init_with_error(1))) if (unlikely(err= table->file->ha_rnd_init_with_error(1)))
{
table->file->print_error(err, MYF(0));
goto end; goto end;
}
table_scanned= true; table_scanned= true;
for (;;) for (;;)
{ {

10
sql/sql_acl.cc
View File

@ -9286,11 +9286,8 @@ static int handle_roles_mappings_table(TABLE *table, bool drop,
DBUG_PRINT("info", ("Rewriting entry in roles_mapping table: %s@%s", DBUG_PRINT("info", ("Rewriting entry in roles_mapping table: %s@%s",
user_from->user.str, user_from->host.str)); user_from->user.str, user_from->host.str));
table->use_all_columns(); table->use_all_columns();
if ((error= table->file->ha_rnd_init(1))) if (unlikely(error= table->file->ha_rnd_init_with_error(1)))
{
table->file->print_error(error, MYF(0));
result= -1; result= -1;
}
else else
{ {
while((error= table->file->ha_rnd_next(table->record[0])) != while((error= table->file->ha_rnd_next(table->record[0])) !=
@ -9451,11 +9448,8 @@ static int handle_grant_table(THD *thd, const Grant_table_base& grant_table,
And their host- and user fields are not consecutive. And their host- and user fields are not consecutive.
Thus, we need to do a table scan to find all matching records. Thus, we need to do a table scan to find all matching records.
*/ */
if ((error= table->file->ha_rnd_init(1))) if (unlikely(error= table->file->ha_rnd_init_with_error(1)))
{
table->file->print_error(error, MYF(0));
result= -1; result= -1;
}
else else
{ {
#ifdef EXTRA_DEBUG #ifdef EXTRA_DEBUG

5
sql/sql_partition.cc
View File

@ -4107,11 +4107,8 @@ bool verify_data_with_partition(TABLE *table, TABLE *part_table,
old_rec= part_table->record[0]; old_rec= part_table->record[0];
part_table->record[0]= table->record[0]; part_table->record[0]= table->record[0];
part_info->table->move_fields(part_info->full_part_field_array, table->record[0], old_rec); part_info->table->move_fields(part_info->full_part_field_array, table->record[0], old_rec);
if ((error= file->ha_rnd_init(TRUE))) if (unlikely(error= file->ha_rnd_init_with_error(TRUE)))
{
file->print_error(error, MYF(0));
goto err; goto err;
}
do do
{ {