database/mariadb-connector-c
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-connector-c.git synced 2025-08-08 14:02:17 +03:00
Code Activity

Merge 3.1 into 3.3

Browse Source
This commit is contained in:
Marko Mäkelä
2023-06-26 16:28:51 +03:00
parent 56b515648b d543bed61b
commit 5af90f00ff
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libmariadb/mariadb_lib.c
View File

@@ -2342,7 +2342,7 @@ void my_set_error(MYSQL *mysql,
{
va_list ap;
const char *errmsg;
const char *errmsg= format;
mysql->net.last_errno= error_nr;
ma_strmake(mysql->net.sqlstate, sqlstate, SQLSTATE_LENGTH);
@@ -2359,8 +2359,7 @@ void my_set_error(MYSQL *mysql,
}
va_start(ap, format);
vsnprintf(mysql->net.last_error, MYSQL_ERRMSG_SIZE - 1,
format ? format : errmsg, ap);
vsnprintf(mysql->net.last_error, MYSQL_ERRMSG_SIZE - 1, errmsg, ap);
va_end(ap);
return;
}