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

Fixed warning on Windows 64-bit build

Browse Source
This commit is contained in:
Georg Richter
2015-12-19 17:07:10 +01:00
parent 1eca44a07a
commit d68c7dae95
19 changed files with 77 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
unittest/libmariadb/CMakeLists.txt
View File

@@ -32,17 +32,14 @@ IF(WITH_SSL)
MESSAGE(STATUS "certificates already exist")
ELSE()
MESSAGE(STATUS "creating certificates")
EXECUTE_PROCESS(COMMAND openssl req -x509 -newkey rsa:1024 -keyout server-key-enc.pem -out server-cert.pem -subj "/DC=com/DC=example/CN=server" -passout pass:qwerty OUTPUT_FILE x.1 ERROR_FILE x.2
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/unittest/libmariadb/certs)
EXECUTE_PROCESS(COMMAND openssl rsa -in server-key-enc.pem -out server-key.pem -passin pass:qwerty -passout pass:
OUTPUT_FILE x.1 ERROR_FILE x.2 WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/unittest/libmariadb/certs)
EXECUTE_PROCESS(COMMAND openssl req -x509 -newkey rsa:1024 -keyout client-key-enc.pem -out client-cert.pem -subj "/DC=com/DC=example/CN=client" -passout pass:qwerty OUTPUT_FILE x.1 ERROR_FILE x.2
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/unittest/libmariadb/certs)
EXECUTE_PROCESS(COMMAND openssl rsa -in client-key-enc.pem -out client-key.pem -passin pass:qwerty -passout pass:
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/unittest/libmariadb/certs OUTPUT_FILE x.1 ERROR_FILE x.2)
FILE(READ ${CMAKE_SOURCE_DIR}/unittest/libmariadb/certs/server-cert.pem F1)
FILE(READ ${CMAKE_SOURCE_DIR}/unittest/libmariadb/certs/client-cert.pem F2)
FILE(WRITE ${CMAKE_SOURCE_DIR}/unittest/libmariadb/certs/ca-cert.pem ${F1} ${F2})
IF(WIN32)
EXECUTE_PROCESS(COMMAND create_certs.bat
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/unittest/libmariadb/certs
OUTPUT_FILE x.1 ERROR_FILE x.2)
ELSE()
EXECUTE_PROCESS(COMMAND ./create_certs.sh
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/unittest/libmariadb/certs)
ENDIF()
ENDIF()
EXECUTE_PROCESS(COMMAND openssl x509 -in server-cert.pem -sha1 -fingerprint -noout

15
unittest/libmariadb/certs/create_certs.sh
View File

@@ -1,15 +0,0 @@
openssl req -x509 -newkey rsa:1024 \
-keyout server-key-enc.pem -out server-cert.pem \
-subj '/DC=com/DC=example/CN=server' -passout pass:qwerty
openssl rsa -in server-key-enc.pem -out server-key.pem \
-passin pass:qwerty -passout pass:
openssl req -x509 -newkey rsa:1024 \
-keyout client-key-enc.pem -out client-cert.pem \
-subj '/DC=com/DC=example/CN=client' -passout pass:qwerty
openssl rsa -in client-key-enc.pem -out client-key.pem \
-passin pass:qwerty -passout pass:
cat server-cert.pem client-cert.pem > ca-cert.pem

8
unittest/libmariadb/cursor.c
View File

@@ -59,12 +59,12 @@ MYSQL_STMT *open_cursor(MYSQL *mysql, const char *query)
fetch buffers.
*/
int stmt_fetch_init(MYSQL *mysql, Stmt_fetch *fetch, unsigned stmt_no_arg,
int stmt_fetch_init(MYSQL *mysql, Stmt_fetch *fetch, unsigned int stmt_no_arg,
const char *query_arg)
{
unsigned long type= CURSOR_TYPE_READ_ONLY;
int rc;
unsigned i;
unsigned int i;
MYSQL_RES *metadata;
/* Save query and statement number for error messages */
@@ -180,7 +180,7 @@ int fetch_n(MYSQL *mysql, const char **query_list, unsigned query_count,
for (fetch= fetch_array; fetch < fetch_array + query_count; ++fetch)
{
if (stmt_fetch_init(mysql, fetch, fetch - fetch_array,
if (stmt_fetch_init(mysql, fetch, (unsigned int)(fetch - fetch_array),
query_list[fetch - fetch_array]))
return FAIL;
}
@@ -322,7 +322,7 @@ static int test_bug21206(MYSQL *mysql)
for (fetch= fetch_array; fetch < fetch_array + cursor_count; ++fetch)
{
if ((retcode= stmt_fetch_init(mysql, fetch, fetch - fetch_array, query)))
if ((retcode= stmt_fetch_init(mysql, fetch, (unsigned int)(fetch - fetch_array), query)))
break;
}

2
unittest/libmariadb/logs.c
View File

@@ -89,7 +89,7 @@ static int test_logs(MYSQL *mysql)
my_bind[1].buffer_type= MYSQL_TYPE_STRING;
my_bind[1].buffer= (void *)&data;
my_bind[1].buffer_length= 255;
my_bind[1].length= &length;
my_bind[1].length= (unsigned long *)&length;
id= 9876;
strcpy((char *)data, "MySQL - Open Source Database");

6
unittest/libmariadb/ps.c
View File

@@ -1386,7 +1386,7 @@ static int test_long_data_str1(MYSQL *mysql)
my_bind[0].buffer= data; /* string data */
my_bind[0].buffer_length= sizeof(data);
my_bind[0].length= &length1;
my_bind[0].length= (unsigned long *)&length1;
my_bind[0].buffer_type= MYSQL_TYPE_STRING;
length1= 0;
@@ -1485,7 +1485,7 @@ static int test_long_data_str1(MYSQL *mysql)
my_bind[0].buffer_type= MYSQL_TYPE_BLOB;
my_bind[0].buffer= (void *) &data; /* this buffer won't be altered */
my_bind[0].buffer_length= 16;
my_bind[0].length= &blob_length;
my_bind[0].length= (unsigned long *)&blob_length;
my_bind[0].error= &my_bind[0].error_value;
rc= mysql_stmt_bind_result(stmt, my_bind);
data[16]= 0;
@@ -1501,7 +1501,7 @@ static int test_long_data_str1(MYSQL *mysql)
my_bind[1].buffer_type= MYSQL_TYPE_BLOB;
my_bind[1].buffer= (void *) &data; /* this buffer won't be altered */
my_bind[1].buffer_length= sizeof(data);
my_bind[1].length= &blob_length;
my_bind[1].length= (unsigned long *)&blob_length;
memset(data, '\0', sizeof(data));
mysql_stmt_fetch_column(stmt, my_bind+1, 0, 0);
FAIL_UNLESS(strlen(data) == max_blob_length, "strlen(data) != max_blob_length");

8
unittest/libmariadb/ps_bugs.c
View File

@@ -643,7 +643,7 @@ static int test_bug1500(MYSQL *mysql)
data= "Grave";
my_bind[0].buffer_type= MYSQL_TYPE_STRING;
my_bind[0].buffer= (void *) data;
my_bind[0].buffer_length= strlen(data);
my_bind[0].buffer_length= (unsigned long)strlen(data);
rc= mysql_stmt_bind_param(stmt, my_bind);
check_stmt_rc(rc, stmt);
@@ -2651,7 +2651,7 @@ static int test_bug5194(MYSQL *mysql)
for (i= 1; i < COLUMN_COUNT; ++i)
strcat(param_str, "?, ");
strcat(param_str, "?)");
param_str_length= strlen(param_str);
param_str_length= (int)strlen(param_str);
/* setup bind array */
memset(my_bind, '\0', MAX_PARAM_COUNT * sizeof(MYSQL_BIND));
@@ -3229,7 +3229,7 @@ static int test_mem_overun(MYSQL *mysql)
sprintf(field, "c%d int, ", i);
strcat(buffer, field);
}
length= strlen(buffer);
length= (int)strlen(buffer);
buffer[length-2]= ')';
buffer[--length]= '\0';
@@ -3241,7 +3241,7 @@ static int test_mem_overun(MYSQL *mysql)
{
strcat(buffer, "1, ");
}
length= strlen(buffer);
length= (int)strlen(buffer);
buffer[length-2]= ')';
buffer[--length]= '\0';

15
unittest/libmariadb/ssl.c.in
View File

@@ -53,10 +53,12 @@ static int check_cipher(MYSQL *mysql)
return 1;
#ifdef HAVE_GNUTLS
return strcmp(cipher, "AES-128-GCM");
#endif
#ifdef HAVE_OPENSSL
#elif HAVE_OPENSSL
return strcmp(cipher, "DHE-RSA-AES256-SHA");
#elif HAVE_SCHANNEL
return strcmp(cipher, "CALG_AES_256");
#endif
return 1;
}
static int create_ssl_user(const char *ssluser, my_bool is_X509)
@@ -268,6 +270,7 @@ DWORD WINAPI ssl_thread(void *dummy)
mysql_close(mysql);
mysql_thread_end();
pthread_exit(0);
return;
}
static int test_ssl_threads(MYSQL *mysql)
@@ -291,6 +294,7 @@ static int test_ssl_threads(MYSQL *mysql)
check_mysql_rc(rc, mysql);
rc= mysql_query(mysql, "INSERT into ssltest VALUES (0)");
check_mysql_rc(rc, mysql);
pthread_mutex_init(&LOCK_test, NULL);
pthread_mutex_init(&LOCK_test, NULL);
@@ -640,6 +644,9 @@ static int test_conc_102(MYSQL *mysql)
DWORD threads[50];
#endif
if (check_skip_ssl())
return SKIP;
rc= mysql_query(mysql, "DROP TABLE IF EXISTS t_conc102");
check_mysql_rc(rc, mysql);
rc= mysql_query(mysql, "CREATE TABLE t_conc102 ( a int)");
@@ -701,10 +708,10 @@ static int test_ssl_fp(MYSQL *unused)
FAIL_IF(check_cipher(my) != 0, "Invalid cipher");
mysql_query(my, "SET @a:=1");
rc= mysql_query(my, "SET @a:=1");
check_mysql_rc(rc, my);
mysql_query(my, "SELECT @a");
rc= mysql_query(my, "SELECT @a");
check_mysql_rc(rc, my);
if ((res= mysql_store_result(my)))