diff --git a/libmariadb/secure/ma_schannel.c b/libmariadb/secure/ma_schannel.c
index e989aeaa..30b69d37 100644
--- a/libmariadb/secure/ma_schannel.c
+++ b/libmariadb/secure/ma_schannel.c
@@ -96,7 +96,7 @@ SECURITY_STATUS ma_schannel_handshake_loop(MARIADB_PVIO *pvio, my_bool InitialRe
 
 
   /* Allocate data buffer */
-  if (!(IoBuffer = LocalAlloc(LMEM_FIXED, SC_IO_BUFFER_SIZE)))
+  if (!(IoBuffer = malloc(SC_IO_BUFFER_SIZE)))
     return SEC_E_INSUFFICIENT_MEMORY;
 
   cbIoBuffer = 0;
@@ -245,7 +245,7 @@ loopend:
     ma_schannel_set_sec_error(pvio, rc);
     DeleteSecurityContext(&sctx->hCtxt);
   }
-  LocalFree(IoBuffer);
+  free(IoBuffer);
 
   return rc;
 }
diff --git a/unittest/libmariadb/cursor.c b/unittest/libmariadb/cursor.c
index 7a1435ff..25db1781 100644
--- a/unittest/libmariadb/cursor.c
+++ b/unittest/libmariadb/cursor.c
@@ -210,12 +210,6 @@ int fetch_n(MYSQL *mysql, const char **query_list, unsigned query_count,
       }
     }
   }
-  if (!error_count)
-  {
-    unsigned total_row_count= 0;
-    for (fetch= fetch_array; fetch < fetch_array + query_count; ++fetch)
-      total_row_count+= fetch->row_count;
-  }
   for (fetch= fetch_array; fetch < fetch_array + query_count; ++fetch)
     stmt_fetch_close(fetch);
   free(fetch_array);
@@ -1505,6 +1499,8 @@ static int test_bug38486(MYSQL *mysql)
   check_stmt_rc(rc, stmt);
   rc= mysql_stmt_execute(stmt);
   check_stmt_rc(rc, stmt);
+  rc= mysql_query(mysql, "DROP TABLE IF EXISTS t10");
+  check_mysql_rc(rc, mysql);
   mysql_stmt_close(stmt);
 
   rc= mysql_query(mysql, "DROP TABLE t10");