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

mtr fix: mysql_client_test still uses the deprecated mysql_list_fields function,

Browse Source 
so we can set default value to zero (mysql_client_tedt doesn't check the value and crashes).
This commit is contained in:
Georg Richter
2019-02-06 09:02:03 +01:00
parent 821185c20c
commit 3beab84b83
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libmariadb/mariadb_lib.c
View File

@@ -815,8 +815,14 @@ unpack_fields(MYSQL_DATA *data,MA_MEM_ROOT *alloc,uint fields,
if (INTERNAL_NUM_FIELD(field))
field->flags|= NUM_FLAG;
field->def=0;
/* This is used by deprecated function mysql_list_fields only,
however the reported length is not correct, so we always zero it */
if (default_value && row->data[7])
field->def=ma_strdup_root(alloc,(char*) row->data[7]);
else
field->def=0;
field->def_length= 0;
field->max_length= 0;
}
if (field < result + fields)
@@ -2681,9 +2687,11 @@ mysql_optionsv(MYSQL *mysql,enum mysql_option option, ...)
mysql->options.client_flag|= CLIENT_LOCAL_FILES;
else
mysql->options.client_flag&= ~CLIENT_LOCAL_FILES;
if (arg1)
if (arg1) {
CHECK_OPT_EXTENSION_SET(&mysql->options);
OPT_SET_EXTENDED_VALUE_INT(&mysql->options, auto_local_infile, *(uint*)arg1 == LOCAL_INFILE_MODE_AUTO
? WAIT_FOR_QUERY : ALWAYS_ACCEPT);
}
break;
case MYSQL_INIT_COMMAND:
options_add_initcommand(&mysql->options, (char *)arg1);