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

10.2 integration fixes

Browse Source 
- changed plugin API to avoid crashes: Oracle/MariaDB changed
    structure several times without updating interface version.
  - ABI fixes: moved additional net items to net->extension (connection
    handler and com_multi buffer)
This commit is contained in:
Georg Richter
2016-02-22 10:43:11 +01:00
parent dc1a8715c2
commit d68b48f954
22 changed files with 168 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libmariadb/ma_loaddata.c
View File

@@ -84,7 +84,7 @@ int mysql_local_infile_init(void **ptr, const char *filename, void *userdata)
if (mysql_errno(mysql) && !info->error_no)
{
info->error_no= mysql_errno(mysql);
strncpy(info->error_msg, mysql_error(mysql), MYSQL_ERRMSG_SIZE);
ma_strmake(info->error_msg, mysql_error(mysql), MYSQL_ERRMSG_SIZE);
}
else
{
@@ -127,11 +127,11 @@ int mysql_local_infile_error(void *ptr, char *error_buf, unsigned int error_buf_
MYSQL_INFILE_INFO *info = (MYSQL_INFILE_INFO *)ptr;
if (info) {
strncpy(error_buf, info->error_msg, error_buf_len);
ma_strmake(error_buf, info->error_msg, error_buf_len);
return(info->error_no);
}
strncpy(error_buf, "Unknown error", error_buf_len);
ma_strmake(error_buf, "Unknown error", error_buf_len);
return(CR_UNKNOWN_ERROR);
}
/* }}} */