mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-15 19:42:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

my_errno can not be set to EE_ error numbers

Browse source 
EE_ numbers occupy the same range as OS Exxx errors and
my_errno is generally for OS errors. And for HA_ERR_ handler errors
which occupy a different range, so can be freely mixed with OS errors.
This commit is contained in:
Sergei Golubchik 2024-05-21 22:41:37 +02:00
parent aebd16201f
commit bfbdc273d2
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mysys/mf_iocache.c
View file

@ -88,7 +88,7 @@ static inline my_bool tmp_file_track(IO_CACHE *info, ulonglong file_size)
MY_TRACK_WITH_LIMIT))))
{
if (info->myflags & MY_WME)
my_error(my_errno, MYF(0));
my_error(error, MYF(0));
info->error= -1;
return 1;
}

4
sql/mysqld.cc
View file

@ -3804,7 +3804,7 @@ static int temp_file_size_cb_func(struct tmp_file_tracking *track,
global_max_tmp_space_usage)
{
global_tmp_space_used-= size_change;
error= my_errno= EE_GLOBAL_TMP_SPACE_FULL;
error= EE_GLOBAL_TMP_SPACE_FULL;
goto exit;
}
if (thd->status_var.tmp_space_used + size_change >
@ -3812,7 +3812,7 @@ static int temp_file_size_cb_func(struct tmp_file_tracking *track,
thd->variables.max_tmp_space_usage)
{
global_tmp_space_used-= size_change;
error= my_errno= EE_LOCAL_TMP_SPACE_FULL;
error= EE_LOCAL_TMP_SPACE_FULL;
goto exit;
}
set_if_bigger(global_status_var.max_tmp_space_used, cached_space);

6
storage/maria/ma_info.c
View file

@ -227,13 +227,13 @@ void _ma_set_fatal_error_with_share(MARIA_SHARE *share, int error)
int _ma_update_tmp_file_size(struct tmp_file_tracking *track,
ulonglong file_size)
{
int err;
if (track->file_size != file_size)
{
track->file_size= file_size;
if (update_tmp_file_size(track, 0))
if ((err= update_tmp_file_size(track, 0)))
{
my_errno= (HA_ERR_LOCAL_TMP_SPACE_FULL +
(my_errno - EE_LOCAL_TMP_SPACE_FULL));
my_errno= HA_ERR_LOCAL_TMP_SPACE_FULL + (err - EE_LOCAL_TMP_SPACE_FULL);
return 1;
}
}