diff --git a/libmariadb/mariadb_lib.c b/libmariadb/mariadb_lib.c index 7018bc1..0e091e9 100644 --- a/libmariadb/mariadb_lib.c +++ b/libmariadb/mariadb_lib.c @@ -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); -} \ No newline at end of file +} diff --git a/libmariadb/ob_tnsname.c b/libmariadb/ob_tnsname.c index a30acf3..87fe8bb 100644 --- a/libmariadb/ob_tnsname.c +++ b/libmariadb/ob_tnsname.c @@ -1,5 +1,5 @@ #include "ob_tnsname.h" - +#include #include #include #include diff --git a/libmariadb/ob_utils.c b/libmariadb/ob_utils.c index 471dd63..5d384cb 100644 --- a/libmariadb/ob_utils.c +++ b/libmariadb/ob_utils.c @@ -1,5 +1,5 @@ #include "ob_utils.h" - +#include #ifdef _WIN32 int gettimeofday(struct timeval *tp, void *tzp) { diff --git a/plugins/pvio/pvio_socket.c b/plugins/pvio/pvio_socket.c index c88a8f5..6000ea5 100644 --- a/plugins/pvio/pvio_socket.c +++ b/plugins/pvio/pvio_socket.c @@ -23,7 +23,7 @@ The plugin handles connections via unix and network sockets. it is enabled by default and compiled into Connector/C. */ - +#include #include #include #include