Fixed compilation errors introduced by 629ec64..

mariadb-corporation · Oct 18, 2016 · 468cda3 · 468cda3
1 parent 532ad45
commit 468cda3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/libmariadb/secure/gnutls.c b/libmariadb/secure/gnutls.c
@@ -1261,12 +1261,12 @@ my_bool ma_tls_connect(MARIADB_TLS *ctls)
   return 0;
 }
 
-size_t ma_tls_read(MARIADB_TLS *ctls, const uchar* buffer, size_t length)
+ssize_t ma_tls_read(MARIADB_TLS *ctls, const uchar* buffer, size_t length)
 {
   return gnutls_record_recv((gnutls_session_t )ctls->ssl, (void *)buffer, length);
 }
 
-size_t ma_tls_write(MARIADB_TLS *ctls, const uchar* buffer, size_t length)
+ssize_t ma_tls_write(MARIADB_TLS *ctls, const uchar* buffer, size_t length)
 { 
   return gnutls_record_send((gnutls_session_t )ctls->ssl, (void *)buffer, length);
 }

diff --git a/libmariadb/secure/openssl.c b/libmariadb/secure/openssl.c
@@ -604,12 +604,12 @@ my_bool ma_tls_connect(MARIADB_TLS *ctls)
   return 0;
 }
 
-size_t ma_tls_read(MARIADB_TLS *ctls, const uchar* buffer, size_t length)
+ssize_t ma_tls_read(MARIADB_TLS *ctls, const uchar* buffer, size_t length)
 {
   return SSL_read((SSL *)ctls->ssl, (void *)buffer, (int)length);
 }
 
-size_t ma_tls_write(MARIADB_TLS *ctls, const uchar* buffer, size_t length)
+ssize_t ma_tls_write(MARIADB_TLS *ctls, const uchar* buffer, size_t length)
 { 
   return SSL_write((SSL *)ctls->ssl, (void *)buffer, (int)length);
 }
@@ -618,11 +618,12 @@ my_bool ma_tls_close(MARIADB_TLS *ctls)
 {
   int i, rc;
   SSL *ssl;
+  SSL_CTX *ctx= NULL;
 
   if (!ctls || !ctls->ssl)
     return 1;
   ssl= (SSL *)ctls->ssl;
-  SSL_CTX *ctx= SSL_get_SSL_CTX(ssl);
+  ctx= SSL_get_SSL_CTX(ssl);
   if (ctx)
     SSL_CTX_free(ctx);
 

diff --git a/unittest/libmariadb/bulk1.c b/unittest/libmariadb/bulk1.c
@@ -158,7 +158,7 @@ static int bulk2(MYSQL *mysql)
   rc= mysql_stmt_attr_set(stmt, STMT_ATTR_ARRAY_SIZE, &array_size);
   check_stmt_rc(rc, stmt);
 
-  rc= mysql_stmt_bind_param(stmt, &bind);
+  rc= mysql_stmt_bind_param(stmt, bind);
   check_stmt_rc(rc, stmt);
 
   rc= mysql_stmt_execute(stmt);