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 branch 'master' of https://github.com/MariaDB/mariadb-connector-c

Browse Source
This commit is contained in:
Georg Richter
2018-07-27 07:35:36 +02:00
parent d2ee129f8c 499c8abec5
commit d76de10de8
9 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/ma_pvio.h
View File

@@ -98,7 +98,7 @@ struct st_ma_pvio_methods
ssize_t (*write)(MARIADB_PVIO *pvio, const uchar *buffer, size_t length); ssize_t (*write)(MARIADB_PVIO *pvio, const uchar *buffer, size_t length);
ssize_t (*async_write)(MARIADB_PVIO *pvio, const uchar *buffer, size_t length); ssize_t (*async_write)(MARIADB_PVIO *pvio, const uchar *buffer, size_t length);
int (*wait_io_or_timeout)(MARIADB_PVIO *pvio, my_bool is_read, int timeout); int (*wait_io_or_timeout)(MARIADB_PVIO *pvio, my_bool is_read, int timeout);
my_bool (*blocking)(MARIADB_PVIO *pvio, my_bool value, my_bool *old_value); int (*blocking)(MARIADB_PVIO *pvio, my_bool value, my_bool *old_value);
my_bool (*connect)(MARIADB_PVIO *pvio, MA_PVIO_CINFO *cinfo); my_bool (*connect)(MARIADB_PVIO *pvio, MA_PVIO_CINFO *cinfo);
my_bool (*close)(MARIADB_PVIO *pvio); my_bool (*close)(MARIADB_PVIO *pvio);
int (*fast_send)(MARIADB_PVIO *pvio); int (*fast_send)(MARIADB_PVIO *pvio);

2
include/mariadb_dyncol.h
View File

@@ -225,7 +225,7 @@ void mariadb_dyncol_free(DYNAMIC_COLUMN *str);
/* conversion of values to 3 base types */ /* conversion of values to 3 base types */
enum enum_dyncol_func_result enum enum_dyncol_func_result
mariadb_dyncol_val_str(DYNAMIC_STRING *str, DYNAMIC_COLUMN_VALUE *val, mariadb_dyncol_val_str(DYNAMIC_STRING *str, DYNAMIC_COLUMN_VALUE *val,
MARIADB_CHARSET_INFO *cs, my_bool quote); MARIADB_CHARSET_INFO *cs, char quote);
enum enum_dyncol_func_result enum enum_dyncol_func_result
mariadb_dyncol_val_long(longlong *ll, DYNAMIC_COLUMN_VALUE *val); mariadb_dyncol_val_long(longlong *ll, DYNAMIC_COLUMN_VALUE *val);
enum enum_dyncol_func_result enum enum_dyncol_func_result

2
libmariadb/ma_pvio.c
View File

@@ -490,7 +490,7 @@ my_bool ma_pvio_connect(MARIADB_PVIO *pvio, MA_PVIO_CINFO *cinfo)
my_bool ma_pvio_blocking(MARIADB_PVIO *pvio, my_bool block, my_bool *previous_mode) my_bool ma_pvio_blocking(MARIADB_PVIO *pvio, my_bool block, my_bool *previous_mode)
{ {
if (pvio && pvio->methods->blocking) if (pvio && pvio->methods->blocking)
return pvio->methods->blocking(pvio, block, previous_mode); return pvio->methods->blocking(pvio, block, previous_mode) != 0;
return 1; return 1;
} }
/* }}} */ /* }}} */

4
libmariadb/ma_tls.c
View File

@@ -130,7 +130,7 @@ const char *ma_pvio_tls_get_protocol_version(MARIADB_TLS *ctls)
return tls_protocol_version[version]; return tls_protocol_version[version];
} }
static char ma_hex2int(char c) static signed char ma_hex2int(char c)
{ {
if (c >= '0' && c <= '9') if (c >= '0' && c <= '9')
return c - '0'; return c - '0';
@@ -161,7 +161,7 @@ static my_bool ma_pvio_tls_compare_fp(const char *cert_fp,
for(c= (char *)cert_fp; c < cert_fp + cert_fp_len; c++) for(c= (char *)cert_fp; c < cert_fp + cert_fp_len; c++)
{ {
char d1, d2; signed char d1, d2;
if (*p == ':') if (*p == ':')
p++; p++;
if (p - fp > (int)fp_len -1) if (p - fp > (int)fp_len -1)

4
plugins/pvio/pvio_npipe.c
View File

@@ -38,7 +38,7 @@ ssize_t pvio_npipe_async_read(MARIADB_PVIO *pvio, uchar *buffer, size_t length);
ssize_t pvio_npipe_write(MARIADB_PVIO *pvio, const uchar *buffer, size_t length); ssize_t pvio_npipe_write(MARIADB_PVIO *pvio, const uchar *buffer, size_t length);
ssize_t pvio_npipe_async_write(MARIADB_PVIO *pvio, const uchar *buffer, size_t length); ssize_t pvio_npipe_async_write(MARIADB_PVIO *pvio, const uchar *buffer, size_t length);
int pvio_npipe_wait_io_or_timeout(MARIADB_PVIO *pvio, my_bool is_read, int timeout); int pvio_npipe_wait_io_or_timeout(MARIADB_PVIO *pvio, my_bool is_read, int timeout);
my_bool pvio_npipe_blocking(MARIADB_PVIO *pvio, my_bool value, my_bool *old_value); int pvio_npipe_blocking(MARIADB_PVIO *pvio, my_bool value, my_bool *old_value);
my_bool pvio_npipe_connect(MARIADB_PVIO *pvio, MA_PVIO_CINFO *cinfo); my_bool pvio_npipe_connect(MARIADB_PVIO *pvio, MA_PVIO_CINFO *cinfo);
my_bool pvio_npipe_close(MARIADB_PVIO *pvio); my_bool pvio_npipe_close(MARIADB_PVIO *pvio);
int pvio_npipe_fast_send(MARIADB_PVIO *pvio); int pvio_npipe_fast_send(MARIADB_PVIO *pvio);
@@ -187,7 +187,7 @@ int pvio_npipe_wait_io_or_timeout(MARIADB_PVIO *pvio, my_bool is_read, int timeo
return -1; return -1;
} }
my_bool pvio_npipe_blocking(MARIADB_PVIO *pvio, my_bool block, my_bool *previous_mode) int pvio_npipe_blocking(MARIADB_PVIO *pvio, my_bool block, my_bool *previous_mode)
{ {
/* not supported */ /* not supported */
DWORD flags= 0; DWORD flags= 0;

4
plugins/pvio/pvio_shmem.c
View File

@@ -36,7 +36,7 @@ int pvio_shm_get_timeout(MARIADB_PVIO *pvio, enum enum_pvio_timeout type);
ssize_t pvio_shm_read(MARIADB_PVIO *pvio, uchar *buffer, size_t length); ssize_t pvio_shm_read(MARIADB_PVIO *pvio, uchar *buffer, size_t length);
ssize_t pvio_shm_write(MARIADB_PVIO *pvio, const uchar *buffer, size_t length); ssize_t pvio_shm_write(MARIADB_PVIO *pvio, const uchar *buffer, size_t length);
int pvio_shm_wait_io_or_timeout(MARIADB_PVIO *pvio, my_bool is_read, int timeout); int pvio_shm_wait_io_or_timeout(MARIADB_PVIO *pvio, my_bool is_read, int timeout);
my_bool pvio_shm_blocking(MARIADB_PVIO *pvio, my_bool value, my_bool *old_value); int pvio_shm_blocking(MARIADB_PVIO *pvio, my_bool value, my_bool *old_value);
my_bool pvio_shm_connect(MARIADB_PVIO *pvio, MA_PVIO_CINFO *cinfo); my_bool pvio_shm_connect(MARIADB_PVIO *pvio, MA_PVIO_CINFO *cinfo);
my_bool pvio_shm_close(MARIADB_PVIO *pvio); my_bool pvio_shm_close(MARIADB_PVIO *pvio);
int pvio_shm_shutdown(MARIADB_PVIO *pvio); int pvio_shm_shutdown(MARIADB_PVIO *pvio);
@@ -218,7 +218,7 @@ int pvio_shm_wait_io_or_timeout(MARIADB_PVIO *pvio, my_bool is_read, int timeout
return 0; return 0;
} }
my_bool pvio_shm_blocking(MARIADB_PVIO *pvio, my_bool block, my_bool *previous_mode) int pvio_shm_blocking(MARIADB_PVIO *pvio, my_bool block, my_bool *previous_mode)
{ {
/* not supported */ /* not supported */
return 0; return 0;

4
plugins/pvio/pvio_socket.c
View File

@@ -92,7 +92,7 @@ ssize_t pvio_socket_async_read(MARIADB_PVIO *pvio, uchar *buffer, size_t length)
ssize_t pvio_socket_async_write(MARIADB_PVIO *pvio, const uchar *buffer, size_t length); ssize_t pvio_socket_async_write(MARIADB_PVIO *pvio, const uchar *buffer, size_t length);
ssize_t pvio_socket_write(MARIADB_PVIO *pvio, const uchar *buffer, size_t length); ssize_t pvio_socket_write(MARIADB_PVIO *pvio, const uchar *buffer, size_t length);
int pvio_socket_wait_io_or_timeout(MARIADB_PVIO *pvio, my_bool is_read, int timeout); int pvio_socket_wait_io_or_timeout(MARIADB_PVIO *pvio, my_bool is_read, int timeout);
my_bool pvio_socket_blocking(MARIADB_PVIO *pvio, my_bool value, my_bool *old_value); int pvio_socket_blocking(MARIADB_PVIO *pvio, my_bool value, my_bool *old_value);
my_bool pvio_socket_connect(MARIADB_PVIO *pvio, MA_PVIO_CINFO *cinfo); my_bool pvio_socket_connect(MARIADB_PVIO *pvio, MA_PVIO_CINFO *cinfo);
my_bool pvio_socket_close(MARIADB_PVIO *pvio); my_bool pvio_socket_close(MARIADB_PVIO *pvio);
int pvio_socket_fast_send(MARIADB_PVIO *pvio); int pvio_socket_fast_send(MARIADB_PVIO *pvio);
@@ -565,7 +565,7 @@ int pvio_socket_wait_io_or_timeout(MARIADB_PVIO *pvio, my_bool is_read, int time
return rc; return rc;
} }
my_bool pvio_socket_blocking(MARIADB_PVIO *pvio, my_bool block, my_bool *previous_mode) int pvio_socket_blocking(MARIADB_PVIO *pvio, my_bool block, my_bool *previous_mode)
{ {
my_bool is_blocking; my_bool is_blocking;
struct st_pvio_socket *csock; struct st_pvio_socket *csock;

8
unittest/libmariadb/ps.c
View File

@@ -2209,7 +2209,7 @@ static int test_bind_negative(MYSQL *mysql)
my_bind[0].buffer_type= MYSQL_TYPE_LONG; my_bind[0].buffer_type= MYSQL_TYPE_LONG;
my_bind[0].buffer= (void *)&my_val; my_bind[0].buffer= (void *)&my_val;
my_bind[0].length= &my_length; my_bind[0].length= &my_length;
my_bind[0].is_null= (char*)&my_null; my_bind[0].is_null= &my_null;
rc= mysql_stmt_bind_param(stmt, my_bind); rc= mysql_stmt_bind_param(stmt, my_bind);
check_stmt_rc(rc, stmt); check_stmt_rc(rc, stmt);
@@ -2400,12 +2400,12 @@ static int test_union_param(MYSQL *mysql)
my_bind[0].buffer= (char*) &my_val; my_bind[0].buffer= (char*) &my_val;
my_bind[0].buffer_length= 4; my_bind[0].buffer_length= 4;
my_bind[0].length= &my_length; my_bind[0].length= &my_length;
my_bind[0].is_null= (char*)&my_null; my_bind[0].is_null= &my_null;
my_bind[1].buffer_type= MYSQL_TYPE_STRING; my_bind[1].buffer_type= MYSQL_TYPE_STRING;
my_bind[1].buffer= (char*) &my_val; my_bind[1].buffer= (char*) &my_val;
my_bind[1].buffer_length= 4; my_bind[1].buffer_length= 4;
my_bind[1].length= &my_length; my_bind[1].length= &my_length;
my_bind[1].is_null= (char*)&my_null; my_bind[1].is_null= &my_null;
rc= mysql_stmt_bind_param(stmt, my_bind); rc= mysql_stmt_bind_param(stmt, my_bind);
check_stmt_rc(rc, stmt); check_stmt_rc(rc, stmt);
@@ -3313,7 +3313,7 @@ ENGINE=InnoDB DEFAULT CHARSET=utf8");
my_bind[0].buffer_type= MYSQL_TYPE_LONG; my_bind[0].buffer_type= MYSQL_TYPE_LONG;
my_bind[0].buffer= (void *)&my_val; my_bind[0].buffer= (void *)&my_val;
my_bind[0].length= &my_length; my_bind[0].length= &my_length;
my_bind[0].is_null= (char*)&my_null; my_bind[0].is_null= &my_null;
my_val= 1; my_val= 1;
rc= mysql_stmt_bind_param(stmt, my_bind); rc= mysql_stmt_bind_param(stmt, my_bind);
check_stmt_rc(rc, stmt); check_stmt_rc(rc, stmt);

8
unittest/libmariadb/view.c
View File

@@ -30,7 +30,7 @@ static int test_view(MYSQL *mysql)
MYSQL_BIND my_bind[1]; MYSQL_BIND my_bind[1];
char str_data[50]; char str_data[50];
ulong length = 0L; ulong length = 0L;
long is_null = 0L; my_bool is_null = 0;
const char *query= const char *query=
"SELECT COUNT(*) FROM v1 WHERE SERVERNAME=?"; "SELECT COUNT(*) FROM v1 WHERE SERVERNAME=?";
@@ -84,7 +84,7 @@ static int test_view(MYSQL *mysql)
my_bind[0].buffer_length= 50; my_bind[0].buffer_length= 50;
my_bind[0].length= &length; my_bind[0].length= &length;
length= 4; length= 4;
my_bind[0].is_null= (char*)&is_null; my_bind[0].is_null= &is_null;
rc= mysql_stmt_bind_param(stmt, my_bind); rc= mysql_stmt_bind_param(stmt, my_bind);
check_stmt_rc(rc, stmt); check_stmt_rc(rc, stmt);
@@ -301,7 +301,7 @@ static int test_view_insert(MYSQL *mysql)
MYSQL_BIND my_bind[1]; MYSQL_BIND my_bind[1];
int my_val = 0; int my_val = 0;
ulong my_length = 0L; ulong my_length = 0L;
long my_null = 0L; my_bool my_null = 0;
const char *query= const char *query=
"insert into v1 values (?)"; "insert into v1 values (?)";
@@ -328,7 +328,7 @@ static int test_view_insert(MYSQL *mysql)
my_bind[0].buffer_type = MYSQL_TYPE_LONG; my_bind[0].buffer_type = MYSQL_TYPE_LONG;
my_bind[0].buffer = (char *)&my_val; my_bind[0].buffer = (char *)&my_val;
my_bind[0].length = &my_length; my_bind[0].length = &my_length;
my_bind[0].is_null = (char*)&my_null; my_bind[0].is_null = &my_null;
rc= mysql_stmt_bind_param(insert_stmt, my_bind); rc= mysql_stmt_bind_param(insert_stmt, my_bind);
check_stmt_rc(rc, select_stmt); check_stmt_rc(rc, select_stmt);