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

Merge 10.6 into 10.11

This commit is contained in:
Marko Mäkelä
2024-11-29 13:43:17 +02:00
397 changed files with 6215 additions and 4216 deletions

View File

@ -722,7 +722,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;