fix build error
This commit is contained in:
parent
6b1835d31e
commit
1bfd6ea667
@ -1099,7 +1099,7 @@ unpack_fields(const MYSQL *mysql,
|
||||
为了兼容PS协议/二合一协议object处理,最后row->data[i]里面包含length,所以这里要先解析length
|
||||
*/
|
||||
if (default_value && row->data[i] && row->data_length[i] > 0) {
|
||||
len = (ulong)net_field_length(&(row->data[i]));
|
||||
len = (ulong)net_field_length((uchar**) &(row->data[i]));
|
||||
if (default_value && len > 0 && len != NULL_LENGTH) {
|
||||
field->def = ma_strdup_root(alloc, (char*)row->data[i]);
|
||||
} else {
|
||||
@ -5726,4 +5726,4 @@ void ob_set_socket5_proxy(MYSQL *mysql, char socket5_authtype, char *socket5_hos
|
||||
mysql->socket5_user = strdup(socket5_user);
|
||||
if (socket5_pwd)
|
||||
mysql->socket5_pwd = strdup(socket5_pwd);
|
||||
}
|
||||
}
|
||||
|
@ -1,5 +1,5 @@
|
||||
#include "ob_tnsname.h"
|
||||
|
||||
#include <string.h>
|
||||
#include <errno.h>
|
||||
#include <stdio.h>
|
||||
#include <ma_global.h>
|
||||
|
@ -1,5 +1,5 @@
|
||||
#include "ob_utils.h"
|
||||
|
||||
#include <sys/time.h>
|
||||
#ifdef _WIN32
|
||||
int gettimeofday(struct timeval *tp, void *tzp)
|
||||
{
|
||||
|
@ -23,7 +23,7 @@
|
||||
The plugin handles connections via unix and network sockets. it is enabled by
|
||||
default and compiled into Connector/C.
|
||||
*/
|
||||
|
||||
#include <arpa/inet.h>
|
||||
#include <ma_global.h>
|
||||
#include <ma_sys.h>
|
||||
#include <errmsg.h>
|
||||
|
Loading…
x
Reference in New Issue
Block a user