database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

cleanup: hide HA_ERR_RECORD_DELETED in ha_rnd_next()

Browse Source 
it's internal storage engine error, don't let it leak
into the upper layer.
This commit is contained in:
Sergei Golubchik
2018-04-14 00:09:11 +02:00
parent 5441bbd3b1
commit 0f956a0676
20 changed files with 148 additions and 293 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sql/sql_select.cc
View File

@@ -22532,11 +22532,6 @@ static int remove_dup_with_compare(THD *thd, TABLE *table, Field **first_field,
}
if (unlikely(error))
{
if (error == HA_ERR_RECORD_DELETED)
{
error= file->ha_rnd_next(record);
continue;
}
if (error == HA_ERR_END_OF_FILE)
break;
goto err;
@@ -22563,8 +22558,6 @@ static int remove_dup_with_compare(THD *thd, TABLE *table, Field **first_field,
{
if (unlikely((error= file->ha_rnd_next(record))))
{
if (error == HA_ERR_RECORD_DELETED)
continue;
if (error == HA_ERR_END_OF_FILE)
break;
goto err;
@@ -22655,8 +22648,6 @@ static int remove_dup_with_hash_index(THD *thd, TABLE *table,
}
if (unlikely((error= file->ha_rnd_next(record))))
{
if (error == HA_ERR_RECORD_DELETED)
continue;
if (error == HA_ERR_END_OF_FILE)
break;
goto err;
@@ -27067,8 +27058,6 @@ ulong check_selectivity(THD *thd,
}
if (unlikely(error))
{
if (error == HA_ERR_RECORD_DELETED)
continue;
if (error == HA_ERR_END_OF_FILE)
break;
goto err;