From e21d21d71fdbb63f32e9897e938897b2264b8f7d Mon Sep 17 00:00:00 2001
From: Oleksandr Byelkin <sanja@mariadb.com>
Date: Wed, 27 Jan 2021 20:25:13 +0100
Subject: [PATCH] Fix ASAN issues in the tests

---
 unittest/libmariadb/basic-t.c | 2 +-
 unittest/libmariadb/errors.c  | 2 +-
 unittest/libmariadb/ps.c      | 8 ++++----
 unittest/libmariadb/ps_bugs.c | 8 ++++----
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/unittest/libmariadb/basic-t.c b/unittest/libmariadb/basic-t.c
index 5b9c05dc..c22e6c2b 100644
--- a/unittest/libmariadb/basic-t.c
+++ b/unittest/libmariadb/basic-t.c
@@ -401,7 +401,7 @@ static int test_bad_union(MYSQL *mysql)
   rc= mysql_stmt_prepare(stmt, SL(query));
   FAIL_UNLESS(rc && mysql_errno(mysql) == 1222, "Error expected");
 
-  free(stmt);
+  mysql_stmt_close(stmt);
   return OK;
 }
 
diff --git a/unittest/libmariadb/errors.c b/unittest/libmariadb/errors.c
index e8209de6..79060a50 100644
--- a/unittest/libmariadb/errors.c
+++ b/unittest/libmariadb/errors.c
@@ -161,7 +161,7 @@ static int test_bug16143(MYSQL *mysql)
   FAIL_IF(!stmt, mysql_error(mysql));
   /* Check mysql_stmt_sqlstate return "no error" */
   FAIL_UNLESS(strcmp(mysql_stmt_sqlstate(stmt), "00000") == 0, "Expected SQLstate 000000");
-  free(stmt);
+  mysql_stmt_close(stmt);
   return OK;
 }
 
diff --git a/unittest/libmariadb/ps.c b/unittest/libmariadb/ps.c
index facb1e41..40ccad6f 100644
--- a/unittest/libmariadb/ps.c
+++ b/unittest/libmariadb/ps.c
@@ -101,7 +101,7 @@ static int test_conc60(MYSQL *mysql)
   rc= mysql_stmt_prepare(stmt, SL(query));
   if (rc && mysql_stmt_errno(stmt) == 1146) {
     diag("Internal test - customer data not available");
-    free(stmt);
+    mysql_stmt_close(stmt);
     return SKIP;
   }
   check_stmt_rc(rc, stmt);
@@ -481,7 +481,7 @@ static int test_prepare_syntax(MYSQL *mysql)
   rc= mysql_commit(mysql);
   check_mysql_rc(rc, mysql);
 
-  free(stmt);
+  mysql_stmt_close(stmt);
   rc= mysql_query(mysql, "DROP TABLE IF EXISTS test_prepare_syntax");
   check_mysql_rc(rc, mysql);
 
@@ -1204,8 +1204,8 @@ static int test_long_data(MYSQL *mysql)
   FAIL_IF(!stmt, mysql_error(mysql));
   rc= mysql_stmt_prepare(stmt, SL(query));
   FAIL_IF(!rc, "Error expected");
-//  rc= mysql_stmt_close(stmt);
-//  check_stmt_rc(rc, stmt);
+  rc= mysql_stmt_close(stmt);
+  check_stmt_rc(rc, stmt);
 
   strcpy(query, "INSERT INTO test_long_data(col1, col2, col3) VALUES(?, ?, ?)");
   stmt= mysql_stmt_init(mysql);
diff --git a/unittest/libmariadb/ps_bugs.c b/unittest/libmariadb/ps_bugs.c
index 816e1201..148aebdc 100644
--- a/unittest/libmariadb/ps_bugs.c
+++ b/unittest/libmariadb/ps_bugs.c
@@ -819,7 +819,7 @@ static int test_bug16144(MYSQL *mysql)
   mysql_stmt_attr_get(stmt, STMT_ATTR_UPDATE_MAX_LENGTH, (void*) &flag);
   FAIL_UNLESS(flag == flag_orig, "flag != flag_orig");
 
-  free(stmt);
+  mysql_stmt_close(stmt);
 
   return OK;
 }
@@ -3040,7 +3040,7 @@ static int test_bug7990(MYSQL *mysql)
     MYSQL is not documented and is subject to change in 5.0
   */
   FAIL_UNLESS(rc && mysql_stmt_errno(stmt) && mysql_errno(mysql), "Error expected");
-  free(stmt);
+  mysql_stmt_close(stmt);
   return OK;
 }
 
@@ -4551,7 +4551,7 @@ static int test_conc217(MYSQL *mysql)
   FAIL_IF(rc==0, "Expected error\n");
   rc= mysql_query(mysql, "drop table if exists t_count");
   check_mysql_rc(rc, mysql);
-  free(stmt);
+  mysql_stmt_close(stmt);
   check_mysql_rc(rc, mysql);
   return OK;
 }
@@ -5210,7 +5210,7 @@ static int test_returning(MYSQL *mysql)
   int rc;
 
   diag("MDEV-23768 not fixed yet");
-  free(stmt);
+  mysql_stmt_close(stmt);
   return SKIP;
 
   rc= mysql_query(mysql, "CREATE TEMPORARY TABLE t1 (a int not null auto_increment primary key, b json)");