1
0
mirror of https://github.com/mariadb-corporation/mariadb-connector-c.git synced 2025-08-07 02:42:49 +03:00

Merge branch '3.1' into 3.3

This commit is contained in:
Georg Richter
2024-05-14 09:48:52 +02:00

View File

@@ -3300,12 +3300,16 @@ mysql_refresh(MYSQL *mysql,uint options)
int STDCALL int STDCALL
mysql_kill(MYSQL *mysql,ulong pid) mysql_kill(MYSQL *mysql,ulong pid)
{ {
char buff[26]; char buff[16];
/* process id can't be larger than 4-bytes */
if (pid & (~0xFFFFFFFFUL)) if (pid & (~0xFFFFFFFFUL))
snprintf(buff, sizeof buff, "KILL %llu", (ulonglong)pid); {
else my_set_error(mysql, CR_CONNECTION_ERROR, SQLSTATE_UNKNOWN, 0);
snprintf(buff, sizeof buff, "KILL %lu", pid); return 1;
}
snprintf(buff, sizeof buff, "KILL %lu", pid);
return mysql_real_query(mysql, (char *)buff, (ulong)strlen(buff)); return mysql_real_query(mysql, (char *)buff, (ulong)strlen(buff));
} }