Skip to content
/ server Public

Fix ER_OUTOFMEMORY format to use %zu and size_t (MDEV-39138) #4840

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Harsh8084 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix ER_OUTOFMEMORY format to use %zu and size_t (MDEV-39138) #4840

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sql/handler.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,7 @@ handler *get_ha_partition(partition_info *part_info)
else
{
my_error(ER_OUTOFMEMORY, MYF(ME_FATAL),
static_cast<int>(sizeof(ha_partition)));
sizeof(ha_partition));
}
DBUG_RETURN(((handler*) partition));
}
Expand Down
36 changes: 18 additions & 18 deletions sql/item_jsonfunc.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ bool st_append_json(String *s,

if (s->reserve(str_len, 1024))
{
my_error(ER_OUTOFMEMORY, MYF(0), str_len);
my_error(ER_OUTOFMEMORY, MYF(0), (size_t)str_len);
return false;
}

Expand All @@ -130,7 +130,7 @@ bool st_append_json(String *s,
if (current_thd)
{
if (str_len == JSON_ERROR_OUT_OF_SPACE)
my_error(ER_OUTOFMEMORY, MYF(0), str_len);
my_error(ER_OUTOFMEMORY, MYF(0), (size_t)str_len);
else if (str_len == JSON_ERROR_ILLEGAL_SYMBOL)
push_warning_printf(current_thd, Sql_condition::WARN_LEVEL_WARN,
ER_JSON_BAD_CHR, ER_THD(current_thd, ER_JSON_BAD_CHR),
Expand Down Expand Up @@ -1037,7 +1037,7 @@ String *Item_func_json_unquote::val_str(String *str)
if (current_thd)
{
if (c_len == JSON_ERROR_OUT_OF_SPACE)
my_error(ER_OUTOFMEMORY, MYF(0), buf_len);
my_error(ER_OUTOFMEMORY, MYF(0), (size_t)buf_len);
else if (c_len == JSON_ERROR_ILLEGAL_SYMBOL)
push_warning_printf(current_thd, Sql_condition::WARN_LEVEL_WARN,
ER_JSON_BAD_CHR, ER_THD(current_thd, ER_JSON_BAD_CHR),
Expand Down Expand Up @@ -2500,33 +2500,33 @@ String *Item_func_json_array_insert::val_str(String *str)
my_ptrdiff_t size= item_pos - js->ptr();
if (append_simple(str, js->ptr(), size))
{
my_error(ER_OUTOFMEMORY, MYF(0), (int) size);
my_error(ER_OUTOFMEMORY, MYF(0), (size_t) size);
goto return_null; /* Out of memory. */
}
if (n_item > 0 && str->append(" ", 1))
{
my_error(ER_OUTOFMEMORY, MYF(0), 1);
my_error(ER_OUTOFMEMORY, MYF(0), (size_t)1);
goto return_null; /* Out of memory. */
}
if (append_json_value(str, args[n_arg+1], &tmp_val))
{
my_error(ER_OUTOFMEMORY, MYF(0), tmp_val.length());
my_error(ER_OUTOFMEMORY, MYF(0), (size_t)tmp_val.length());
goto return_null; /* Out of memory. */
}
if (str->append(",", 1))
{
my_error(ER_OUTOFMEMORY, MYF(0), 1);
my_error(ER_OUTOFMEMORY, MYF(0), (size_t)1);
goto return_null; /* Out of memory. */
}
if (n_item == 0 && str->append(" ", 1))
{
my_error(ER_OUTOFMEMORY, MYF(0), 1);
my_error(ER_OUTOFMEMORY, MYF(0), (size_t)1);
goto return_null; /* Out of memory. */
}
size= js->end() - item_pos;
if (append_simple(str, item_pos, size))
{
my_error(ER_OUTOFMEMORY, MYF(0), (int) size);
my_error(ER_OUTOFMEMORY, MYF(0), (size_t) size);
goto return_null; /* Out of memory. */
}
}
Expand All @@ -2539,23 +2539,23 @@ String *Item_func_json_array_insert::val_str(String *str)
size= item_pos - js->ptr();
if (append_simple(str, js->ptr(), size))
{
my_error(ER_OUTOFMEMORY, MYF(0), (int) size);
my_error(ER_OUTOFMEMORY, MYF(0), (size_t) size);
goto return_null; /* Out of memory. */
}
if (n_item > 0 && str->append(", ", 2))
{
my_error(ER_OUTOFMEMORY, MYF(0), 2);
my_error(ER_OUTOFMEMORY, MYF(0), (size_t)2);
goto return_null; /* Out of memory. */
}
if (append_json_value(str, args[n_arg+1], &tmp_val))
{
my_error(ER_OUTOFMEMORY, MYF(0), tmp_val.length());
my_error(ER_OUTOFMEMORY, MYF(0), (size_t)tmp_val.length());
goto return_null; /* Out of memory. */
}
size= js->end() - item_pos;
if (append_simple(str, item_pos, size))
{
my_error(ER_OUTOFMEMORY, MYF(0), (int) size);
my_error(ER_OUTOFMEMORY, MYF(0), (size_t) size);
goto return_null; /* Out of memory. */
}
}
Expand Down Expand Up @@ -4276,7 +4276,7 @@ int Item_func_json_search::compare_json_value_wild(json_engine_t *je,
if (current_thd)
{
if (esc_len == JSON_ERROR_OUT_OF_SPACE)
my_error(ER_OUTOFMEMORY, MYF(0), je->value_len);
my_error(ER_OUTOFMEMORY, MYF(0), (size_t)je->value_len);
else if (esc_len == JSON_ERROR_ILLEGAL_SYMBOL)
{
push_warning_printf(current_thd, Sql_condition::WARN_LEVEL_WARN,
Expand Down Expand Up @@ -4554,7 +4554,7 @@ int Arg_comparator::compare_json_str_basic(Item *j, Item *s)
{
if (value2.realloc_with_extra_if_needed(je.value_len))
{
my_error(ER_OUTOFMEMORY, MYF(0), je.value_len);
my_error(ER_OUTOFMEMORY, MYF(0), (size_t)je.value_len);
goto error;
}
if ((c_len= json_unescape(js->charset(), je.value,
Expand All @@ -4566,7 +4566,7 @@ int Arg_comparator::compare_json_str_basic(Item *j, Item *s)
if (current_thd)
{
if (c_len == JSON_ERROR_OUT_OF_SPACE)
my_error(ER_OUTOFMEMORY, MYF(0), je.value_len);
my_error(ER_OUTOFMEMORY, MYF(0), (size_t)je.value_len);
else if (c_len == JSON_ERROR_ILLEGAL_SYMBOL)
{
push_warning_printf(current_thd, Sql_condition::WARN_LEVEL_WARN,
Expand Down Expand Up @@ -4620,7 +4620,7 @@ int Arg_comparator::compare_e_json_str_basic(Item *j, Item *s)
{
if (value1.realloc_with_extra_if_needed(value_len))
{
my_error(ER_OUTOFMEMORY, MYF(0), value_len);
my_error(ER_OUTOFMEMORY, MYF(0), (size_t)value_len);
return 1;
}
if ((c_len= json_unescape(value1.charset(), (uchar *) value,
Expand All @@ -4632,7 +4632,7 @@ int Arg_comparator::compare_e_json_str_basic(Item *j, Item *s)
if (current_thd)
{
if (c_len == JSON_ERROR_OUT_OF_SPACE)
my_error(ER_OUTOFMEMORY, MYF(0), value_len);
my_error(ER_OUTOFMEMORY, MYF(0), (size_t)value_len);
else if (c_len == JSON_ERROR_ILLEGAL_SYMBOL)
{
push_warning_printf(current_thd, Sql_condition::WARN_LEVEL_WARN,
Expand Down
4 changes: 2 additions & 2 deletions sql/item_strfunc.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6050,7 +6050,7 @@ String *Item_func_wsrep_last_written_gtid::val_str_ascii(String *str)
{
if (gtid_str.alloc(WSREP_MAX_WSREP_SERVER_GTID_STR_LEN+1))
{
my_error(ER_OUTOFMEMORY, MYF(0), WSREP_MAX_WSREP_SERVER_GTID_STR_LEN);
my_error(ER_OUTOFMEMORY, MYF(0), (size_t)WSREP_MAX_WSREP_SERVER_GTID_STR_LEN);
null_value= TRUE;
return 0;
}
Expand All @@ -6075,7 +6075,7 @@ String *Item_func_wsrep_last_seen_gtid::val_str_ascii(String *str)
{
if (gtid_str.alloc(WSREP_MAX_WSREP_SERVER_GTID_STR_LEN+1))
{
my_error(ER_OUTOFMEMORY, MYF(0), WSREP_MAX_WSREP_SERVER_GTID_STR_LEN);
my_error(ER_OUTOFMEMORY, MYF(0), (size_t)WSREP_MAX_WSREP_SERVER_GTID_STR_LEN);
null_value= TRUE;
return 0;
}
Expand Down
2 changes: 1 addition & 1 deletion sql/session_tracker.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -611,7 +611,7 @@ bool sysvartrack_global_update(THD *thd, char *str, size_t len)
Session_sysvars_tracker::vars_list dummy;
DBUG_EXECUTE_IF("dbug_session_tracker_parse_error",
{
my_error(ER_OUTOFMEMORY, MYF(0), 1);
my_error(ER_OUTOFMEMORY, MYF(0), (size_t)1);
return true;
});

Expand Down
6 changes: 3 additions & 3 deletions sql/set_var.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1468,7 +1468,7 @@ resolve_engine_list(THD *thd, const char *str_arg, size_t str_arg_len,
res= (plugin_ref *)my_malloc(PSI_INSTRUMENT_ME, (count+1)*sizeof(*res), MYF(MY_ZEROFILL|MY_WME));
if (!res)
{
my_error(ER_OUTOFMEMORY, MYF(0), (int)((count+1)*sizeof(*res)));
my_error(ER_OUTOFMEMORY, MYF(0), ((count+1)*sizeof(*res)));
goto err;
}

Expand Down Expand Up @@ -1519,7 +1519,7 @@ copy_engine_list(plugin_ref *list)
p= (plugin_ref *)my_malloc(PSI_INSTRUMENT_ME, (count+1)*sizeof(*p), MYF(0));
if (!p)
{
my_error(ER_OUTOFMEMORY, MYF(0), (int)((count+1)*sizeof(*p)));
my_error(ER_OUTOFMEMORY, MYF(0), ((count+1)*sizeof(*p)));
return NULL;
}
for (i= 0; i < count; ++i)
Expand All @@ -1544,7 +1544,7 @@ temp_copy_engine_list(THD *thd, plugin_ref *list)
p= thd->alloc<plugin_ref>(count+1);
if (!p)
{
my_error(ER_OUTOFMEMORY, MYF(0), (int)((count+1)*sizeof(*p)));
my_error(ER_OUTOFMEMORY, MYF(0), ((count+1)*sizeof(*p)));
return NULL;
}
for (i= 0; i < count; ++i)
Expand Down
52 changes: 26 additions & 26 deletions sql/share/errmsg-utf8.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -957,32 +957,32 @@ ER_OPEN_AS_READONLY
swe "'%-.192s' är skyddad mot förändring"
ukr "Таблиця '%-.192s' тільки для читання"
ER_OUTOFMEMORY HY001 S1001
chi "内存不足; 重启后重试(需要 %d bytes)"
cze "Málo paměti. Přestartujte daemona a zkuste znovu (je potřeba %d bytů)"
dan "Ikke mere hukommelse. Genstart serveren og prøv igen (mangler %d bytes)"
eng "Out of memory; restart server and try again (needed %d bytes)"
est "Mälu sai otsa. Proovi MariaDB uuesti käivitada (puudu jäi %d baiti)"
fre "Manque de mémoire. Redémarrez le démon et ré-essayez (%d octets nécessaires)"
ger "Kein Speicher vorhanden (%d Bytes benötigt). Bitte Server neu starten"
geo "არასაკმარისი მეხსიერება. გადატვირთეთ სერვერი და კიდევ სცადეთ (მჭირდებოდა %d ბაიტი"
greek "Δεν υπάρχει διαθέσιμη μνήμη. Προσπαθήστε πάλι, επανεκινώντας τη διαδικασία (demon) (χρειάζονται %d bytes)"
hun "Nincs eleg memoria. Inditsa ujra a demont, es probalja ismet. (%d byte szukseges.)"
ita "Memoria esaurita. Fai ripartire il demone e riprova (richiesti %d bytes)"
jpn "メモリが不足しています。サーバーを再起動してみてください。(%d バイトの割り当てに失敗)"
kor "Out of memory. 데몬을 재 실행 후 다시 시작하시오 (needed %d bytes)"
nla "Geen geheugen meer. Herstart server en probeer opnieuw (%d bytes nodig)"
nor "Ikke mer minne. Star på nytt tjenesten og prøv igjen (trengte %d byter)"
norwegian-ny "Ikkje meir minne. Start på nytt tenesten og prøv igjen (trengte %d bytar)"
pol "Zbyt mało pamięci. Uruchom ponownie demona i spróbuj ponownie (potrzeba %d bajtów)"
por "Sem memória. Reinicie o programa e tente novamente (necessita de %d bytes)"
rum "Out of memory. Porneste daemon-ul din nou si incearca inca o data (e nevoie de %d bytes)"
rus "Недостаточно памяти. Перезапустите сервер и попробуйте еще раз (нужно %d байт)"
serbian "Nema memorije. Restartujte MariaDB server i probajte ponovo (potrebno je %d byte-ova)"
slo "Málo pamäti. Reštartujte daemona a skúste znova (je potrebných %d bytov)"
spa "Memoria insuficiente. Reinicie el servidor e inténtelo otra vez (necesita %d bytes)"
sw "Kumbukumbu imejaa; anzisha tena seva na ujaribu tena (inahitajika baiti %d)"
swe "Oväntat slut på minnet, starta om programmet och försök på nytt (Behövde %d bytes)"
ukr "Брак пам'яті. Рестартуйте сервер та спробуйте знову (потрібно %d байтів)"
chi "内存不足; 重启后重试(需要 %zu bytes)"
cze "Málo paměti. Přestartujte daemona a zkuste znovu (je potřeba %zu bytů)"
dan "Ikke mere hukommelse. Genstart serveren og prøv igen (mangler %zu bytes)"
eng "Out of memory; restart server and try again (needed %zu bytes)"
est "Mälu sai otsa. Proovi MariaDB uuesti käivitada (puudu jäi %zu baiti)"
fre "Manque de mémoire. Redémarrez le démon et ré-essayez (%zu octets nécessaires)"
ger "Kein Speicher vorhanden (%zu Bytes benötigt). Bitte Server neu starten"
geo "არასაკმარისი მეხსიერება. გადატვირთეთ სერვერი და კიდევ სცადეთ (მჭირდებოდა %zu ბაიტი)"
greek "Δεν υπάρχει διαθέσιμη μνήμη. Προσπαθήστε πάλι, επανεκινώντας τη διαδικασία (demon) (χρειάζονται %zu bytes)"
hun "Nincs eleg memoria. Inditsa ujra a demont, es probalja ismet. (%zu byte szukseges.)"
ita "Memoria esaurita. Fai ripartire il demone e riprova (richiesti %zu bytes)"
jpn "メモリが不足しています。サーバーを再起動してみてください。(%zu バイトの割り当てに失敗)"
kor "Out of memory. 데몬을 재 실행 후 다시 시작하시오 (needed %zu bytes)"
nla "Geen geheugen meer. Herstart server en probeer opnieuw (%zu bytes nodig)"
nor "Ikke mer minne. Star på nytt tjenesten og prøv igjen (trengte %zu byter)"
norwegian-ny "Ikkje meir minne. Start på nytt tenesten og prøv igjen (trengte %zu bytar)"
pol "Zbyt mało pamięci. Uruchom ponownie demona i spróbuj ponownie (potrzeba %zu bajtów)"
por "Sem memória. Reinicie o programa e tente novamente (necessita de %zu bytes)"
rum "Out of memory. Porneste daemon-ul din nou si incearca inca o data (e nevoie de %zu bytes)"
rus "Недостаточно памяти. Перезапустите сервер и попробуйте еще раз (нужно %zu байт)"
serbian "Nema memorije. Restartujte MariaDB server i probajte ponovo (potrebno je %zu byte-ova)"
slo "Málo pamäti. Reštartujte daemona a skúste znova (je potrebných %zu bytov)"
spa "Memoria insuficiente. Reinicie el servidor e inténtelo otra vez (necesita %zu bytes)"
sw "Kumbukumbu imejaa; anzisha tena seva na ujaribu tena (inahitajika baiti %zu)"
swe "Oväntat slut på minnet, starta om programmet och försök på nytt (Behövde %zu bytes)"
ukr "Брак пам'яті. Рестартуйте сервер та спробуйте знову (потрібно %zu байтів)"
ER_OUT_OF_SORTMEMORY HY001 S1001
chi "排序内存不足，可以考虑增加实例排序缓存量"
cze "Málo paměti pro třídění. Zvyšte velikost třídícího bufferu"
Expand Down