1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00

Merge 11.4 into 11.7

This commit is contained in:
Marko Mäkelä
2024-12-02 17:51:17 +02:00
449 changed files with 6775 additions and 4292 deletions

View File

@ -718,7 +718,7 @@ public:
{
return m_usec ?
my_snprintf(to, nbytes, "%s%llu.%06lu",
m_neg ? "-" : "", m_sec, (uint) m_usec) :
m_neg ? "-" : "", m_sec, m_usec) :
my_snprintf(to, nbytes, "%s%llu", m_neg ? "-" : "", m_sec);
}
void make_truncated_warning(THD *thd, const char *type_str) const;