diff --git a/include/ma_config.h.in b/include/ma_config.h.in
index 4c28a172..c66257ff 100644
--- a/include/ma_config.h.in
+++ b/include/ma_config.h.in
@@ -276,6 +276,5 @@
  * various other defines
  */
 #cmakedefine HAVE_THREADS 1
-#cmakedefine SHAREDIR "@SHAREDIR@"
 #cmakedefine DEFAULT_CHARSET_HOME "@DEFAULT_CHARSET_HOME@"
 #cmakedefine DEFAULT_SYSCONFDIR "@DEFAULT_SYSCONFDIR@"
diff --git a/include/mariadb_stmt.h b/include/mariadb_stmt.h
index 9c9303cf..9e67ad8c 100644
--- a/include/mariadb_stmt.h
+++ b/include/mariadb_stmt.h
@@ -265,7 +265,7 @@ my_bool STDCALL mysql_stmt_bind_result(MYSQL_STMT * stmt, MYSQL_BIND * bnd);
 my_bool STDCALL mysql_stmt_close(MYSQL_STMT * stmt);
 my_bool STDCALL mysql_stmt_reset(MYSQL_STMT * stmt);
 my_bool STDCALL mysql_stmt_free_result(MYSQL_STMT *stmt);
-my_bool STDCALL mysql_stmt_send_long_data(MYSQL_STMT *stmt, unsigned int param_number, const char *data, size_t length);
+my_bool STDCALL mysql_stmt_send_long_data(MYSQL_STMT *stmt, unsigned int param_number, const char *data, unsigned long length);
 MYSQL_RES *STDCALL mysql_stmt_result_metadata(MYSQL_STMT *stmt);
 MYSQL_RES *STDCALL mysql_stmt_param_metadata(MYSQL_STMT *stmt);
 unsigned int STDCALL mysql_stmt_errno(MYSQL_STMT * stmt);
diff --git a/include/mysql.h b/include/mysql.h
index ce6a1cf2..d5633839 100644
--- a/include/mysql.h
+++ b/include/mysql.h
@@ -569,10 +569,10 @@ MARIADB_CHARSET_INFO * STDCALL mariadb_get_charset_by_name(const char *csname);
 MARIADB_CHARSET_INFO * STDCALL mariadb_get_charset_by_nr(unsigned int csnr);
 size_t STDCALL mariadb_convert_string(const char *from, size_t *from_len, MARIADB_CHARSET_INFO *from_cs,
                                       char *to, size_t *to_len, MARIADB_CHARSET_INFO *to_cs, int *errorcode);
-int STDCALL mysql_optionsv(MYSQL *mysql,enum mysql_option option, ...); 
+int STDCALL mysql_optionsv(MYSQL *mysql,enum mysql_option option, ...);
 int STDCALL mysql_get_optionv(MYSQL *mysql, enum mysql_option option, void *arg, ...);
 int STDCALL mysql_get_option(MYSQL *mysql, enum mysql_option option, void *arg);
-unsigned long STDCALL mysql_hex_string(char *to, const char *from, size_t len);
+unsigned long STDCALL mysql_hex_string(char *to, const char *from, unsigned long len);
 my_socket STDCALL mysql_get_socket(MYSQL *mysql);
 unsigned int STDCALL mysql_get_timeout_value(const MYSQL *mysql);
 unsigned int STDCALL mysql_get_timeout_value_ms(const MYSQL *mysql);
diff --git a/libmariadb/ma_client_plugin.c.in b/libmariadb/ma_client_plugin.c.in
index 85052465..8e5b1af8 100644
--- a/libmariadb/ma_client_plugin.c.in
+++ b/libmariadb/ma_client_plugin.c.in
@@ -269,7 +269,7 @@ int mysql_client_plugin_init()
   MYSQL mysql;
   struct st_mysql_client_plugin **builtin;
   va_list unused;
-  LINT_INIT_STRUCT(unused); 
+  LINT_INIT_STRUCT(unused);
 
   if (initialized)
     return 0;
diff --git a/libmariadb/ma_hash.c b/libmariadb/ma_hash.c
index 88e96787..81001712 100644
--- a/libmariadb/ma_hash.c
+++ b/libmariadb/ma_hash.c
@@ -291,8 +291,8 @@ my_bool hash_insert(HASH *info,const uchar *record)
 {
   int flag;
   uint halfbuff,hash_nr,first_index,idx;
-  uchar *ptr_to_rec,*ptr_to_rec2;
-  HASH_LINK *data,*empty,*gpos,*gpos2,*pos;
+  uchar *ptr_to_rec= NULL,*ptr_to_rec2= NULL;
+  HASH_LINK *data,*empty,*gpos= NULL,*gpos2 = NULL,*pos;
 
   LINT_INIT(gpos); LINT_INIT(gpos2);
   LINT_INIT(ptr_to_rec); LINT_INIT(ptr_to_rec2);
diff --git a/libmariadb/ma_pvio.c b/libmariadb/ma_pvio.c
index b6d3f3d3..891d4ea7 100644
--- a/libmariadb/ma_pvio.c
+++ b/libmariadb/ma_pvio.c
@@ -182,7 +182,7 @@ my_bool ma_pvio_set_timeout(MARIADB_PVIO *pvio,
 /* {{{ size_t ma_pvio_read_async */
 static size_t ma_pvio_read_async(MARIADB_PVIO *pvio, uchar *buffer, size_t length)
 {
-  ssize_t res;
+  ssize_t res= 0;
   struct mysql_async_context *b= pvio->mysql->options.extension->async_context;
   int timeout= pvio->timeout[PVIO_READ_TIMEOUT];
 
@@ -338,7 +338,7 @@ static ssize_t ma_pvio_write_async(MARIADB_PVIO *pvio, const uchar *buffer, size
 /* {{{ size_t ma_pvio_write */
 ssize_t ma_pvio_write(MARIADB_PVIO *pvio, const uchar *buffer, size_t length)
 {
-  ssize_t r;
+  ssize_t r= 0;
 
   if (!pvio)
    return -1;
diff --git a/libmariadb/mariadb_lib.c b/libmariadb/mariadb_lib.c
index 5f1c8a24..93a202b3 100644
--- a/libmariadb/mariadb_lib.c
+++ b/libmariadb/mariadb_lib.c
@@ -1956,7 +1956,7 @@ mysql_close(MYSQL *mysql)
 int STDCALL
 mysql_query(MYSQL *mysql, const char *query)
 {
-  return mysql_real_query(mysql,query, (uint) strlen(query));
+  return mysql_real_query(mysql,query, (unsigned long) strlen(query));
 }
 
 /*
@@ -3301,12 +3301,12 @@ my_bool STDCALL mysql_autocommit(MYSQL *mysql, my_bool mode)
 
 my_bool STDCALL mysql_commit(MYSQL *mysql)
 {
-  return((my_bool)mysql_real_query(mysql, "COMMIT", sizeof("COMMIT")));
+  return((my_bool)mysql_real_query(mysql, "COMMIT", (unsigned long) sizeof("COMMIT")));
 }
 
 my_bool STDCALL mysql_rollback(MYSQL *mysql)
 {
-  return((my_bool)mysql_real_query(mysql, "ROLLBACK", sizeof("ROLLBACK")));
+  return((my_bool)mysql_real_query(mysql, "ROLLBACK", (unsigned long)sizeof("ROLLBACK")));
 }
 
 my_ulonglong STDCALL mysql_insert_id(MYSQL *mysql)
@@ -3436,7 +3436,7 @@ int STDCALL mysql_set_character_set(MYSQL *mysql, const char *csname)
     char buff[64];
 
     snprintf(buff, 63, "SET NAMES %s", cs->csname);
-    if (!mysql_real_query(mysql, buff, (uint)strlen(buff)))
+    if (!mysql_real_query(mysql, buff, (unsigned long)strlen(buff)))
     {
       mysql->charset= cs;
       return(0);
diff --git a/plugins/pvio/pvio_socket.c b/plugins/pvio/pvio_socket.c
index b7177617..682e524f 100644
--- a/plugins/pvio/pvio_socket.c
+++ b/plugins/pvio/pvio_socket.c
@@ -796,7 +796,7 @@ my_bool pvio_socket_connect(MARIADB_PVIO *pvio, MA_PVIO_CINFO *cinfo)
       {
         unsigned int timeout= mysql->options.connect_timeout ?
                               mysql->options.connect_timeout : DNS_TIMEOUT;
-        if (time(NULL) - start_t > timeout)
+        if (time(NULL) - start_t > (time_t)timeout)
           break;
 #ifndef _WIN32
         usleep(wait_gai);
@@ -819,7 +819,7 @@ my_bool pvio_socket_connect(MARIADB_PVIO *pvio, MA_PVIO_CINFO *cinfo)
     {
       unsigned int timeout= mysql->options.connect_timeout ?
                             mysql->options.connect_timeout : DNS_TIMEOUT;
-      if (time(NULL) - start_t > timeout)
+      if (time(NULL) - start_t > (time_t)timeout)
         break;
 #ifndef _WIN32
       usleep(wait_gai);
diff --git a/unittest/libmariadb/basic-t.c b/unittest/libmariadb/basic-t.c
index e05f7005..d75a9e1b 100644
--- a/unittest/libmariadb/basic-t.c
+++ b/unittest/libmariadb/basic-t.c
@@ -185,7 +185,7 @@ static int test_conc70(MYSQL *my)
   }
 
   row= mysql_fetch_row(res);
-  diag("Length: %ld", strlen(row[0]));
+  diag("Length: %ld", (long)strlen(row[0]));
   FAIL_IF(strlen(row[0]) != 1024 * 1024 * 20, "Wrong length");
 
   mysql_free_result(res);
@@ -243,7 +243,7 @@ static int test_conc68(MYSQL *my)
   }
 
   row= mysql_fetch_row(res);
-  diag("Length: %ld", strlen(row[0]));
+  diag("Length: %ld", (long)strlen(row[0]));
   FAIL_IF(strlen(row[0]) != 1024 * 1024 * 20, "Wrong length");
 
   mysql_free_result(res);
diff --git a/unittest/libmariadb/charset.c b/unittest/libmariadb/charset.c
index cc7fee9d..156efd60 100644
--- a/unittest/libmariadb/charset.c
+++ b/unittest/libmariadb/charset.c
@@ -712,7 +712,7 @@ static int test_utf16_utf32_noboms(MYSQL *mysql __attribute__((unused)))
     rc= mariadb_convert_string((char *)in_string[UTF8], &in_len, csinfo[UTF8], buffer, &out_len, csinfo[i], &error);
 
     FAIL_IF(rc == (size_t)-1, "Conversion failed");
-    diag("rc=%lu oct_len: %lu", rc, in_oct_len[i]);
+    diag("rc=%lu oct_len: %lu", (unsigned long)rc, (unsigned long)in_oct_len[i]);
     FAIL_IF(rc != in_oct_len[i], "Incorrect number of written bytes");
 
     if (memcmp(buffer, in_string[i], rc) != 0)
diff --git a/unittest/libmariadb/misc.c b/unittest/libmariadb/misc.c
index d9433543..b2d604b6 100644
--- a/unittest/libmariadb/misc.c
+++ b/unittest/libmariadb/misc.c
@@ -1109,16 +1109,16 @@ static int test_get_info(MYSQL *mysql)
    
   rc= mariadb_get_infov(mysql, MARIADB_MAX_ALLOWED_PACKET, &sval);
   FAIL_IF(rc, "mysql_get_info failed");
-  diag("max_allowed_packet: %lu", sval);
+  diag("max_allowed_packet: %lu", (unsigned long)sval);
   rc= mariadb_get_infov(mysql, MARIADB_NET_BUFFER_LENGTH, &sval);
   FAIL_IF(rc, "mysql_get_info failed");
-  diag("net_buffer_length: %lu", sval);
+  diag("net_buffer_length: %lu", (unsigned long)sval);
   rc= mariadb_get_infov(mysql, MARIADB_CLIENT_VERSION_ID, &sval);
   FAIL_IF(rc, "mysql_get_info failed");
-  diag("client_version_id: %lu", sval);
+  diag("client_version_id: %lu", (unsigned long)sval);
   rc= mariadb_get_infov(mysql, MARIADB_CONNECTION_SERVER_VERSION_ID, &sval);
   FAIL_IF(rc, "mysql_get_info failed");
-  diag("server_version_id: %lu", sval);
+  diag("server_version_id: %lu", (unsigned long)sval);
   rc= mariadb_get_infov(mysql, MARIADB_CONNECTION_MARIADB_CHARSET_INFO, &cs);
   FAIL_IF(rc, "mysql_get_info failed");
   diag("charset name: %s", cs.csname);
diff --git a/unittest/libmariadb/ps.c b/unittest/libmariadb/ps.c
index dffbfa16..d0514b75 100644
--- a/unittest/libmariadb/ps.c
+++ b/unittest/libmariadb/ps.c
@@ -1496,7 +1496,7 @@ static int test_long_data_str1(MYSQL *mysql)
   result= mysql_stmt_result_metadata(stmt);
   field= mysql_fetch_fields(result);
 
-  diag("max_length: %lu  max_blob_length: %lu", field->max_length, max_blob_length);
+  diag("max_length: %lu  max_blob_length: %lu", (unsigned long)field->max_length, (unsigned long)max_blob_length);
   FAIL_UNLESS(field->max_length == max_blob_length, "field->max_length != max_blob_length");
 
   /* Fetch results into a data buffer that is smaller than data */
diff --git a/unittest/libmariadb/ps_bugs.c b/unittest/libmariadb/ps_bugs.c
index d7a9eb7a..6db627c7 100644
--- a/unittest/libmariadb/ps_bugs.c
+++ b/unittest/libmariadb/ps_bugs.c
@@ -497,7 +497,7 @@ static int test_bug11183(MYSQL *mysql)
   FAIL_IF(!rc, "Error expected");
 
   mysql_stmt_reset(stmt);
-  FAIL_IF(!mysql_stmt_errno(stmt) == 0, "stmt->error != 0");
+  FAIL_IF(mysql_stmt_errno(stmt) != 0, "stmt->error != 0");
 
   rc= mysql_query(mysql, "create table t1 (a int)");
   check_mysql_rc(rc, mysql);